From 9dbbf590edd1dcbb68bbbe881da193764e4a8dea Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 22 Nov 2021 03:16:20 +0100 Subject: [PATCH] flake.lock: update --- flake.lock | 102 ++++++++++++++++++++++++----------------------------- flake.nix | 1 + 2 files changed, 47 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index b6f75063..c227359e 100644 --- a/flake.lock +++ b/flake.lock @@ -4,15 +4,17 @@ "inputs": { "mozillapkgs": "mozillapkgs", "naersk": "naersk", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { - "lastModified": 1636572320, - "narHash": "sha256-TVDLjjncHI28J2z3U8RgRJxZ5XUN1XTXmqgoLFZcDQE=", + "lastModified": 1637547331, + "narHash": "sha256-mq04p2by1X2V3WGsBbJPNeK+1YmZp5m7h3YNCKZ0zps=", "ref": "master", - "rev": "aad1a91646a937692cf4a3af3d59560f1d163721", - "revCount": 39, + "rev": "633a418001e7e2801ab229e75f40f01b58811db3", + "revCount": 40, "type": "git", "url": "https://gitea.c3d2.de/astro/heliwatch.git" }, @@ -60,11 +62,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1636317251, - "narHash": "sha256-u1cWvvtGH5mfGkeIKrqw2usk4IL7wDiRcnJkUSiZq3Q=", + "lastModified": 1637242070, + "narHash": "sha256-/XCFGOriSpAgo0lPxVK12vFBpta567kwfHZr5tNNHyE=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "fd6f34afcf062761fb5035230f6297752bfedcba", + "rev": "5a7e613703ea349fd46b3fa2f3dfe3bd5444d591", "type": "github" }, "original": { @@ -75,16 +77,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1635547145, - "narHash": "sha256-qhyl0MMqBal5io91P6Qu7Lb20NM5Y1+2Y4TkUCN1nJQ=", - "owner": "NixOS", + "lastModified": 1637497871, + "narHash": "sha256-UXjWFjZSQW56Ax2fKspG0aezeRmV7j4WAbkbnZpIFtk=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "ecebf0602cb068c784f386dd7f0bbeba57d619e4", + "rev": "d5c4e868ce3783a95bc1dd898777f09af7ff69ee", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "release-21.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-master": { @@ -120,11 +124,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1636976544, - "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", + "lastModified": 1637155076, + "narHash": "sha256-26ZPNiuzlsnXpt55Q44+yzXvp385aNAfevzVEKbrU5Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6", + "rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2", "type": "github" }, "original": { @@ -136,35 +140,21 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1636333654, - "narHash": "sha256-3wh9PtCzcaJQuZrgZ+ygKfhltkDNNqT6zOzGsRbjZEo=", - "owner": "nixos", + "lastModified": 1637209424, + "narHash": "sha256-oXw75hkCOVtoB+CEElWiTmkC1gNdL3jf0tG2GInytHA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e74894146a42ba552ebafa19ab2d1df7ccbc1738", + "rev": "42d32516400c1d821d275a5460900bbaef3d3bf1", "type": "github" }, "original": { - "owner": "nixos", - "ref": "release-21.05", + "owner": "NixOS", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { - "locked": { - "lastModified": 1636574401, - "narHash": "sha256-/VxpOq1lWGTT14PTkxFQmkXzcezb2N/E6UnosXcYcvI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b3f59f2089722ec4f0d4a032d329d33ddd63a226", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1636228094, "narHash": "sha256-CpOcIwHAn3yS0PeVmUICFrJ+gde2PiZp3XsnDP3LE9w=", @@ -180,7 +170,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1636997306, "narHash": "sha256-lzZka8I/y/CRKeXkfyafFx6/dh5LnIBUIM7VfPHy1I4=", @@ -217,7 +207,7 @@ "inputs": { "heliwatch": "heliwatch", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-mobilizon": "nixpkgs-mobilizon", "nixpkgs-unstable": "nixpkgs-unstable", "scrapers": "scrapers", @@ -248,17 +238,17 @@ }, "secrets": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "sops-nix": [ "sops-nix" ] }, "locked": { - "lastModified": 1636591632, - "narHash": "sha256-T4Zy9eMMvlz9xN8k9RaVpXswN960fVvFSQKZawLgisY=", + "lastModified": 1637279330, + "narHash": "sha256-KVpmVahyEZCv+FBMGTnLr58mLEdaY5TskgXBLcGEmTk=", "ref": "master", - "rev": "a8a008bba31ff71f8d9cb98533bdafe8a69a4e39", - "revCount": 106, + "rev": "3b8e8c32965dde461833513580ab1bed7becf2fc", + "revCount": 111, "type": "git", "url": "ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git" }, @@ -269,14 +259,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1636497917, - "narHash": "sha256-8U0Tvot7U5KJ8vpn6xR611v7b441QdAQC04xhxjMHOc=", + "lastModified": 1637050424, + "narHash": "sha256-8IaY0/Y5g3jJiQzPN0PflKFcFEE1C29DZZ0dF1NIJ6s=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a8cbd0c796e4678f0fd2e59f274e49705ee523ed", + "rev": "3c53d012ac77d4bd8428f9c847709e287c897ad9", "type": "github" }, "original": { @@ -320,11 +310,11 @@ "tigger": { "flake": false, "locked": { - "lastModified": 1622043244, - "narHash": "sha256-0cOQh43PlkP/rg8GJ5vitNmMcT8tRUQmuFbAwTY/BDM=", + "lastModified": 1636663622, + "narHash": "sha256-UCCM/o5ounrQauRyQwuvcqHGBe8QTqgldZX5qngWpTg=", "owner": "astro", "repo": "tigger", - "rev": "64cad453461e54579e86f5f7059db553ce3de19c", + "rev": "7aa40ebfc7c9e39dcb2461cf168aab7aa65ca6b0", "type": "github" }, "original": { @@ -371,16 +361,16 @@ }, "zentralwerk": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-master": "nixpkgs-master", "openwrt": "openwrt" }, "locked": { - "lastModified": 1637365461, - "narHash": "sha256-2R8FsTLTEhE0OHvEqlbfH3Eq7Hgpl1cMKtCv3JcFHH8=", + "lastModified": 1637442635, + "narHash": "sha256-/apxD+PfnOxdTE44V3QBsxmUSDI4i1WvyisA/DNpLPs=", "ref": "master", - "rev": "9900b9af5e80da0b2b85a866662f8f210b325b1a", - "revCount": 1291, + "rev": "7ac993f61ee1805bcbe64ccfb0dc564d24939d0c", + "revCount": 1292, "type": "git", "url": "https://gitea.c3d2.de/zentralwerk/network.git" }, diff --git a/flake.nix b/flake.nix index adfa2086..03c1f976 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,7 @@ ticker.url = "git+https://gitea.c3d2.de/astro/ticker.git"; ticker.flake = false; heliwatch.url = "git+https://gitea.c3d2.de/astro/heliwatch.git"; + heliwatch.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; };