Bump to NixOS 23.11

clash-lang · Feb 26, 2024 · cc669c9 · cc669c9
1 parent 3de2571
commit cc669c9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix
@@ -7,7 +7,6 @@ let
   rust_overlay = import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz");
   overlay = _: nixpkgs: {
     # Nix tooling
-    niv = (import sources.niv {}).niv;
     gitignore = import sources.gitignore { inherit (nixpkgs) lib; };
     openocd-vexriscv = import ./openocd-vexriscv.nix { inherit (nixpkgs) pkgs; };
 

diff --git a/nix/sources.json b/nix/sources.json
@@ -5,22 +5,22 @@
         "homepage": "",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
-        "sha256": "07vg2i9va38zbld9abs9lzqblz193vc5wvqd6h7amkmwf66ljcgh",
+        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "sha256": "1rlja3ba9s1n0icy3aarwhx9hk1jyfgngzizbn1afwwdlpvdlqw0",
         "type": "tarball",
-        "url": "https://github.com/hercules-ci/gitignore.nix/archive/a20de23b925fd8264fd7fad6454652e142fd7f73.tar.gz",
+        "url": "https://github.com/hercules-ci/gitignore.nix/archive/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-22.11",
+        "branch": "nixos-23.11",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8c54d842d9544361aac5f5b212ba04e4089e8efe",
-        "sha256": "14hk2lyxy8ajczn77363vw05w24fyx9889q3b89riqgs28acyz87",
+        "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b",
+        "sha256": "0zjwk71lsri9zmlmhwgz1ny9dv91kaznii2wjff4g2d3w47gy8nj",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/8c54d842d9544361aac5f5b212ba04e4089e8efe.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/shell.nix b/shell.nix
@@ -7,21 +7,33 @@ pkgs.mkShell {
   name = "shell";
   buildInputs =
     [
-      pkgs.buildPackages.cabal-install
-      pkgs.buildPackages.gcc
-      pkgs.buildPackages.ghc
-      pkgs.buildPackages.pkg-config
-      pkgs.buildPackages.sbt
-      pkgs.buildPackages.scala
-      pkgs.buildPackages.verilator
+      pkgs.cabal-install
+      pkgs.gcc
+      pkgs.haskell.compiler.ghc90
+      pkgs.pkg-config
+      pkgs.sbt
+      pkgs.scala
+      pkgs.verilator
+
 
       (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml)
 
       # VexRiscV needs a special openocd
       pkgs.openocd-vexriscv
 
       # For Cabal to clone git repos
-      pkgs.buildPackages.git
+      pkgs.git
+
+      # For upgrading Nix env. To update dependencies (within bounds of the currently
+      # tracking NixOS version) use:
+      #
+      #   niv update
+      #
+      # If you want to upgrade nixpkgs to another NixOS version, use:
+      #
+      #   niv update nixpkgs -b nixos-23.11
+      #
+      pkgs.niv
     ]
     ;