From f1ce53a48794c760593a26fd38e33e5895899808 Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Mon, 15 Jan 2024 17:45:23 +0100 Subject: [PATCH] all: updates --- flake.lock | 40 ++++++++++++++++++------------------- flake.nix | 2 +- packages/beegfs/default.nix | 7 ++++--- shared/userenv.nix | 2 +- statix.toml | 10 ++++++++++ 5 files changed, 36 insertions(+), 25 deletions(-) create mode 100644 statix.toml diff --git a/flake.lock b/flake.lock index 963aa54..65f7883 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1699099781, - "narHash": "sha256-2WAs839yL6xmIPBLNVwbft46BDh0/RAjq1bAKNRqeR4=", + "lastModified": 1704741201, + "narHash": "sha256-Y420NeqPWRSpxHpXsxhKILfTxT5exjtTgCgDwSpcEfU=", "owner": "nix-community", "repo": "disko", - "rev": "548962c50b8afad7b8c820c1d6e21dc8394d6e65", + "rev": "f0a3425a7b173701922e7959d8bfb136ef53aa54", "type": "github" }, "original": { @@ -207,11 +207,11 @@ "ldap-sync": { "flake": false, "locked": { - "lastModified": 1704504213, - "narHash": "sha256-4Ocmxlx3oXVx9yKEYRlQFkeYI5MF8JoBtQtBJyggYLc=", + "lastModified": 1705328305, + "narHash": "sha256-PPc16Obzg53YVLSMP2pCOXBF6+q7/BIG6FF7EiI0st8=", "ref": "refs/heads/main", - "rev": "363cb3f06378eb2de7571dc9048dded01cf11950", - "revCount": 12, + "rev": "49edeafeaf7fbadbfe59e4763223593cab989317", + "revCount": 14, "type": "git", "url": "https://gogs.informatik.hs-fulda.de/fooker/ldap-sync.git" }, @@ -344,16 +344,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699169573, - "narHash": "sha256-cvUb1xZkvOp3W2SzylStrTirhVd9zCeo5utJl9nSIhw=", + "lastModified": 1704732714, + "narHash": "sha256-ABqK/HggMYA/jMUXgYyqVAcQ8QjeMyr1jcXfTpSHmps=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aeefe2054617cae501809b82b44a8e8f7be7cc4b", + "rev": "6723fa4e4f1a30d42a633bef5eb01caeb281adc3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -385,11 +385,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1698852633, - "narHash": "sha256-Hsc/cCHud8ZXLvmm8pxrXpuaPEeNaaUttaCvtdX/Wug=", + "lastModified": 1704904919, + "narHash": "sha256-bSNaCzA+mvod/TuVfPOb0pl27D6MvJf94a82q9UzyY4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "dec10399e5b56aa95fcd530e0338be72ad6462a0", + "rev": "1e9287e7fcb699c84f0127b3c6f12b090cb61b10", "type": "github" }, "original": { @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1699252567, - "narHash": "sha256-WCzEBCu17uXilT9OZ3XSy/c4Gk/j3L7AUxBRHzNlQ4Y=", + "lastModified": 1704905997, + "narHash": "sha256-p26UwSbqxQwaHtDO+Pw2rT7JV5oZCEyXcm0l30qjrvc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0a9d5e41f6013a1b8b66573822f9beb827902968", + "rev": "020dcff707252fa93884036eebf7b02e53d54a43", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0182af5..ef0d24b 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-23.05"; + ref = "nixos-23.11"; }; colmena = { diff --git a/packages/beegfs/default.nix b/packages/beegfs/default.nix index 70be1f6..0185f4f 100644 --- a/packages/beegfs/default.nix +++ b/packages/beegfs/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, pkgconfig +, pkg-config , util-linux , which , libuuid @@ -14,7 +14,8 @@ , cmake , callPackage , kernel ? null -, ... } : +, ... +}: stdenv.mkDerivation (final: rec { pname = "beegfs"; @@ -26,7 +27,7 @@ stdenv.mkDerivation (final: rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config which cmake ]; diff --git a/shared/userenv.nix b/shared/userenv.nix index 49b3d24..1e4a66a 100644 --- a/shared/userenv.nix +++ b/shared/userenv.nix @@ -34,7 +34,7 @@ let pandoc papi perl - pkgconfig + pkg-config postgresql postgresql.lib python3 diff --git a/statix.toml b/statix.toml new file mode 100644 index 0000000..4a5793d --- /dev/null +++ b/statix.toml @@ -0,0 +1,10 @@ +nix_version = '2.4' + +ignore = [ + '.direnv' +] + +disabled = [ + 'repeated_keys' +] +