Bump nixpkgs rev (#25361)

* Bump nixpkgs revision

* Update nix-direnv

* Remove extra nix functionalities

Both nix-direnv and legacy command nix-shell fail. Reverting to
flakes-only commands.

* Pin nixpkgs per suggestion

See https://github.com/space-wizards/space-station-14/pull/25361#discussion_r1494196038

* Revert nix-direnv removal

* Add python3 to shell.nix

diff --git a/.envrc b/.envrc
index 5def8fd66a2752e6d349198e8c958d356d03a62d..7fd05db3e5ee2c0244eff265cfb283fc8ac053ee 100644 (file)
--- a/.envrc
+++ b/.envrc
@@ -1,4 +1,4 @@
-if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
 fi
 use flake

diff --git a/flake.lock b/flake.lock
index 6cfa2ba415a603fd0896272672e8a6a04b3306f5..6ab38fa41bd8b562fc95b7e1dfe0c9b529fb2315 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1706213598,
-        "narHash": "sha256-Toz3HEHeq6Esr5uDOMel8BiGSa94gj+og3Yz4YEgjYI=",
+        "lastModified": 1708210246,
+        "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cda0e75a0bd7cf05bd3e40658c163e4f8f376b7b",
+        "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49",
         "type": "github"
       },
       "original": {

diff --git a/shell.nix b/shell.nix
index d3ece6cdb1499694f387ca205fee4f0ccc119aa4..da363feda9cd73fed94ed889bbee37895a69a174 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,9 @@
-{ pkgs ? import (builtins.fetchTarball {
+{ pkgs ? (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+in import (builtins.fetchTarball {
   url =
-    "https://github.com/NixOS/nixpkgs/archive/cda0e75a0bd7cf05bd3e40658c163e4f8f376b7b.tar.gz";
-  sha256 = "sha256-Toz3HEHeq6Esr5uDOMel8BiGSa94gj+og3Yz4YEgjYI=";
-}) { } }:
+    "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
+  sha256 = lock.nodes.nixpkgs.locked.narHash;
+}) { }) }:
 
 let
   dependencies = with pkgs; [
@@ -41,6 +42,7 @@ let
     dbus
     at-spi2-core
     cups
+    python3
   ];
 in pkgs.mkShell {
   name = "space-station-14-devshell";