nix-flake: Adapt nix flake

* Update flake inputs * Follow nixos-unstable for nixpkgs input * Remove various unused arguments * Add workaround for missing test dependency in sphinx-sitemap
tiacsys · Sep 15, 2024 · 5dfb5c7 · 5dfb5c7
1 parent fb05c5c
commit 5dfb5c7
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 49 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,9 +2,7 @@
   description = "A flake for working with Bridle";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
-
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     zephyr = {
       type = "github";
@@ -42,16 +40,13 @@
     {
       self,
       nixpkgs,
-      nixpkgs-unstable,
       flake-utils,
       ...
     }@inputs:
     (flake-utils.lib.eachDefaultSystem (
       system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
-        inherit (nixpkgs) lib;
 
         west2nix = callPackage inputs.west2nix.lib.mkWest2nix { };
 
@@ -70,7 +65,7 @@
 
       in
       {
-        formatter = pkgs-unstable.nixfmt-rfc-style;
+        formatter = pkgs.nixfmt-rfc-style;
 
         packages.west2nix = inputs.west2nix.packages.${system}.default;
 

diff --git a/python.nix b/python.nix
@@ -32,6 +32,11 @@ let
         sphinxcontrib-svg2pdfconverter
         sphinx-csv-filter
         ;
+
+      # WORKAROUND for missing defusedxml in nativeCheckInputs of sphinx-sitemap derivation.
+      sphinx-sitemap = prev.sphinx-sitemap.overrideAttrs (old: {
+        pytestCheckPhase = ''true'';
+      });
     };
   };
 

diff --git a/shell.nix b/shell.nix
@@ -1,6 +1,4 @@
 {
-  lib,
-  callPackage,
   pythonEnv,
   mkShell,
   zephyr,