From b741b9fbe4a8771925e3669b90f244fd1073fa0b Mon Sep 17 00:00:00 2001
From: Nico Domino <yo@ndo.dev>
Date: Wed, 7 Aug 2024 17:54:57 +0200
Subject: [PATCH] fix: update flake config to run again (#4641)

---
 flake.lock | 29 ++++++-----------------------
 flake.nix  | 29 ++++++++++++-----------------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3832337bf..72fc9a632 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,34 +18,17 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1721686456,
-        "narHash": "sha256-nw/BnNzATDPfzpJVTnY8mcSKKsz6BJMEFRkJ332QSN0=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "575f3027caa1e291d24f1e9fb0e3a19c2f26d96b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
         "rust-overlay": "rust-overlay",
-        "unstable": "unstable"
+        "unstablePkgs": "unstablePkgs"
       }
     },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "unstablePkgs"
         ]
       },
       "locked": {
@@ -77,13 +60,13 @@
         "type": "github"
       }
     },
-    "unstable": {
+    "unstablePkgs": {
       "locked": {
-        "lastModified": 1721562059,
-        "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
+        "lastModified": 1722813957,
+        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
+        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 1a9f7dd15..00a04c529 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,30 +1,26 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    unstablePkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs = {
-        nixpkgs.follows = "nixpkgs";
+        nixpkgs.follows = "unstablePkgs";
       };
     };
   };
-  outputs = { self, nixpkgs, unstable, flake-utils, rust-overlay }:
+  outputs = { self, unstablePkgs, flake-utils, rust-overlay }:
     flake-utils.lib.eachDefaultSystem
       (system:
         let
           overlays = [ (import rust-overlay) ];
-          # pkgs = import nixpkgs {
-          #   inherit system overlays;
-          # };
-          unstablePkgs = import unstable {
+          unstable = import unstablePkgs {
             inherit system overlays;
           };
 
-          rustToolchain = unstablePkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml.stable;
+          rustToolchain = unstable.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
 
-          common = with unstablePkgs; [
+          common = with unstable; [
             gtk3
             glib
             glib-networking
@@ -41,7 +37,7 @@
           ];
 
           # runtime Deps
-          libraries = with unstablePkgs;[
+          libraries = with unstable;[
             cairo
             pango
             harfbuzz
@@ -49,22 +45,21 @@
           ] ++ common;
 
           # compile-time deps
-          packages = with unstablePkgs; [
+          packages = with unstable; [
             curl
             wget
             pkg-config
             rustToolchain
           ] ++ common;
         in
-        with unstablePkgs;
         {
-          devShells.default = mkShell {
+          devShells.default = unstable.mkShell {
             nativeBuildInputs = packages;
             buildInputs = libraries;
             shellHook = ''
-              export LD_LIBRARY_PATH=${unstablePkgs.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH
-              export XDG_DATA_DIRS=${unstablePkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${unstablePkgs.gsettings-desktop-schemas.name}:${unstablePkgs.gtk3}/share/gsettings-schemas/${unstablePkgs.gtk3.name}:$XDG_DATA_DIRS
-              export GIO_MODULE_DIR="${unstablePkgs.glib-networking}/lib/gio/modules/"
+              export LD_LIBRARY_PATH=${unstable.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH
+              export XDG_DATA_DIRS=${unstable.gsettings-desktop-schemas}/share/gsettings-schemas/${unstable.gsettings-desktop-schemas.name}:${unstable.gtk3}/share/gsettings-schemas/${unstable.gtk3.name}:$XDG_DATA_DIRS
+              export GIO_MODULE_DIR="${unstable.glib-networking}/lib/gio/modules/"
             '';
           };
         }