Merge pull request #204 from mjhoy/update-nixpkgs-2023-11-13

update nixpkgs 2023-11-13

nix/nixpkgs/overlays.nix

@@ -3,6 +3,6 @@
     # To update:
     # Go to https://github.com/nix-community/emacs-overlay, and grab a commit hash.
     # Swap it in below.
-    url = https://github.com/nix-community/emacs-overlay/archive/5ce24eed757d854bb290a0a0499053226fec1fc8.tar.gz;
+    url = https://github.com/nix-community/emacs-overlay/archive/fe55f8be14c4537f42b037051e9f5cb7ffcad246.tar.gz;
   }))
 ]

nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aeefe2054617cae501809b82b44a8e8f7be7cc4b",
-        "sha256": "0712sbcrfjgbwsl2gk3xay2snf5dmmacmcv4bdvymg342vbipxbj",
+        "rev": "971ac8319468c5cfa05653f6b95d7174614720f9",
+        "sha256": "1rnvkndqphqnixlr5y6sgj99p7sx9j0irnylsknw2x1qf11h0b23",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/aeefe2054617cae501809b82b44a8e8f7be7cc4b.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/971ac8319468c5cfa05653f6b95d7174614720f9.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

scripts/build-nix-env

@@ -3,15 +3,18 @@
 # This script checks out the latest nixpkgs and attempts to build my
 # developer environment against it. If all goes well, it will push an
 # update to the mjh-mbp branch.
+#
+# TODO: update the pinned nix version (2.16) after this issue has been
+# resolved: https://github.com/NixOS/nixpkgs/pull/249165
 
 set -eoux pipefail
 
 echo "Building devEnv"
 nix-build --no-link --show-trace '<nixpkgs>' -A devEnv
 
 echo "Building nix"
-nix-build --no-link '<nixpkgs>' -A nix
+nix-build --no-link '<nixpkgs>' -A nixVersions.nix_2_16
 
 echo "Installing"
 nix-env -f '<nixpkgs>' -i devEnv
-nix-env -f '<nixpkgs>' -i nix
+nix-env -f '<nixpkgs>' -A nixVersions.nix_2_16 -i