Update nixpkgs-stable to 23.11

ifd3f · Jan 1, 2024 · b7b18e9 · b7b18e9
1 parent ce9f9ef
commit b7b18e9
Show file tree

Hide file tree

Showing 8 changed files with 245 additions and 62 deletions.
diff --git a/.github/workflows/check-targets.yml b/.github/workflows/check-targets.yml
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -76,6 +76,4 @@
   };
 
   outputs = inputs: import ./nix/outputs.nix inputs;
-
-  nixConfig.allowUnfree = true;
 }
diff --git a/nix/home-manager/astral/cli/default.nix b/nix/home-manager/astral/cli/default.nix
@@ -85,7 +85,7 @@ in with lib; {
         enable = true;
         initExtra = commonProfile;
         enableCompletion = true;
-        enableSyntaxHighlighting = true;
+        syntaxHighlighting.enable = true;
 
         autocd = true;
         defaultKeymap = "emacs";

diff --git a/nix/lib/github-actions.nix b/nix/lib/github-actions.nix
@@ -1,5 +1,6 @@
 { lib }:
-with lib; rec {
+let nixFlags = "--accept-flake-config --show-trace --log-lines 10000";
+in with lib; rec {
   ghexpr = v: "\${{ ${v} }}";
 
   makeGithubWorkflow = { nodes, cachix, cronSchedule, known_hosts }: {
@@ -143,6 +144,13 @@ with lib; rec {
               authToken = ghexpr "secrets.CACHIX_AUTH_TOKEN";
             };
           }
+          {
+            name = "Enable unfree packages";
+            run = ''
+              mkdir -p ~/.config/nixpkgs
+              echo '{ allowUnfree = true; }' > ~/.config/nixpkgs/config.nix
+            '';
+          }
         ];
 
         buildStep = {
@@ -152,14 +160,14 @@ with lib; rec {
             installables =
               map (attr: ''"$TARGET_FLAKE#"'' + escapeShellArg attr) buildList;
             args = concatStringsSep " " installables;
-          in "GC_DONT_GC=1 nix build --show-trace --log-lines 10000 --fallback ${args}";
+          in "GC_DONT_GC=1 nix build ${nixFlags} --fallback ${args}";
           env.TARGET_FLAKE = ghexpr "env.TARGET_FLAKE";
         };
 
         runStep = {
           name = "Run ${run}";
           run = ''
-            GC_DONT_GC=1 nix run --show-trace "$TARGET_FLAKE#$run_flake_attr"'';
+            GC_DONT_GC=1 nix run ${nixFlags} "$TARGET_FLAKE#$run_flake_attr"'';
           env = {
             run_flake_attr = run;
             TARGET_FLAKE = ghexpr "env.TARGET_FLAKE";
@@ -169,7 +177,7 @@ with lib; rec {
         deployStep = {
           name = "Deploy with ${deploy}";
           run = ''
-            GC_DONT_GC=1 nix run --show-trace "$TARGET_FLAKE#$deploy_flake_attr"'';
+            GC_DONT_GC=1 nix run ${nixFlags} "$TARGET_FLAKE#$deploy_flake_attr"'';
           "if" = ghexpr
             "github.event_name == 'push' && github.ref == 'refs/heads/main'";
           env = {

diff --git a/nix/nixos-modules/astral/nix-utils.nix b/nix/nixos-modules/astral/nix-utils.nix
@@ -15,6 +15,8 @@
     };
 
     package = pkgs.nixUnstable;
-    extraOptions = "experimental-features = nix-command flakes";
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
   };
 }
diff --git a/nix/nixos-modules/astral/virt/libvirt.nix b/nix/nixos-modules/astral/virt/libvirt.nix
@@ -27,7 +27,8 @@ with lib; {
         enable = true;
         packages = with pkgs; [
           OVMFFull.fd
-          pkgsCross.aarch64-multiplatform.OVMF.fd
+          # broken as of upgrade to 23.11
+          # pkgsCross.aarch64-multiplatform.OVMF.fd
         ];
       };
     };

diff --git a/nix/outputs.nix b/nix/outputs.nix
@@ -47,37 +47,37 @@ in {
 
   homeConfigurations = {
     default = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs { system = "x86_64-linux"; };
       modules = [ self.homeModules.astral-cli ];
     };
 
     m1 = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.aarch64-darwin;
+      pkgs = import nixpkgs { system = "aarch64-darwin"; };
       modules = [ self.homeModules.astral-cli-full ];
     };
 
     "astrid@aliaconda" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs { system = "x86_64-linux"; };
       modules = [ self.homeModules.astral-scientific vscode-server-home ];
     };
     "astrid@banana" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs { system = "x86_64-linux"; };
       modules = [ self.homeModules.astral-gui ];
     };
     "astrid@chungus" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs { system = "x86_64-linux"; };
       modules = [ self.homeModules.astral-gui ];
     };
     "astrid@Discovery" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs { system = "x86_64-linux"; };
       modules = [ self.homeModules.astral-gui vscode-server-home ];
     };
     "astrid@shai-hulud" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
+      pkgs = import nixpkgs { system = "x86_64-linux"; };
       modules = [ self.homeModules.astral-gui-tablet ];
     };
     "astrid@soulcaster" = home-manager.lib.homeManagerConfiguration {
-      pkgs = nixpkgs.legacyPackages.x86_64-darwin;
+      pkgs = import nixpkgs { system = "x86_64-darwin"; };
       modules = [ self.homeModules.astral-macos ];
     };
   };
@@ -101,6 +101,12 @@ in {
     };
   in rec {
     gh-ci-matrix = pkgs.callPackage ./pkgs/gh-ci-matrix { inherit self; };
-    devShells = import ./shells.nix { inherit self pkgs; };
+    devShells = import ./shells.nix {
+      inherit self;
+      pkgs = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
+    };
     packages = import ./pkgs inputs pkgs;
   })
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,4 @@ @@
       };
       outputs = inputs: import ./nix/outputs.nix inputs;
-      nixConfig.allowUnfree = true;
     }