From f9bb2843ed3cad348a0a5df7db4d6789693a3017 Mon Sep 17 00:00:00 2001 From: Bad Date: Thu, 17 Nov 2022 20:58:01 +0100 Subject: [PATCH] Update flake.lock --- flake.lock | 111 +++++++++++++------------------- flake.nix | 2 +- users/modules/podman/podman.nix | 4 +- 3 files changed, 49 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index 7658b2f..7da23a0 100644 --- a/flake.lock +++ b/flake.lock @@ -20,21 +20,6 @@ "type": "github" } }, - "blank": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -42,11 +27,11 @@ ] }, "locked": { - "lastModified": 1666776005, - "narHash": "sha256-HwSMF19PpczfqNHKcFsA6cF4PVbG00uUSdbq6q3jB5o=", + "lastModified": 1668784520, + "narHash": "sha256-gGgVAMwYPPmrfnvnoRi6OkEB5KRsNTb9uYzEceLdO/g=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "f6648ca0698d1611d7eadfa72b122252b833f86c", + "rev": "6349b99bc2b96ded34d068a88c7c5ced406b7f7f", "type": "github" }, "original": { @@ -125,7 +110,6 @@ }, "digga": { "inputs": { - "blank": "blank", "darwin": "darwin_2", "deploy": [ "deploy" @@ -136,9 +120,6 @@ "home-manager": [ "home" ], - "latest": [ - "latest" - ], "nixlib": [ "nixos" ], @@ -150,11 +131,11 @@ ] }, "locked": { - "lastModified": 1665848456, - "narHash": "sha256-UwJ2bY/K5rK5oa+uIQjyz9EXyNoGYBlKXZCcdav5w14=", + "lastModified": 1668250948, + "narHash": "sha256-qqyzJQHgb/Bgq3Zxwa0gmaDEpkuyVhvynnq6a0akMWw=", "owner": "divnix", "repo": "digga", - "rev": "1f97cb28f13aa0770947568589116468c68b3f26", + "rev": "54ede8e591d288c176a09d6fcf4b123896c0bf0f", "type": "github" }, "original": { @@ -169,11 +150,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1667111309, - "narHash": "sha256-8qCdT/E4CG5dfASGsY/4zGmkPH/rAGBpC/XHUSU8dvo=", + "lastModified": 1668752858, + "narHash": "sha256-mOnqbZIb1sqd2sw/eAxXCodLJ1YPQlaM/wa6Zl2EQ8I=", "owner": "nix-community", "repo": "fenix", - "rev": "69088e3e1a384a23a6d048a56c9ce1a2a94a9b2a", + "rev": "21f7b33a665be13a7baeae6a85001b6511af5dfc", "type": "github" }, "original": { @@ -297,11 +278,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1667077288, - "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -342,11 +323,11 @@ }, "flake-utils_6": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -365,11 +346,11 @@ ] }, "locked": { - "lastModified": 1666990295, - "narHash": "sha256-JPMTX8W36IPV1jmKV1qEhNBI4MbIPYsnccWyTUlSiG0=", + "lastModified": 1668787257, + "narHash": "sha256-iEQaCmwEy8rm77sBMN0xMMHONMxwbq86TgE48RUs/30=", "owner": "nix-community", "repo": "home-manager", - "rev": "423211401c245934db5052e3867cac704f658544", + "rev": "5589b28e66ccaa13852c8aa58ecb45025e88e67e", "type": "github" }, "original": { @@ -396,11 +377,11 @@ }, "latest": { "locked": { - "lastModified": 1667121610, - "narHash": "sha256-AKhmJDNe13j0xkuMD0+2XsQ7Moi/6wwrP7srN3w8c6w=", + "lastModified": 1668785491, + "narHash": "sha256-0FfPWQPImgWkIkpCgWAZVtZb28i4t9wxELlfm1x5d08=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bdc55c3a0f694e36a1dfffd8f8a960d9b88d0724", + "rev": "7e853f1d552a6327304339cd6c26d492d2def940", "type": "github" }, "original": { @@ -451,11 +432,11 @@ }, "nixos": { "locked": { - "lastModified": 1667050928, - "narHash": "sha256-xOn0ZgjImIyeecEsrjxuvlW7IW5genTwvvnDQRFncB8=", + "lastModified": 1668765800, + "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fdebb81f45a1ba2c4afca5fd9f526e1653ad0949", + "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", "type": "github" }, "original": { @@ -467,11 +448,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1666873549, - "narHash": "sha256-a6Eu1Qv/EndjepSMja5SvcG+4vM5Rl2gzJD7xscRHss=", + "lastModified": 1668334946, + "narHash": "sha256-omMbUj4r5DVBWh7KxkoO/Z/1V1shVR6Ls4jXNB4mr3U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "419dcc0ec767803182ed01a326f134230578bf60", + "rev": "e0452b33ab0ef16ffe075e980644ed92a6a200bb", "type": "github" }, "original": { @@ -482,11 +463,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667050928, - "narHash": "sha256-xOn0ZgjImIyeecEsrjxuvlW7IW5genTwvvnDQRFncB8=", + "lastModified": 1668671332, + "narHash": "sha256-6QW9sTuLDcBLoR5EY+6LR7Y1k0dFVEMqcWY4jYOuiqM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fdebb81f45a1ba2c4afca5fd9f526e1653ad0949", + "rev": "54be84c3ac0122c2b2272fc68a9015304bc0bb73", "type": "github" }, "original": { @@ -522,11 +503,11 @@ ] }, "locked": { - "lastModified": 1664550666, - "narHash": "sha256-eXfMRd9uItEp3PsYI31FSVGPG9dVC6yF++65ZrGwW8A=", + "lastModified": 1667620329, + "narHash": "sha256-v1Zk7rtEbAGpevBGPZvZBKpwbmw4I+uVwxvd+pBlp3o=", "owner": "berberman", "repo": "nvfetcher", - "rev": "9763ad40d59a044e90726653d9253efaeeb053b2", + "rev": "294826951113dcd3aa9abbcacfb1aa5b95a19116", "type": "github" }, "original": { @@ -568,11 +549,11 @@ "pycdc": "pycdc" }, "locked": { - "lastModified": 1645880943, - "narHash": "sha256-mNtN0sk6NJILwdzCFgRzZ5xVFmfCkNCryV0HaKWRlQ0=", + "lastModified": 1667669150, + "narHash": "sha256-woULzWmHqrpfSDCo10QhZOGa6rB+E9ZqL4cjwX6u8TA=", "ref": "refs/heads/mistress", - "rev": "8459beb3385a9c4f45d8b4ad58ad90c7a5f503e4", - "revCount": 4, + "rev": "6ee2339943853341cdc07bc6505df5125a1c45c3", + "revCount": 5, "type": "git", "url": "https://im.badat.dev/bad/pwnix.git" }, @@ -584,11 +565,11 @@ "pycdc": { "flake": false, "locked": { - "lastModified": 1637645353, - "narHash": "sha256-iLf0pwmIF13/IS+vzpudT5O54Jj933pBZi0gbiz6Ebc=", + "lastModified": 1664922278, + "narHash": "sha256-whpsEjk/nnnAUH68kzZBCs7azA13B0FTUy5NuF7kQrA=", "owner": "zrax", "repo": "pycdc", - "rev": "99b35a114a6fb84352ca92802c1a26fb8692a7b0", + "rev": "44a730f3a889503014fec94ae6e62d8401cb75e5", "type": "github" }, "original": { @@ -620,11 +601,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1667033654, - "narHash": "sha256-D0YwkSqwtD08twtCtN5q0a8S0Y26kgDWg1ruRNEQEOw=", + "lastModified": 1668703311, + "narHash": "sha256-yPMeNQ2GyQlAO0FjY9VZExEGgsI6bEdzcEmicBuPXHE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ba28e19b7838e3ad4223ae82d074dc3950ef1548", + "rev": "e162d5800a54320b3cdf88b15ec2eb6a89291585", "type": "github" }, "original": { @@ -636,11 +617,11 @@ }, "stable": { "locked": { - "lastModified": 1666961615, - "narHash": "sha256-+Sqz6zQA85Q14U/KwsJO386oxd47zDte8dqBGOtRJGg=", + "lastModified": 1668595291, + "narHash": "sha256-j8cyfbtT5sAYPYwbERgTDzfD48ZernL0/V668eGpXAM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "040c6d8374d090f46ab0e99f1f7c27a4529ecffd", + "rev": "6474d93e007e4d165bcf48e7f87de2175c93d10b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ef900a9..0c5cbe5 100644 --- a/flake.nix +++ b/flake.nix @@ -80,7 +80,7 @@ imports = [ (digga.lib.importOverlays ./overlays) ]; overlays = [ # fenix.overlay breaks the cache, because it uses the system nixpkgs - (_: super: let pkgs = fenix.inputs.nixpkgs.legacyPackages.${super.system}; in fenix.overlay pkgs pkgs) + (_: super: let pkgs = fenix.inputs.nixpkgs.legacyPackages.${super.system}; in fenix.overlays.default pkgs pkgs) agenix.overlay ./pkgs/default.nix diff --git a/users/modules/podman/podman.nix b/users/modules/podman/podman.nix index b8bc923..938e570 100644 --- a/users/modules/podman/podman.nix +++ b/users/modules/podman/podman.nix @@ -116,8 +116,8 @@ in Service = { Type = "exec"; KillMode = "process"; - Environment = "LOGGING=\" --log-level=info\""; - ExecStart = [ "" "${cfg.package}/bin/podman $LOGGING system service" ]; + Environment = [ "LOGGING=\" --log-level=info\"" ]; + ExecStart = "${pkgs.bash}/bin/bash -c 'PATH=\"$PATH:/run/wrappers/bin\" ${cfg.package}/bin/podman $LOGGING system service'"; }; Install = {