From a9ba1527ca580483539cbb01a7bd59961aad6f56 Mon Sep 17 00:00:00 2001 From: oddlama Date: Sun, 18 Aug 2024 19:24:06 +0200 Subject: [PATCH] chore: flake update --- flake.lock | 141 +++++++++++++++++++------------------- flake.nix | 2 +- pkgs/default.nix | 25 +++++-- pkgs/kanidm-provision.nix | 6 +- users/config/utils.nix | 6 +- 5 files changed, 97 insertions(+), 83 deletions(-) diff --git a/flake.lock b/flake.lock index eac4e08..240f5eb 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1722339003, - "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1722476845, - "narHash": "sha256-7gZ8uf3qOox8Vrwd+p9EhUHHLhhK8lis/5KcXGmIaow=", + "lastModified": 1723996216, + "narHash": "sha256-QNykxbGaHF3ANP369TT+VEBHlHufwY0SQk1SvUz5RcE=", "owner": "nix-community", "repo": "disko", - "rev": "7e1b215a0a96efb306ad6440bf706d2b307dc267", + "rev": "fd43891af43916918eabdd498eeb24788d666079", "type": "github" }, "original": { @@ -719,11 +719,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -927,11 +927,11 @@ ] }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", "type": "github" }, "original": { @@ -1139,11 +1139,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -1160,11 +1160,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -1183,11 +1183,11 @@ "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { - "lastModified": 1722815593, - "narHash": "sha256-GJkmvEyLHxvNWNAXOuptP8QNMkTsm9VH+JBcTx5pSHA=", + "lastModified": 1723126356, + "narHash": "sha256-z7kG53JPob99YFWiDbECmau8QCNz25SsiDLILdFVolM=", "owner": "oddlama", "repo": "idmail", - "rev": "a26d3a21962396e26d1f7891938229a0cce34ba9", + "rev": "0dab1f6d6fd266ec77bcf2bf1556b7c7729f13c9", "type": "github" }, "original": { @@ -1234,11 +1234,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1722696400, - "narHash": "sha256-8bz0+XpjGgio5Bjte0PWsYRArVR2godIBoArly0D+HU=", + "lastModified": 1723470968, + "narHash": "sha256-W76xLG4thxkENM3MOoXWYqKPrgk1WgUWzTixUyuw/co=", "owner": "astro", "repo": "microvm.nix", - "rev": "dc326ff7fa41aa5cc210b99617743bbc51275924", + "rev": "69e8ac63a7a4d40bb65e73af41ba60df2eba0419", "type": "github" }, "original": { @@ -1295,11 +1295,11 @@ ] }, "locked": { - "lastModified": 1722609272, - "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=", + "lastModified": 1722924007, + "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49", + "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", "type": "github" }, "original": { @@ -1315,11 +1315,11 @@ ] }, "locked": { - "lastModified": 1722740924, - "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", + "lastModified": 1723950649, + "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", + "rev": "392828aafbed62a6ea6ccab13728df2e67481805", "type": "github" }, "original": { @@ -1353,11 +1353,11 @@ }, "nixlib": { "locked": { - "lastModified": 1722128034, - "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=", + "lastModified": 1723337705, + "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc", + "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a", "type": "github" }, "original": { @@ -1377,16 +1377,15 @@ "pre-commit-hooks": "pre-commit-hooks_5" }, "locked": { - "lastModified": 1722900646, - "narHash": "sha256-5yIEwMiydFm8ToZVEDg69HQdFxbsRDOwxj4tYa3tdKo=", + "lastModified": 1723133809, + "narHash": "sha256-CUx2HOkP6Gsd7Hi+jPgm57P9Kgq0dxRG8UrxLhjDmr8=", "owner": "oddlama", "repo": "nixos-extra-modules", - "rev": "31051a3f3cc21e79889447f6d0bfca27177d8761", + "rev": "2dfcc1f7de2cb36566c5f1b48986dd4555a173dc", "type": "github" }, "original": { "owner": "oddlama", - "ref": "append-only-backups", "repo": "nixos-extra-modules", "type": "github" } @@ -1399,11 +1398,11 @@ ] }, "locked": { - "lastModified": 1722214420, - "narHash": "sha256-qfHC1p5hcErGcE672/KhBkyWYloekQpqIxtcbcUVYkA=", + "lastModified": 1723870831, + "narHash": "sha256-rXQKvogLHY3BxRVVt5unpbi0zpRf965f57gplWSzQ5k=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "75cbb2a5e19c18840d105a72d036c6c92fc46c5d", + "rev": "32e9d82bada67fc5155e8d4d99b6fc3a1765bfdc", "type": "github" }, "original": { @@ -1414,11 +1413,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722332872, - "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", + "lastModified": 1723310128, + "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", + "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "type": "github" }, "original": { @@ -1502,14 +1501,14 @@ }, "nixpkgs-lib_4": { "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "nixpkgs-stable": { @@ -1626,11 +1625,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -1671,11 +1670,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1722763580, - "narHash": "sha256-LgYIYkNYzqCldWJ/xJRQ156WDp6P9hHb4EsIXsRa+u4=", + "lastModified": 1723923888, + "narHash": "sha256-w+/PG6KqB8en0x1JH5aMuf0QC78Nfei208EaaaRuYG4=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f7cf23b226ceaee0a2d479c505652065dfe526f", + "rev": "78fc4be6a830e8dc01f3e66ddbe3243b4bfe8560", "type": "github" }, "original": { @@ -1693,11 +1692,11 @@ ] }, "locked": { - "lastModified": 1722493084, - "narHash": "sha256-ktjl908zZKWcGdMyz6kX1kHSg7LFFGPYBvTi9FgQleM=", + "lastModified": 1723367906, + "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=", "owner": "NuschtOS", "repo": "search", - "rev": "3f5abffa5f28b4ac3c9212c81c5e8d2d22876071", + "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d", "type": "github" }, "original": { @@ -1874,11 +1873,11 @@ "nixpkgs-stable": "nixpkgs-stable_6" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1723803910, + "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", "type": "github" }, "original": { @@ -2043,11 +2042,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1719714047, - "narHash": "sha256-MeNPopLLv63EZj5L43j4TZkmW4wj1ouoc/h/E20sl/U=", + "lastModified": 1722391647, + "narHash": "sha256-JTi7l1oxnatF1uX/gnGMlRnyFMtylRw4MqhCUdoN2K4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cb216719ce89a43dfb3d1b86a9575e89f4b727a4", + "rev": "0fd4a5d2098faa516a9b83022aec7db766cd1de8", "type": "github" }, "original": { @@ -2115,11 +2114,11 @@ ] }, "locked": { - "lastModified": 1722295291, - "narHash": "sha256-3XpT9GMw50NCGT1Gd2YAwEjrEcFtDqnuQ7sRUcuU/Pc=", + "lastModified": 1723834469, + "narHash": "sha256-PkJTr9DWBQcR5Ru1fJpG80dtw0MLSxAZlKnhHHFAGIA=", "owner": "danth", "repo": "stylix", - "rev": "feb2973dfa8232c07efbd2b48f11a5cfa2276570", + "rev": "6858d08ed012bc6491cc92c13142104e56badf31", "type": "github" }, "original": { @@ -2338,11 +2337,11 @@ ] }, "locked": { - "lastModified": 1722330636, - "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", + "lastModified": 1723454642, + "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", + "rev": "349de7bc435bdff37785c2466f054ed1766173be", "type": "github" }, "original": { @@ -2383,11 +2382,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1721535277, - "narHash": "sha256-A6qIy2n3aomj5XooUmqz0s3G/A44Y3+GoFrGxIOolIM=", + "lastModified": 1723726454, + "narHash": "sha256-CdsBLja4rJ7VPvtsivyZm9VFKAt4hzL3jZbKrfiDvsQ=", "owner": "Toqozz", "repo": "wired-notify", - "rev": "d079126c43f22179650f3d4c59f580c5993b9217", + "rev": "946adddcb704806195d976b738066f591b41b7d4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 87b1f44..673dae7 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ }; nixos-extra-modules = { - url = "github:oddlama/nixos-extra-modules/append-only-backups"; + url = "github:oddlama/nixos-extra-modules"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/pkgs/default.nix b/pkgs/default.nix index 0956680..c66cd81 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -4,20 +4,35 @@ _inputs: [ (_final: prev: { deploy = prev.callPackage ./deploy.nix {}; git-fuzzy = prev.callPackage ./git-fuzzy {}; - stalwart-mail = prev.callPackage ./stal.nix {}; + stalwart-mail = builtins.trace "remove once 0.9.1 is stable" (prev.callPackage ./stal.nix {}); + delta = builtins.trace "remove once #334814" (prev.delta.overrideAttrs (old: rec { + version = "0.17.0-unstable-2024-08-12"; + + src = prev.fetchFromGitHub { + owner = "dandavison"; + repo = "delta"; + rev = "a01141b72001f4c630d77cf5274267d7638851e4"; + hash = "sha256-My51pQw5a2Y2VTu39MmnjGfmCavg8pFqOmOntUildS0="; + }; + + cargoDeps = old.cargoDeps.overrideAttrs (_c_old: { + inherit src; + outputHash = "sha256-TJ/yLt53hKElylycUfGV8JGt7GzqSnIO3ImhZvhVQu0="; + }); + })); kanidm = prev.kanidm.overrideAttrs (old: let provisionSrc = prev.fetchFromGitHub { owner = "oddlama"; repo = "kanidm-provision"; - rev = "v1.0.1"; - hash = "sha256-tSr2I7bGEwJoC5C7BOmru2oh9ta04WVTz449KePYSK4="; + rev = "v1.1.1"; + hash = "sha256-tX24cszmWu7kB5Eoa3OrPqU1bayD62OpAV12U0ayoEo="; }; in { patches = old.patches ++ [ - "${provisionSrc}/patches/1.2.0-oauth2-basic-secret-modify.patch" - "${provisionSrc}/patches/1.2.0-recover-account.patch" + "${provisionSrc}/patches/1.3.2-oauth2-basic-secret-modify.patch" + "${provisionSrc}/patches/1.3.2-recover-account.patch" ]; passthru.enableSecretProvisioning = true; doCheck = false; diff --git a/pkgs/kanidm-provision.nix b/pkgs/kanidm-provision.nix index b076dbb..d071148 100644 --- a/pkgs/kanidm-provision.nix +++ b/pkgs/kanidm-provision.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "kanidm-provision"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "oddlama"; repo = "kanidm-provision"; rev = "v${version}"; - hash = "sha256-pFOFFKh3la/sZGXj+pAM8x4SMeffvvbOvTjPeHS1XPU="; + hash = "sha256-tX24cszmWu7kB5Eoa3OrPqU1bayD62OpAV12U0ayoEo="; }; - cargoHash = "sha256-oiKlKIL23xH67tCDbny9Gj97JQQm4mYt0IHXB5hzJ/A="; + cargoHash = "sha256-Ok8A47z5Z3QW4teql/4RyDlox/nrhkdA6IN/qJm13bM="; meta = with lib; { description = "A small utility to help with kanidm provisioning"; diff --git a/users/config/utils.nix b/users/config/utils.nix index 6c0917e..43126dc 100644 --- a/users/config/utils.nix +++ b/users/config/utils.nix @@ -6,8 +6,8 @@ }: lib.optionalAttrs (!minimal) { home = { - packages = with pkgs; [ - bandwhich + packages = builtins.trace "reenable bandwhich later" (with pkgs; [ + #bandwhich btop delta fd @@ -29,7 +29,7 @@ lib.optionalAttrs (!minimal) { wget usbutils pciutils - ]; + ]); }; programs = {