From 6c6a88977521c315a82d00166e760bc8b9fec37e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 31 Jul 2022 18:08:28 +0200
Subject: [PATCH] Fix eval

---
 flake.lock | 67 ++++++++++++++++++++++++++----------------------------
 flake.nix  |  2 +-
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/flake.lock b/flake.lock
index cce4cc8e..4b2ceac8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1658730563,
-        "narHash": "sha256-NDaSjaNdynCM02hRLOL76CKeD5Bxjxe8aNsD6AQ4U5I=",
+        "lastModified": 1659248763,
+        "narHash": "sha256-YCaOwmtgpnEJGmZNHwnQArCeB3arQf1LPr/OSZVmHZ8=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "80981ee71b32ce0747d22b1fd2dcd895219f5c1d",
+        "rev": "e4787a9b299117979bd04d396466c9c7cb4ac568",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1658173163,
-        "narHash": "sha256-NBrnHzDg478boeu0JzMvERktPEBiwDvPA2ZjfRGkeAU=",
+        "lastModified": 1659196193,
+        "narHash": "sha256-R7LmNYexghJ79WdFkQnYvRWT2encMxQQw21HoJwG2UQ=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "183cbd9bc50260d321806305a471c2c40190c258",
+        "rev": "1f1a004ca878665b4f7a91e138d8604793ef98d2",
         "type": "github"
       },
       "original": {
@@ -261,11 +261,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1658777571,
-        "narHash": "sha256-gJMDUeaRhi47NxtrfFMIejlV5N3Ra2669w16Ndz2Jo0=",
+        "lastModified": 1659153955,
+        "narHash": "sha256-BAdA1WBHi/TBSaeyDjsVIqe62r0w/5ZvsaglXivOLLM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f0fa012b649a47e408291e96a15672a4fe925d65",
+        "rev": "1e5d0fbd82f0f1370c70026d255deda2d9c8a585",
         "type": "github"
       },
       "original": {
@@ -277,11 +277,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1658401027,
-        "narHash": "sha256-z/sDfzsFOoWNO9nZGfxDCNjHqXvSVZLDBDSgzr9qDXE=",
+        "lastModified": 1659256765,
+        "narHash": "sha256-RE4l6J+ApJ1vd4QFDhbEasv0M/deTxSK5IsIBYXuHmE=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "83009edccc2e24afe3d0165ed98b60ff7471a5f8",
+        "rev": "727a099e871ff10ae09a1ebd056a5ba4b9dbe50f",
         "type": "github"
       },
       "original": {
@@ -292,11 +292,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1658737577,
-        "narHash": "sha256-xosJ5nJT9HX+b6UWsSX6R+ap4AdZOCrl/r+IKFp2ASQ=",
+        "lastModified": 1659219666,
+        "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5a0e0d73b944157328d54c4ded1cf2f0146a86a5",
+        "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c",
         "type": "github"
       },
       "original": {
@@ -308,11 +308,11 @@
     },
     "nixos-unstable-sandro": {
       "locked": {
-        "lastModified": 1658874075,
-        "narHash": "sha256-JmxemQQZ+K7L85d/UTeRXVNoPlOHIwI4d09axCO6WW4=",
+        "lastModified": 1659280702,
+        "narHash": "sha256-6aBB10/+SraZT/mzG/S0gAB9engTrJxA3oRVHQsza3U=",
         "owner": "SuperSandro2000",
         "repo": "nixpkgs",
-        "rev": "7db696ca0cb9d2afbbb0d5a3eda6b672b3cb823d",
+        "rev": "c77a692ffd88226c00bc12f80516641258842d44",
         "type": "github"
       },
       "original": {
@@ -418,11 +418,11 @@
     "openwrt": {
       "flake": false,
       "locked": {
-        "lastModified": 1658528750,
-        "narHash": "sha256-LMCEQzf5QGRFb0z/l3yDhZkyEjuaCQYngefg1I7gMIo=",
+        "lastModified": 1659100221,
+        "narHash": "sha256-LCPUpGoRwD01tclqNWn3uiEFqYGnMge5qliWgtscGZw=",
         "ref": "openwrt-21.02",
-        "rev": "09dae4feac941f3a6190cf361479bf8b2ba194bf",
-        "revCount": 51085,
+        "rev": "f94b30d83c2aa401b3ff9c4914bb2ef6386df8aa",
+        "revCount": 51086,
         "type": "git",
         "url": "https://git.openwrt.org/openwrt/openwrt.git"
       },
@@ -502,11 +502,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1658671895,
-        "narHash": "sha256-WFtdMN7WH5twFZEfBqpgc9PMCMHpgJnZyipDSPfui3U=",
+        "lastModified": 1659167628,
+        "narHash": "sha256-hl3zom2TrPnwadl0bdoTxNXcSSW8OTx/iASF8VsrRlc=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "7e2b983fd459977e11026683ee4afb9598960a4c",
+        "rev": "e0ff4befdacf187621bebba84f824d2e41ab0607",
         "type": "github"
       },
       "original": {
@@ -536,17 +536,14 @@
       "inputs": {
         "nixpkgs": [
           "nixos"
-        ],
-        "sops-nix": [
-          "sops-nix"
         ]
       },
       "locked": {
-        "lastModified": 1658611658,
-        "narHash": "sha256-rl7y2T0+/w0AezY3l5BGvBNMGvSnH4WWEJ6OWwhNyFw=",
+        "lastModified": 1659283360,
+        "narHash": "sha256-67qgsActxXm/Ui2VVz0IcvQi+LIMgaLbF/rXNMhBZS8=",
         "ref": "refs/heads/master",
-        "rev": "854379a9c9d037aca41e6da65176f1a36bbf0bf9",
-        "revCount": 144,
+        "rev": "b41438af53d97864260712e8f1610f289dc6e514",
+        "revCount": 147,
         "type": "git",
         "url": "ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git"
       },
@@ -565,11 +562,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1658635258,
-        "narHash": "sha256-EC8y3Rg+l9IzIUdOaFSA0LMdDipTRoweg1Y2EL8XhMc=",
+        "lastModified": 1659240333,
+        "narHash": "sha256-9dth3+9VemY34Eod0vBkx/prMcCQfeE4RlJVp9ahQao=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d7f8cf1b77ebe5f287884f17b1ee4cc4f48bad1d",
+        "rev": "22b08d5c234a5c1b6e403488276b1c3e9c6ae9d3",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 061a980b..aff85a79 100644
--- a/flake.nix
+++ b/flake.nix
@@ -804,7 +804,7 @@
 
       # `nix develop`
       devShell = lib.mapAttrs (system: sopsPkgs:
-        with nixpkgs.legacyPackages.${system};
+        with nixos.legacyPackages.${system};
         mkShell {
           sopsPGPKeyDirs = [ "./keys" ];
           nativeBuildInputs = [