From f0ea096a62767e57d0c807d963d920db8f9f9813 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 28 Jan 2023 22:02:35 +0100 Subject: [PATCH] Bump flake.lock, use fork for qMasterPassword use 22.05 to pin terraform version to 1.2.3 --- flake.lock | 150 +++++++++++++++++++++++++++-------------- flake.nix | 8 ++- overlays/overrides.nix | 10 ++- 3 files changed, 115 insertions(+), 53 deletions(-) diff --git a/flake.lock b/flake.lock index b3ba627b..13028617 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1665870395, - "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", + "lastModified": 1673301561, + "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", "owner": "ryantm", "repo": "agenix", - "rev": "a630400067c6d03c9b3e0455347dc8559db14288", + "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", "type": "github" }, "original": { @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1668784520, - "narHash": "sha256-gGgVAMwYPPmrfnvnoRi6OkEB5KRsNTb9uYzEceLdO/g=", + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6349b99bc2b96ded34d068a88c7c5ced406b7f7f", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "type": "github" }, "original": { @@ -85,11 +85,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1668797197, - "narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=", + "lastModified": 1674127017, + "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", "owner": "serokell", "repo": "deploy-rs", - "rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce", + "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", "type": "github" }, "original": { @@ -202,11 +202,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -234,11 +234,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -341,23 +341,40 @@ "type": "github" } }, + "fork": { + "locked": { + "lastModified": 1669056793, + "narHash": "sha256-xf4QnWQlZsQRVRL0mnjCKg11d92532619dFDIZiXHEc=", + "owner": "teutat3s", + "repo": "nixpkgs", + "rev": "4e2b7d7a929ffa4a63328a71853dabd99ed403ca", + "type": "github" + }, + "original": { + "owner": "teutat3s", + "ref": "fix/qMasterPassword-styles", + "repo": "nixpkgs", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ "nixos" - ] + ], + "utils": "utils_2" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1672244468, + "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -380,11 +397,11 @@ }, "latest_2": { "locked": { - "lastModified": 1669320964, - "narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=", + "lastModified": 1674641431, + "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877", + "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "type": "github" }, "original": { @@ -396,11 +413,11 @@ }, "master": { "locked": { - "lastModified": 1669473549, - "narHash": "sha256-+fILdVXXYES1wQrc3GtWZcTMgMzzMU0pemjEhqKdTkE=", + "lastModified": 1674149691, + "narHash": "sha256-vymZVkKePGdqZVodd9Eq9CNM1aK0BrMr23AEvu8xDpQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff19f26c6d76fd573676cdd6beb3f1a9f49d474a", + "rev": "ed8cab77e11cdaa77103854e4575fc3dc4e8c61a", "type": "github" }, "original": { @@ -417,11 +434,11 @@ ] }, "locked": { - "lastModified": 1662220400, - "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=", + "lastModified": 1671096816, + "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=", "owner": "nmattia", "repo": "naersk", - "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3", + "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114", "type": "github" }, "original": { @@ -439,7 +456,7 @@ "nixpkgs": [ "latest" ], - "utils": "utils_2" + "utils": "utils_3" }, "locked": { "lastModified": 1655761558, @@ -472,11 +489,27 @@ }, "nixos": { "locked": { - "lastModified": 1669378442, - "narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=", + "lastModified": 1674781052, + "narHash": "sha256-nseKFXRvmZ+BDAeWQtsiad+5MnvI/M2Ak9iAWzooWBw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51", + "rev": "cc4bb87f5457ba06af9ae57ee4328a49ce674b1b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixos-22-05": { + "locked": { + "lastModified": 1672580127, + "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0874168639713f547c05947c76124f78441ea46c", "type": "github" }, "original": { @@ -492,11 +525,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1669065280, - "narHash": "sha256-3+pq1oJWjGDLfd8G/vR3IIFZ+EQ/aglukA0bTiMlf3o=", + "lastModified": 1672682641, + "narHash": "sha256-940TLvtdT8YKuP5nXcPhUfNeK0A/leSjjG8hfqvWM84=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "50aeec40f2072d2ab267c8ec8a345573704ec110", + "rev": "30516cb2b01896e14ce66893e414b6e3eec71cac", "type": "github" }, "original": { @@ -507,11 +540,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1669146234, - "narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=", + "lastModified": 1673803274, + "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d", + "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", "type": "github" }, "original": { @@ -587,12 +620,14 @@ "deploy": "deploy", "digga": "digga", "flake-compat": "flake-compat_3", + "fork": "fork", "home": "home", "latest": "latest_2", "master": "master", "naersk": "naersk", "nix-autobahn": "nix-autobahn", "nixos": "nixos", + "nixos-22-05": "nixos-22-05", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nur": "nur", @@ -626,11 +661,11 @@ }, "locked": { "dir": "vmtools", - "lastModified": 1668514320, - "narHash": "sha256-P+wzdarT2l+91VPf9hsYtKJad7WHttN5oFFlGQHJ5mQ=", + "lastModified": 1669648111, + "narHash": "sha256-EKh7iM4fCyZ7L6+HmGn3QkZ1HuG9zMEkziOH3K13SbY=", "ref": "main", - "rev": "8648709ed952423e82d62eb634918de1b1cfdc82", - "revCount": 27, + "rev": "d78c4afe040440437949ce581ae0dcdc5893553c", + "revCount": 28, "type": "git", "url": "https://git.b12f.io/pub-solar/infra?dir=vmtools" }, @@ -650,11 +685,11 @@ ] }, "locked": { - "lastModified": 1669411978, - "narHash": "sha256-GvT/mYBe+mUybYJ3NsWlWmIiDvrLehRAM7nM+2TPPXE=", + "lastModified": 1669581047, + "narHash": "sha256-qs2VUUCCkWlc+5KvP/Vh2ToLKMkCjAws47bVT6rilG8=", "ref": "main", - "rev": "ada06c3c43db5913d76e74426b89dc8373791864", - "revCount": 51, + "rev": "341aa68b667a8fb9b77f8af319b7439e82c78793", + "revCount": 53, "type": "git", "url": "https://git.greenbaum.cloud/dev/tritonshell" }, @@ -666,11 +701,11 @@ }, "utils": { "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -680,6 +715,21 @@ } }, "utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_3": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", diff --git a/flake.nix b/flake.nix index 6c3e87d8..2f0f3623 100644 --- a/flake.nix +++ b/flake.nix @@ -7,9 +7,11 @@ inputs = { # Track channels with commits tested and built by hydra - nixos.url = "github:nixos/nixpkgs/nixos-22.05"; + nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05"; + nixos.url = "github:nixos/nixpkgs/nixos-22.11"; latest.url = "github:nixos/nixpkgs/nixos-unstable"; master.url = "github:nixos/nixpkgs/master"; + fork.url = "github:teutat3s/nixpkgs/fix/qMasterPassword-styles"; flake-compat.url = "github:edolstra/flake-compat"; flake-compat.flake = false; @@ -20,7 +22,7 @@ digga.inputs.home-manager.follows = "home"; digga.inputs.deploy.follows = "deploy"; - home.url = "github:nix-community/home-manager/release-22.05"; + home.url = "github:nix-community/home-manager/release-22.11"; home.inputs.nixpkgs.follows = "nixos"; darwin.url = "github:LnL7/nix-darwin"; @@ -79,8 +81,10 @@ imports = [(digga.lib.importOverlays ./overlays)]; overlays = []; }; + nixos-22-05 = {}; latest = {}; master = {}; + fork = {}; }; lib = import ./lib {lib = digga.lib // nixos.lib;}; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 52f74e4c..0823069a 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -14,7 +14,6 @@ channels: final: prev: { signal-desktop starship deploy-rs - nix tdesktop arduino arduino-cli @@ -24,6 +23,15 @@ channels: final: prev: { yubikey-agent ; + inherit + (channels.fork) + qMasterPassword + ; + inherit + (channels.nixos-22-05) + terraform + ; + #inherit (channels.master) # ;