From 6bd8676dfbdc01bfe22fae9594b41551bbd1039c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 18 Jul 2022 22:34:48 +0200 Subject: [PATCH] flake: update --- flake.lock | 96 ++++++++++++++++++++++++++---------------------------- flake.nix | 1 - 2 files changed, 46 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 0587994..9c61a81 100644 --- a/flake.lock +++ b/flake.lock @@ -4,9 +4,7 @@ "inputs": { "fenix": "fenix", "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "utils": "utils" }, "locked": { @@ -68,11 +66,11 @@ ] }, "locked": { - "lastModified": 1655983956, - "narHash": "sha256-2h986XafeFMRuIVy3CjfVgzz0cqYbaxfXzcqeCCGqEU=", + "lastModified": 1657102481, + "narHash": "sha256-62Fuw8JgPub38OdgNefkIKOodM9nC3M0AG6lS+7smf4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9b0000f75f6a53c0814264e27ca32f4bddeb15cc", + "rev": "608ed3502263d6f4f886d75c48fc2b444a4ab8d8", "type": "github" }, "original": { @@ -100,15 +98,15 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1656519667, - "narHash": "sha256-iecJds7Dt7ezb5C95IEffsOaH7m7aLa5Eu/MnS9fv4E=", + "lastModified": 1658146194, + "narHash": "sha256-Q+sHhQ23DynT7R+Vb0jm3DVhvfuntb5eWWCVdAJ16Mc=", "owner": "NixOS", "repo": "nix", - "rev": "b7eb4ac1692e289912f3988c0e28bb2c778a4f7a", + "rev": "2584c151bd1921035abd51cc31e29b3bf15d53cb", "type": "github" }, "original": { @@ -119,11 +117,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1656702262, - "narHash": "sha256-BdVdx6LoGgAeIYrHnzk+AgbtkaVlV3JNcC6+vltLuh0=", + "lastModified": 1657781616, + "narHash": "sha256-M/wl8+gRNELNhEmNjWTZVf61lfZIyiUn/NkyEqQAW80=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5308381432cdbf14d5b1128747a2845f5c6871e", + "rev": "76c9664813ed7082115ac7efb8a1619a804a631f", "type": "github" }, "original": { @@ -134,43 +132,26 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653988320, - "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=", + "lastModified": 1645433236, + "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1", + "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-21_11": { - "locked": { - "lastModified": 1656198488, - "narHash": "sha256-xe81o3Kin6a0jXA3mTxcR+jeA1jLKw3TCar5LUo/B5c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "46af3303651699dc58cfc251d9b18c0f59d857da", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-21.11", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" } }, "nixpkgs-22_05": { "locked": { - "lastModified": 1656199498, - "narHash": "sha256-/BCpM7j7y1G4het6Z3idlnv9A87/s0O1glVmH7fnWvk=", + "lastModified": 1658029355, + "narHash": "sha256-VJcYmkYfzwHrZ76SMH6y9KqoVFOPgZiJgh1rK9cF2mw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72a1f167077060a1a7b6e0104863245d0483fa7f", + "rev": "4e329926df7ee5fa49929a83d31ee7d541f8b45c", "type": "github" }, "original": { @@ -198,11 +179,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1656753965, - "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", + "lastModified": 1658015103, + "narHash": "sha256-mO+23f3SO+fBzEvbxRe6GkSB5Xp43CT2sV8Rs8MYdz8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", + "rev": "8f485713f5e6b6883a9b6959afa98688360a3ecb", "type": "github" }, "original": { @@ -213,11 +194,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1656679828, - "narHash": "sha256-akGA97pR1BAQew1FrVTCME3p8qvYxJXB2X3a13aBphs=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "915f5a5b3cc4f8ba206afd0b70e52ba4c6a2796b", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1657972522, + "narHash": "sha256-JTiKsBT1BwMbtSUsvtSl8ffkiirby8FaujJVGV766Q8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "07a2e6a4e31ea48408861607198972d60adaf4ad", "type": "github" }, "original": { @@ -232,7 +229,7 @@ "flake-parts": "flake-parts", "nix": "nix", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", "stunkymonkey": "stunkymonkey" @@ -260,15 +257,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-21_11": "nixpkgs-21_11", "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1656399028, - "narHash": "sha256-re66+rVHGR3y+0QsaDAwoAHCfoi3BlGV24t2EqRZsAE=", + "lastModified": 1658030499, + "narHash": "sha256-Y2Me+uys8VpKUincd7T3ab8O4gBFv8bR5BmBZfn4i4w=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d26947f2d6252e2aae5ffddfe9b38b7c4b94e8f9", + "rev": "7526ce07b897ad1f1016680de5121f646e28a893", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9807d57..919a0d5 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,6 @@ nixos-hardware.url = "github:NixOS/nixos-hardware"; deploy-rs.url = "github:input-output-hk/deploy-rs"; - deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";