From 52fe4c9364afd0d6188aec9566a15329c5820274 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 16:15:42 +0100 Subject: [PATCH 01/21] Update flake.lock Signed-off-by: magic_rb --- flake.lock | 185 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 112 insertions(+), 73 deletions(-) diff --git a/flake.lock b/flake.lock index b8aab7d..a1848e9 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1696468923, - "narHash": "sha256-qSM7NKgf8LcZ5hjKHZ8ANFI8+LQivvAypbhJHBJmYFM=", + "lastModified": 1698422527, + "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=", "owner": "nix-community", "repo": "disko", - "rev": "cde886a1c97ef2399b4f91409db045785020291f", + "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1698579227, + "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "f76e870d64779109e41370848074ac4eaa1606ec", "type": "github" }, "original": { @@ -453,11 +453,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -550,14 +550,14 @@ "type": "github" } }, - "ghc980": { + "ghc98X": { "flake": false, "locked": { - "lastModified": 1692910316, - "narHash": "sha256-Qv8I3GzzIIN32RTEKI38BW5nO1f7j6Xm+dDeDUyYZWo=", + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", "ref": "ghc-9.8", - "rev": "249aa8193e4c5c1ee46ce29b39d2fffa57de7904", - "revCount": 61566, + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -572,11 +572,11 @@ "ghc99": { "flake": false, "locked": { - "lastModified": 1695427505, - "narHash": "sha256-j0hXl6uEI+Uwf37z3WLuQZN4S0XqGtiepELv2Gl2aHU=", + "lastModified": 1697054644, + "narHash": "sha256-kKarOuXUaAH3QWv7ASx+gGFMHaHKe0pK5Zu37ky2AL4=", "ref": "refs/heads/master", - "rev": "b8e4fe2318798185228fb5f8214ba2384ac95b4f", - "revCount": 61951, + "rev": "f383a242c76f90bcca8a4d7ee001dcb49c172a9a", + "revCount": 62040, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -628,11 +628,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1696465466, - "narHash": "sha256-YlazbA1gGX6DGONHpGsA7vEgS0y43TzmarLkRjL0Nn0=", + "lastModified": 1698539207, + "narHash": "sha256-LpRXR0t2MegU8H9JRbytb23MUtqMUqJKxgH6Jk1+LeE=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "a99556cc8d1b2296eb1cc11c301564e1ee9324d1", + "rev": "6226422cb8c0e2b9d624344260d23645ffeb7fbd", "type": "github" }, "original": { @@ -650,13 +650,14 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc980": "ghc980", + "ghc98X": "ghc98X", "ghc99": "ghc99", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -675,11 +676,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1696467024, - "narHash": "sha256-I5sEmq164owgIeD5fpPFTWE4hWLIrxaP0pHxTnPCbFI=", + "lastModified": 1698540593, + "narHash": "sha256-fSxnVeHBrRG6taoiQcrNZftI319yjqR22bmvatpFhuw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "ed278215e758fac7ce6514df2d3956bc5c478046", + "rev": "1fcec90161947c881faabb7576ea7cd66f80f97d", "type": "github" }, "original": { @@ -772,16 +773,33 @@ "type": "github" } }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1696939266, + "narHash": "sha256-VOMf5+kyOeOmfXTHlv4LNFJuDGa7G3pDnOxtzYR40IU=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "362fdd1293efb4b82410b676ab1273479f6d17ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1696446489, - "narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=", + "lastModified": 1698479159, + "narHash": "sha256-rJHBDwW4LbADEfhkgGHjKGfL2dF44NrlyXdXeZrQahs=", "owner": "nix-community", "repo": "home-manager", - "rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a", + "rev": "f92a54fef4eacdbe86b0a2054054dd58b0e2a2a4", "type": "github" }, "original": { @@ -1016,11 +1034,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1696405736, - "narHash": "sha256-Wb8qSpePi/cSLOGr9YStiU4F4w6KyycDlyHXNI8U3xA=", + "lastModified": 1698504395, + "narHash": "sha256-92+0zv8p0awLLigXNFHsuNBYzeOuBqMqPqLTbmHWRCA=", "owner": "astro", "repo": "microvm.nix", - "rev": "abd63123e2b2dbc34d1ac38a73578b27ec9ef342", + "rev": "dfe2d3db94e4829e317f97e3a095d6fd8b91f30c", "type": "github" }, "original": { @@ -1052,11 +1070,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1695485017, - "narHash": "sha256-aQyRBJnT4tftexM/Y3etfOk8tfMFZzt+vSVtL2J0KLY=", + "lastModified": 1697710615, + "narHash": "sha256-YL63eoy3C/WeDxwctbv9dJBjqBabx8cO7lVTlVn3FVI=", "owner": "oxalica", "repo": "nil", - "rev": "510bc6e9b41d39c81b9c815065cb5b7e23a2428c", + "rev": "bd93024db616a528473a7210d2756c7118155de9", "type": "github" }, "original": { @@ -1084,6 +1102,27 @@ "type": "indirect" } }, + "nix-matlab": { + "inputs": { + "flake-compat": "flake-compat_4", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698505288, + "narHash": "sha256-zisMGZ/akYQUrPkLiZvyAi7kJrge34XaOyT/YQS7pzw=", + "owner": "doronbehar", + "repo": "nix-matlab", + "rev": "aa979bfe814051b15bc562c2b7f10b5fc1b08451", + "type": "gitlab" + }, + "original": { + "owner": "doronbehar", + "repo": "nix-matlab", + "type": "gitlab" + } + }, "nix-mode": { "flake": false, "locked": { @@ -1154,11 +1193,11 @@ "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { - "lastModified": 1698066191, - "narHash": "sha256-Uak+L03LWQQQqT7K4BgTnnh6MAvSWyzqoLzOL73D/RY=", + "lastModified": 1698359940, + "narHash": "sha256-GqDocJl7bb7g2cu+sw1VAd6ld6G3054kbmwm0QfDhfQ=", "owner": "NixOS", "repo": "nix", - "rev": "b461cac21aa5b9127d230ed3f1a1ca8e8266fb60", + "rev": "a6e587923c9d5d716fe0f0049bed96d1cc210bff", "type": "github" }, "original": { @@ -1263,11 +1302,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1696441224, - "narHash": "sha256-HYuoi7TSSHpRXW9wqCgxjPe9mEWnsAzIWIl3Z9oUA+k=", + "lastModified": 1698480628, + "narHash": "sha256-J1WzYa9NkhHPSO8qWWSMAYJLQd8zaZNZCd2dpnf24tw=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "ffcbf8c326f05f7a66563a12e57562f53af2c28b", + "rev": "0a929da703b18b9191cbbd92c3092b38514d450b", "type": "github" }, "original": { @@ -1303,11 +1342,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696419054, - "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", + "lastModified": 1697915759, + "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", + "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", "type": "github" }, "original": { @@ -1415,11 +1454,11 @@ }, "nixpkgs-hashicorp": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { @@ -1595,11 +1634,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", "type": "github" }, "original": { @@ -1762,11 +1801,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "type": "github" }, "original": { @@ -1810,11 +1849,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1690441914, - "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", + "lastModified": 1696725822, + "narHash": "sha256-B7uAOS7TkLlOg1aX01rQlYbydcyB6ZnLJSfaYbKVww8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f", + "rev": "5aabb5780a11c500981993d49ee93cfa6df9307b", "type": "github" }, "original": { @@ -2027,11 +2066,11 @@ ] }, "locked": { - "lastModified": 1688783586, - "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", + "lastModified": 1696817516, + "narHash": "sha256-Xt9OY4Wnk9/vuUfA0OHFtmSlaen5GyiS9msgwOz3okI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7a29283cc242c2486fc67f60b431ef708046d176", + "rev": "c0df7f2a856b5ff27a3ce314f6d7aacf5fda546f", "type": "github" }, "original": { @@ -2099,11 +2138,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1696464547, - "narHash": "sha256-NABJBlKDwsQox6yrKZ8saWdhjLwQEGIwpmJlClaeO1A=", + "lastModified": 1698538187, + "narHash": "sha256-n0BDH9D9EXjxeR2HgAe1oeDwdHOuJJg29cYktHqcyRA=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "844c3b4c520cb4ead6113f6ba25dc2ad33e21273", + "rev": "acae28932ea28d4132f7cf1718983a3ab7adf11b", "type": "github" }, "original": { @@ -2217,11 +2256,11 @@ ] }, "locked": { - "lastModified": 1692543521, - "narHash": "sha256-/a6U3HkADtAZJq716PB4bxIw/7h5oEG6N7bvw8vTQtE=", + "lastModified": 1697576357, + "narHash": "sha256-nMlx9L5SaaRRzKeixx2TtRtE8RrWdK7h1jXba1TZcNs=", "owner": "blitz", "repo": "tuxedo-nixos", - "rev": "91f7d9ba249f5fd1357f8d55bc510c1641d54a52", + "rev": "a6a1b5cd29300f1b8b73f134f9f541e8c0c8c237", "type": "github" }, "original": { @@ -2239,11 +2278,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1696452819, - "narHash": "sha256-BOmlPisJLHE0W+MyVTAnL/nfNimFxW6pSQZab9uw60g=", + "lastModified": 1698079085, + "narHash": "sha256-Yujki2vGzaT8Ze5Usk8FPg8bn86MvyyPTiWuWwEw7Xs=", "owner": "AaronErhardt", "repo": "tuxedo-rs", - "rev": "b5ce23303b0e40c5fc2bb5afc1b38bbfe84a289c", + "rev": "74b863e6dcb1ec2e6c8fb02c16bb6f23b59e67f6", "type": "github" }, "original": { @@ -2255,11 +2294,11 @@ "udp-over-tcp": { "flake": false, "locked": { - "lastModified": 1696508126, - "narHash": "sha256-rUR3QkiCgPY64CjIsa5v+DuhnpJ+CyqcD2TefmDe1as=", + "lastModified": 1698218817, + "narHash": "sha256-C14sj8z1e4KzNdLsMhnmEKsq8qsyjcSBUMPn/3+YALo=", "owner": "mullvad", "repo": "udp-over-tcp", - "rev": "233f17045592e32d0499c9d00a0bfd2d9fa43196", + "rev": "104ccafcc03f95bcdf7a7d28fafe0eed6744bc45", "type": "github" }, "original": { @@ -2355,11 +2394,11 @@ "yaml-mode": "yaml-mode" }, "locked": { - "lastModified": 1697379565, - "narHash": "sha256-wNFndZ+79VIVZPH3SdSc/WWvbsNgCNozO24edyp+7jE=", + "lastModified": 1697390467, + "narHash": "sha256-WQJ7Yyx0oFJcBbguMdj1tyjyX25R3nJWMYQcBAyaX64=", "owner": "~magic_rb", "repo": "website", - "rev": "da2b4978096f348a24f589c1fb61aecdd9a75eaf", + "rev": "0a80b11bac43fd7f5f8481b39aeff5182cfd8161", "type": "sourcehut" }, "original": { From f3ab75b6f95c7ac145c7783a3ec36d5ceddc8d7f Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 16:19:44 +0100 Subject: [PATCH 02/21] Workaround PR264018 not being merged yet Signed-off-by: magic_rb --- home-manager/modules/profiles/workstation.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/modules/profiles/workstation.nix b/home-manager/modules/profiles/workstation.nix index 9bb5d22..41e868d 100644 --- a/home-manager/modules/profiles/workstation.nix +++ b/home-manager/modules/profiles/workstation.nix @@ -73,7 +73,10 @@ in obs-studio mpv slack - schildichat-desktop + # TODO remove when PR264018 is in + (schildichat-desktop.override { + electron = pkgs.electron_25; + }) # armcord pavucontrol From 1eca042e3f7a0cb9da56a32c4d70a955c8791bfc Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:44:25 +0100 Subject: [PATCH 03/21] Workaround PR263599 not being merged Signed-off-by: magic_rb --- home-manager/modules/profiles/workstation.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/modules/profiles/workstation.nix b/home-manager/modules/profiles/workstation.nix index 41e868d..329be6a 100644 --- a/home-manager/modules/profiles/workstation.nix +++ b/home-manager/modules/profiles/workstation.nix @@ -91,7 +91,8 @@ in # 3d printing openscad - freecad + # TODO move back to unstable when PR263599 is in + inputs'.nixpkgs-stable.legacyPackages.${stdenv.system}.freecad cura super-slicer From f6b626caec244037c5d4d0a353fd5484d62a2700 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:46:40 +0100 Subject: [PATCH 04/21] Workaround PR263669 not being merged yet Signed-off-by: magic_rb --- home-manager/modules/pantalaimon.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home-manager/modules/pantalaimon.nix b/home-manager/modules/pantalaimon.nix index 13ee3d2..31b81a2 100644 --- a/home-manager/modules/pantalaimon.nix +++ b/home-manager/modules/pantalaimon.nix @@ -1,7 +1,9 @@ -{ ... }: +{ inputs', pkgs, ... }: { services.pantalaimon = { enable = true; + # TODO switch to unstable when PR263669 is merged + package = inputs'.nixpkgs-stable.legacyPackages.${pkgs.stdenv.system}.pantalaimon; settings = { Default = From 26b1be45a2f3055768622342cea10f7b918f7b25 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:47:19 +0100 Subject: [PATCH 05/21] Fix incorrect usages of `getExe` Signed-off-by: magic_rb --- nixos/systems/altra/networking.nix | 6 +++--- nixos/systems/toothpick/networking.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/systems/altra/networking.nix b/nixos/systems/altra/networking.nix index d8d0675..fc2bfc1 100644 --- a/nixos/systems/altra/networking.nix +++ b/nixos/systems/altra/networking.nix @@ -1,7 +1,7 @@ { pkgs, lib, secret, ... }: let inherit (lib) - getExe; + getExe'; in { # boot.kernel.sysctl = {"net.ipv4.ip_forward" = "1";}; @@ -30,11 +30,11 @@ in interfaces."wg0" = { postSetup = '' - ${getExe pkgs.iptables} -I FORWARD -i wg0 -o wg0 -j ACCEPT + ${getExe' pkgs.iptables "iptables"} -I FORWARD -i wg0 -o wg0 -j ACCEPT ''; postShutdown = '' - ${getExe pkgs.iptables} -D FORWARD -i wg0 -o wg0 -j ACCEPT + ${getExe' pkgs.iptables "iptables"} -D FORWARD -i wg0 -o wg0 -j ACCEPT ''; } // secret.wireguard."altra" or { privateKey = ""; }; diff --git a/nixos/systems/toothpick/networking.nix b/nixos/systems/toothpick/networking.nix index 4ab71ea..73c1c1c 100644 --- a/nixos/systems/toothpick/networking.nix +++ b/nixos/systems/toothpick/networking.nix @@ -1,7 +1,7 @@ { pkgs, lib, secret, ... }: let inherit (lib) - getExe; + getExe'; in { boot.kernel.sysctl = {"net.ipv4.ip_forward" = "1";}; @@ -26,11 +26,11 @@ in interfaces."wg0" = { postSetup = '' - ${getExe pkgs.iptables} -I FORWARD -i wg0 -o wg0 -j ACCEPT + ${getExe' pkgs.iptables "iptables"} -I FORWARD -i wg0 -o wg0 -j ACCEPT ''; postShutdown = '' - ${getExe pkgs.iptables} -D FORWARD -i wg0 -o wg0 -j ACCEPT + ${getExe' pkgs.iptables "iptables"} -D FORWARD -i wg0 -o wg0 -j ACCEPT ''; } // secret.wireguard."toothpick" or { privateKey = ""; }; From 4775b1544f6cd05fc2cbee73c1e3c011bfcfd61d Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:47:35 +0100 Subject: [PATCH 06/21] Fix overlay for InfluxDBv2 Terraform provider Signed-off-by: magic_rb --- overlays/terraform-provider-influxdb-v2.nix | 26 +++++++++------------ 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/overlays/terraform-provider-influxdb-v2.nix b/overlays/terraform-provider-influxdb-v2.nix index 6f8caf3..e3f5d2c 100644 --- a/overlays/terraform-provider-influxdb-v2.nix +++ b/overlays/terraform-provider-influxdb-v2.nix @@ -3,21 +3,17 @@ flake.overlays.terraform-provider-influxdb-v2 = final: prev: { - terraform = prev.terraform.overrideAttrs (old: { - passthru.plugins = - old.passthru.plugins - // { - influxdb-v2 = - old.passthru.plugins.mkProvider { - owner = "MagicRB"; - repo = "terraform-provider-influxdb-v2"; - rev = "4f10e465f9526b47d1ef97a8f2e109aa85a7d647"; - version = "0.4.6"; - hash = "sha256-/IQoA1CwYIafHbHKSZq7pZKFxefgd09fm0lnBW3r11Q="; - vendorHash = "sha256-g7Njs7psHFFSWk44CiV+blLrzpnB+L9HgMTx3lLMA8Q="; - provider-source-address = "registry.terraform.io/MagicRB/influxdb-v2"; - }; + terraform-providers = prev.terraform-providers // { + influxdb-v2 = + prev.terraform-providers.mkProvider { + owner = "MagicRB"; + repo = "terraform-provider-influxdb-v2"; + rev = "4f10e465f9526b47d1ef97a8f2e109aa85a7d647"; + version = "0.4.6"; + hash = "sha256-/IQoA1CwYIafHbHKSZq7pZKFxefgd09fm0lnBW3r11Q="; + vendorHash = "sha256-g7Njs7psHFFSWk44CiV+blLrzpnB+L9HgMTx3lLMA8Q="; + provider-source-address = "registry.terraform.io/MagicRB/influxdb-v2"; }; - } ); + }; }; } From 2ff3846baf3a24d15f91c28c9a6880fae5ae6537 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:48:08 +0100 Subject: [PATCH 07/21] Fix use of deprecated `nativeComp` option in Emacs Signed-off-by: magic_rb --- overlays/emacs-master-nativecomp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlays/emacs-master-nativecomp/default.nix b/overlays/emacs-master-nativecomp/default.nix index bff489d..b119f28 100644 --- a/overlays/emacs-master-nativecomp/default.nix +++ b/overlays/emacs-master-nativecomp/default.nix @@ -37,7 +37,7 @@ in emacs-master-package.override { withSQLite3 = true; - nativeComp = true; + withNativeCompilation = true; withWebP = true; withGTK3 = true; withImageMagick = true; From 37af8fca1ec7505e335257b1c54a5c7708d8fb60 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:48:40 +0100 Subject: [PATCH 08/21] Update state version on omen Signed-off-by: magic_rb --- nixos/systems/omen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/systems/omen/default.nix b/nixos/systems/omen/default.nix index 07dec36..ddb7ca0 100644 --- a/nixos/systems/omen/default.nix +++ b/nixos/systems/omen/default.nix @@ -79,7 +79,7 @@ in ]; time.timeZone = "Europe/Amsterdam"; - system.stateVersion = "20.09"; + system.stateVersion = "23.05"; virtualisation.podman.enable = true; virtualisation.podman.dockerCompat = true; From 705eeea37d4cc1568bd0cba9c255997039911cfd Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:48:56 +0100 Subject: [PATCH 09/21] Fix deprecated usage of `nix.allowedUsers` on altra Signed-off-by: magic_rb --- nixos/systems/altra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/systems/altra/default.nix b/nixos/systems/altra/default.nix index d78ea94..f49c54b 100644 --- a/nixos/systems/altra/default.nix +++ b/nixos/systems/altra/default.nix @@ -44,7 +44,7 @@ in ]; environment.defaultPackages = mkForce []; - nix.allowedUsers = [ "@wheel" ]; + nix.settings.allowed-users = [ "@wheel" ]; security.sudo.execWheelOnly = true; security.auditd.enable = true; From 0109e7cd490460eff1b3d9883e02f9ddbeaf9569 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:49:35 +0100 Subject: [PATCH 10/21] Update Terraform packages are put into `packages` Signed-off-by: magic_rb --- flake.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 635ca62..e494412 100644 --- a/flake.nix +++ b/flake.nix @@ -180,9 +180,14 @@ let inherit (lib') attrValues; - pkgs' = pkgs.appendOverlays (attrValues config.flake.overlays); + pkgs' = pkgs.appendOverlays (attrValues config.flake.overlays ++ [ + inputs.nixng.overlays.default + inputs.nix-matlab.overlay + ]); in { + terraform-provider-influxdb-v2 = pkgs'.terraform-providers.influxdb-v2; + terraform-provider-vault = pkgs'.terraform-providers.vault; inherit (pkgs') emacsclient-remote emacs-master-nativecomp @@ -192,8 +197,6 @@ maildrop zfs-relmount bootloadHID - terraform-provider-influxdb-v2 - terrafrom-provider-vault tree-sitter-grammars udp-over-tcp itp From 28eb8fb140d59fc086a411eb95fee536d38bd08f Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:50:03 +0100 Subject: [PATCH 11/21] Disable ds3os Signed-off-by: magic_rb --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e494412..6d6eb30 100644 --- a/flake.nix +++ b/flake.nix @@ -200,8 +200,8 @@ tree-sitter-grammars udp-over-tcp itp - ds3os rolling_datasets; + # ds3os; }; devShells.default = From 106c224fade77f3b6ad9c82036697462696d5891 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:50:22 +0100 Subject: [PATCH 12/21] Add `nixpkgs-stable` Signed-off-by: magic_rb --- flake.lock | 19 ++++++++++++++++++- flake.nix | 1 + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index a1848e9..34c25a6 100644 --- a/flake.lock +++ b/flake.lock @@ -1569,6 +1569,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1698434055, + "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -2007,7 +2023,7 @@ "tuxedo-rs", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1695576016, @@ -2042,6 +2058,7 @@ "nixos-anywhere": "nixos-anywhere", "nixpkgs": "nixpkgs_12", "nixpkgs-hashicorp": "nixpkgs-hashicorp", + "nixpkgs-stable": "nixpkgs-stable", "notnft": "notnft", "numen-nix": "numen-nix", "secret": "secret", diff --git a/flake.nix b/flake.nix index 6d6eb30..888a5d4 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ { inputs = { nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; + nixpkgs-stable.url = "github:NixOS/nixpkgs?ref=nixos-23.05"; nixpkgs-hashicorp.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; nixinate.url = "github:MagicRB/nixinate"; home-manager.url = "github:nix-community/home-manager?ref=master"; From eba5c967cad7dda8834efc59be12010a4314188c Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:50:45 +0100 Subject: [PATCH 13/21] Add NixOS state version for omen microvm Signed-off-by: magic_rb --- nixos/systems/omen/microvm.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/systems/omen/microvm.nix b/nixos/systems/omen/microvm.nix index eca3300..d789602 100644 --- a/nixos/systems/omen/microvm.nix +++ b/nixos/systems/omen/microvm.nix @@ -87,6 +87,8 @@ enable = true; settings.PermitRootLogin = "yes"; }; + + system.stateVersion = "23.05"; }; }; } From 0d37adfb9bdbb9f7c8f03fafac07344fbb2039c0 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:51:04 +0100 Subject: [PATCH 14/21] Disable scripted DHCP on omen completely Signed-off-by: magic_rb --- nixos/systems/omen/networking.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/systems/omen/networking.nix b/nixos/systems/omen/networking.nix index 6dd955e..94033bb 100644 --- a/nixos/systems/omen/networking.nix +++ b/nixos/systems/omen/networking.nix @@ -16,6 +16,7 @@ in wireguard.interfaces."wg0" = secret.wireguard."omen" or { privateKey = ""; }; + useDHCP = false; }; networking.notnft.rules = with notnft.dsl; with payload; ruleset { From 82369662a442bf7f963a7d677965a9c4043c812b Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:51:19 +0100 Subject: [PATCH 15/21] Remove `boot.loader.grub.version` on toothpick as it does nothing Signed-off-by: magic_rb --- nixos/systems/toothpick/grub.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/systems/toothpick/grub.nix b/nixos/systems/toothpick/grub.nix index 65e7d56..8bb8f52 100644 --- a/nixos/systems/toothpick/grub.nix +++ b/nixos/systems/toothpick/grub.nix @@ -3,7 +3,6 @@ boot.loader.grub = { enable = true; device = "/dev/vda"; - version = 2; efiSupport = false; }; } From 708149b84cf6be154c3a729184e48cc180c8c605 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:51:52 +0100 Subject: [PATCH 16/21] Fix build of `bootloaderHID` Signed-off-by: magic_rb --- overlays/bootloadHID.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlays/bootloadHID.nix b/overlays/bootloadHID.nix index 89709a8..5072441 100644 --- a/overlays/bootloadHID.nix +++ b/overlays/bootloadHID.nix @@ -8,10 +8,10 @@ version = "2012-12-08"; src = prev.fetchFromGitHub { - owner = "whiteson"; + owner = "whiteneon"; repo = "bootloadHID"; rev = "42c6f246b79949892268d2212e0347f27e01bd53"; - sha = ""; + sha256 = "sha256-JPcnPwgSFJE88YDGNTq6OsUjZjKx561pfnjxvyp2+1M=wn"; }; buildInputs = with prev; [ From 55287115dcc72f5a39e1f16b01d63f5eda8ae488 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 29 Oct 2023 17:52:27 +0100 Subject: [PATCH 17/21] Add `packages` to `hydraJobs` Signed-off-by: magic_rb --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 888a5d4..76d041c 100644 --- a/flake.nix +++ b/flake.nix @@ -125,6 +125,7 @@ { nixng = mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixngConfigurations; nixos = mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixosConfigurations; + packages = mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixosConfigurations; }; uterranix.config = [ From c038c2c56961a60852aa68654b80538f9032a87c Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 19 Nov 2023 12:35:24 +0100 Subject: [PATCH 18/21] Update flake.lock Signed-off-by: magic_rb --- flake-secret.lock | 245 ++++++++++++++++++++++++++-------------------- flake.lock | 185 ++++++++++++++++------------------ 2 files changed, 222 insertions(+), 208 deletions(-) diff --git a/flake-secret.lock b/flake-secret.lock index df84947..6b2f455 100644 --- a/flake-secret.lock +++ b/flake-secret.lock @@ -139,11 +139,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1696468923, - "narHash": "sha256-qSM7NKgf8LcZ5hjKHZ8ANFI8+LQivvAypbhJHBJmYFM=", + "lastModified": 1699781810, + "narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=", "owner": "nix-community", "repo": "disko", - "rev": "cde886a1c97ef2399b4f91409db045785020291f", + "rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1694710969, - "narHash": "sha256-5nMY+3JF/ktW8D8URataP6MCbbnID13P4CixARNoq6w=", + "lastModified": 1698422527, + "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=", "owner": "nix-community", "repo": "disko", - "rev": "91af5b4a53ee8e57f4178ef58036dce49fbda91a", + "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -399,11 +399,11 @@ ] }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -453,11 +453,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -550,14 +550,14 @@ "type": "github" } }, - "ghc980": { + "ghc98X": { "flake": false, "locked": { - "lastModified": 1692910316, - "narHash": "sha256-Qv8I3GzzIIN32RTEKI38BW5nO1f7j6Xm+dDeDUyYZWo=", + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", "ref": "ghc-9.8", - "rev": "249aa8193e4c5c1ee46ce29b39d2fffa57de7904", - "revCount": 61566, + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -572,11 +572,11 @@ "ghc99": { "flake": false, "locked": { - "lastModified": 1695427505, - "narHash": "sha256-j0hXl6uEI+Uwf37z3WLuQZN4S0XqGtiepELv2Gl2aHU=", + "lastModified": 1697054644, + "narHash": "sha256-kKarOuXUaAH3QWv7ASx+gGFMHaHKe0pK5Zu37ky2AL4=", "ref": "refs/heads/master", - "rev": "b8e4fe2318798185228fb5f8214ba2384ac95b4f", - "revCount": 61951, + "rev": "f383a242c76f90bcca8a4d7ee001dcb49c172a9a", + "revCount": 62040, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -628,11 +628,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1696465466, - "narHash": "sha256-YlazbA1gGX6DGONHpGsA7vEgS0y43TzmarLkRjL0Nn0=", + "lastModified": 1700353452, + "narHash": "sha256-YUy4t7Wfow3K6nyfJV4GY7NCnEoxDEAufXiF9f7Ryg8=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "a99556cc8d1b2296eb1cc11c301564e1ee9324d1", + "rev": "6e756c20a4537db56d9bcb3e4936dae912381da1", "type": "github" }, "original": { @@ -650,13 +650,14 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc980": "ghc980", + "ghc98X": "ghc98X", "ghc99": "ghc99", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", "hls-2.2": "hls-2.2", "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -675,11 +676,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1696467024, - "narHash": "sha256-I5sEmq164owgIeD5fpPFTWE4hWLIrxaP0pHxTnPCbFI=", + "lastModified": 1700354987, + "narHash": "sha256-FI/gnGxnY/ICUAu6bGWKzdFSb4OX0OsstFHowEOXotE=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "ed278215e758fac7ce6514df2d3956bc5c478046", + "rev": "666f4c93882e32ceae6a4166aa1986db84e33604", "type": "github" }, "original": { @@ -772,16 +773,33 @@ "type": "github" } }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1696939266, + "narHash": "sha256-VOMf5+kyOeOmfXTHlv4LNFJuDGa7G3pDnOxtzYR40IU=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "362fdd1293efb4b82410b676ab1273479f6d17ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1696446489, - "narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=", + "lastModified": 1700386809, + "narHash": "sha256-2IPxWo0Yplv+70EueZVLTwRAijax0tirYp5Jh0QV1A4=", "owner": "nix-community", "repo": "home-manager", - "rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a", + "rev": "9a4725afa67db35cdf7be89f30527d745194cafa", "type": "github" }, "original": { @@ -1016,11 +1034,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1696405736, - "narHash": "sha256-Wb8qSpePi/cSLOGr9YStiU4F4w6KyycDlyHXNI8U3xA=", + "lastModified": 1700320345, + "narHash": "sha256-HDBVj9gEOG2ZBGc+UGtjqDsOIvYOQtDxDRGrbiWOXl0=", "owner": "astro", "repo": "microvm.nix", - "rev": "abd63123e2b2dbc34d1ac38a73578b27ec9ef342", + "rev": "b16e6261ad2f0bca6ac2a4b7a4d3377cf5e3d95d", "type": "github" }, "original": { @@ -1052,11 +1070,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1695485017, - "narHash": "sha256-aQyRBJnT4tftexM/Y3etfOk8tfMFZzt+vSVtL2J0KLY=", + "lastModified": 1699423608, + "narHash": "sha256-WEVUgivm5DCziwZqiXRPeoD3FQTXW38ExKrZjvMveqE=", "owner": "oxalica", "repo": "nil", - "rev": "510bc6e9b41d39c81b9c815065cb5b7e23a2428c", + "rev": "5607d429016d6f9a72843b07127fad23ea9d661f", "type": "github" }, "original": { @@ -1154,11 +1172,11 @@ "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { - "lastModified": 1698066191, - "narHash": "sha256-Uak+L03LWQQQqT7K4BgTnnh6MAvSWyzqoLzOL73D/RY=", + "lastModified": 1700370378, + "narHash": "sha256-NUKdDhwCBZbqVhMMC0XcozTC4X13cHaY1nqraQb8f8k=", "owner": "NixOS", "repo": "nix", - "rev": "b461cac21aa5b9127d230ed3f1a1ca8e8266fb60", + "rev": "c4a74d6dcc64f5d00358db9f9d9af84028d97564", "type": "github" }, "original": { @@ -1239,11 +1257,11 @@ }, "nixos-2305": { "locked": { - "lastModified": 1694724971, - "narHash": "sha256-NazxO2WuzV1pVnVoFpo7vJbgTTDhywhDxEDwFw6tyWY=", + "lastModified": 1698911509, + "narHash": "sha256-FFwqTbF+1laraWTL/t7LI+gN+DYfoj+iFYLof5wCea8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16a63df66bfefec64daab3da10d414055d782d66", + "rev": "ecd985f22e007e6ac3152d68590c06cbbaea8c0e", "type": "github" }, "original": { @@ -1263,11 +1281,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1696441224, - "narHash": "sha256-HYuoi7TSSHpRXW9wqCgxjPe9mEWnsAzIWIl3Z9oUA+k=", + "lastModified": 1700336089, + "narHash": "sha256-Os0D98qIsR+ABi5WmCqD8BpbTWcjwd/GWhKmJKtzniw=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "ffcbf8c326f05f7a66563a12e57562f53af2c28b", + "rev": "5317af5f1425e89dc723c81a4e33190c1e61b059", "type": "github" }, "original": { @@ -1288,11 +1306,11 @@ ] }, "locked": { - "lastModified": 1694429687, - "narHash": "sha256-fopTSMmOjk7/ro8+P2wZxAC8OPUKtuwHLNp2xSPXVjc=", + "lastModified": 1697515196, + "narHash": "sha256-EZivLoJHCqJdi23Mn/p+lPNHBBctGSWzEnAhYfC0VD0=", "owner": "nix-community", "repo": "nixos-images", - "rev": "c4c73bce65306a1e747684dd0d4bcf0ab2779585", + "rev": "87bccdbdfbeb07e0c4fb4c2ec3d71986e8fa24d9", "type": "github" }, "original": { @@ -1303,11 +1321,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696419054, - "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", + "lastModified": 1697915759, + "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", + "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", "type": "github" }, "original": { @@ -1415,11 +1433,11 @@ }, "nixpkgs-hashicorp": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -1432,11 +1450,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -1530,6 +1548,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1700097215, + "narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -1579,11 +1613,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1694669921, - "narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=", + "lastModified": 1700218750, + "narHash": "sha256-ft54Un/pZ/KoI6hx9HLeb/SLg0SB8NvV+z7vzrpWs8c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c", + "rev": "2542afeb0d81db4d1e5bc8df8354cbdcc29c2f53", "type": "github" }, "original": { @@ -1595,11 +1629,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -1762,11 +1796,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -1810,11 +1844,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1690441914, - "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", + "lastModified": 1696725822, + "narHash": "sha256-B7uAOS7TkLlOg1aX01rQlYbydcyB6ZnLJSfaYbKVww8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f", + "rev": "5aabb5780a11c500981993d49ee93cfa6df9307b", "type": "github" }, "original": { @@ -1826,16 +1860,16 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1695283060, - "narHash": "sha256-CJz71xhCLlRkdFUSQEL0pIAAfcnWFXMzd9vXhPrnrEg=", + "lastModified": 1698876495, + "narHash": "sha256-nsQo2/mkDUFeAjuu92p0dEqhRvHHiENhkKVIV1y0/Oo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "31ed632c692e6a36cfc18083b88ece892f863ed4", + "rev": "9eb24edd6a0027fed010ccfe300a9734d029983c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05-small", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } @@ -1897,11 +1931,11 @@ "numen": "numen" }, "locked": { - "lastModified": 1693098696, - "narHash": "sha256-Gc9K4ho6fR/GZg3/UwjLfoJkXvhHXci92NLxeZLSnXc=", + "lastModified": 1699002865, + "narHash": "sha256-uvgO61FUuqLVW3uzoTYvwWwHMJ5cmIk1SGqP8E+X3C8=", "owner": "anpandey", "repo": "numen-nix", - "rev": "27350448dd39553070d722426b888eedc865bc4d", + "rev": "b9b81a41b1da7d36ce074bc8894ecd64cdf7b945", "type": "github" }, "original": { @@ -1968,14 +2002,14 @@ "tuxedo-rs", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1695576016, - "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", + "lastModified": 1700064067, + "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", + "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8", "type": "github" }, "original": { @@ -2003,6 +2037,7 @@ "nixos-anywhere": "nixos-anywhere", "nixpkgs": "nixpkgs_12", "nixpkgs-hashicorp": "nixpkgs-hashicorp", + "nixpkgs-stable": "nixpkgs-stable", "notnft": "notnft", "numen-nix": "numen-nix", "secret": "secret", @@ -2027,11 +2062,11 @@ ] }, "locked": { - "lastModified": 1688783586, - "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", + "lastModified": 1696817516, + "narHash": "sha256-Xt9OY4Wnk9/vuUfA0OHFtmSlaen5GyiS9msgwOz3okI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7a29283cc242c2486fc67f60b431ef708046d176", + "rev": "c0df7f2a856b5ff27a3ce314f6d7aacf5fda546f", "type": "github" }, "original": { @@ -2099,11 +2134,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1696464547, - "narHash": "sha256-NABJBlKDwsQox6yrKZ8saWdhjLwQEGIwpmJlClaeO1A=", + "lastModified": 1700352621, + "narHash": "sha256-u2BfJlxp3gqVX2FWCvWsIAKuAwpUph1HtQi4pm8HmWA=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "844c3b4c520cb4ead6113f6ba25dc2ad33e21273", + "rev": "dc5bc31d2c23fc30dce14fe8b97c22a2d7b085f1", "type": "github" }, "original": { @@ -2196,11 +2231,11 @@ ] }, "locked": { - "lastModified": 1694528738, - "narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=", + "lastModified": 1698438538, + "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8", + "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", "type": "github" }, "original": { @@ -2217,11 +2252,11 @@ ] }, "locked": { - "lastModified": 1692543521, - "narHash": "sha256-/a6U3HkADtAZJq716PB4bxIw/7h5oEG6N7bvw8vTQtE=", + "lastModified": 1698750271, + "narHash": "sha256-Bb8PUO9lOVjLWmzSHQ/ymG/+pyRy4PdQ3xt9urAPtpU=", "owner": "blitz", "repo": "tuxedo-nixos", - "rev": "91f7d9ba249f5fd1357f8d55bc510c1641d54a52", + "rev": "fda17eb3acef01c7ad1536749ceb107b9ef7bd2d", "type": "github" }, "original": { @@ -2239,11 +2274,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1696452819, - "narHash": "sha256-BOmlPisJLHE0W+MyVTAnL/nfNimFxW6pSQZab9uw60g=", + "lastModified": 1700389136, + "narHash": "sha256-5F9Xo+tnmYqmFiKrKMe+EEqypmG9iIvwai5yuKCm00Y=", "owner": "AaronErhardt", "repo": "tuxedo-rs", - "rev": "b5ce23303b0e40c5fc2bb5afc1b38bbfe84a289c", + "rev": "388e5fc96c38412e3640759ba8a1a80dfff1218a", "type": "github" }, "original": { @@ -2255,11 +2290,11 @@ "udp-over-tcp": { "flake": false, "locked": { - "lastModified": 1696508126, - "narHash": "sha256-rUR3QkiCgPY64CjIsa5v+DuhnpJ+CyqcD2TefmDe1as=", + "lastModified": 1698218817, + "narHash": "sha256-C14sj8z1e4KzNdLsMhnmEKsq8qsyjcSBUMPn/3+YALo=", "owner": "mullvad", "repo": "udp-over-tcp", - "rev": "233f17045592e32d0499c9d00a0bfd2d9fa43196", + "rev": "104ccafcc03f95bcdf7a7d28fafe0eed6744bc45", "type": "github" }, "original": { @@ -2355,11 +2390,11 @@ "yaml-mode": "yaml-mode" }, "locked": { - "lastModified": 1697379565, - "narHash": "sha256-wNFndZ+79VIVZPH3SdSc/WWvbsNgCNozO24edyp+7jE=", + "lastModified": 1697390467, + "narHash": "sha256-WQJ7Yyx0oFJcBbguMdj1tyjyX25R3nJWMYQcBAyaX64=", "owner": "~magic_rb", "repo": "website", - "rev": "da2b4978096f348a24f589c1fb61aecdd9a75eaf", + "rev": "0a80b11bac43fd7f5f8481b39aeff5182cfd8161", "type": "sourcehut" }, "original": { diff --git a/flake.lock b/flake.lock index 34c25a6..6b2f455 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1698422527, - "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=", + "lastModified": 1699781810, + "narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=", "owner": "nix-community", "repo": "disko", - "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30", + "rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1694710969, - "narHash": "sha256-5nMY+3JF/ktW8D8URataP6MCbbnID13P4CixARNoq6w=", + "lastModified": 1698422527, + "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=", "owner": "nix-community", "repo": "disko", - "rev": "91af5b4a53ee8e57f4178ef58036dce49fbda91a", + "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1698579227, - "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f76e870d64779109e41370848074ac4eaa1606ec", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -399,11 +399,11 @@ ] }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, "original": { @@ -628,11 +628,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1698539207, - "narHash": "sha256-LpRXR0t2MegU8H9JRbytb23MUtqMUqJKxgH6Jk1+LeE=", + "lastModified": 1700353452, + "narHash": "sha256-YUy4t7Wfow3K6nyfJV4GY7NCnEoxDEAufXiF9f7Ryg8=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "6226422cb8c0e2b9d624344260d23645ffeb7fbd", + "rev": "6e756c20a4537db56d9bcb3e4936dae912381da1", "type": "github" }, "original": { @@ -676,11 +676,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1698540593, - "narHash": "sha256-fSxnVeHBrRG6taoiQcrNZftI319yjqR22bmvatpFhuw=", + "lastModified": 1700354987, + "narHash": "sha256-FI/gnGxnY/ICUAu6bGWKzdFSb4OX0OsstFHowEOXotE=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "1fcec90161947c881faabb7576ea7cd66f80f97d", + "rev": "666f4c93882e32ceae6a4166aa1986db84e33604", "type": "github" }, "original": { @@ -795,11 +795,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1698479159, - "narHash": "sha256-rJHBDwW4LbADEfhkgGHjKGfL2dF44NrlyXdXeZrQahs=", + "lastModified": 1700386809, + "narHash": "sha256-2IPxWo0Yplv+70EueZVLTwRAijax0tirYp5Jh0QV1A4=", "owner": "nix-community", "repo": "home-manager", - "rev": "f92a54fef4eacdbe86b0a2054054dd58b0e2a2a4", + "rev": "9a4725afa67db35cdf7be89f30527d745194cafa", "type": "github" }, "original": { @@ -1034,11 +1034,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1698504395, - "narHash": "sha256-92+0zv8p0awLLigXNFHsuNBYzeOuBqMqPqLTbmHWRCA=", + "lastModified": 1700320345, + "narHash": "sha256-HDBVj9gEOG2ZBGc+UGtjqDsOIvYOQtDxDRGrbiWOXl0=", "owner": "astro", "repo": "microvm.nix", - "rev": "dfe2d3db94e4829e317f97e3a095d6fd8b91f30c", + "rev": "b16e6261ad2f0bca6ac2a4b7a4d3377cf5e3d95d", "type": "github" }, "original": { @@ -1070,11 +1070,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1697710615, - "narHash": "sha256-YL63eoy3C/WeDxwctbv9dJBjqBabx8cO7lVTlVn3FVI=", + "lastModified": 1699423608, + "narHash": "sha256-WEVUgivm5DCziwZqiXRPeoD3FQTXW38ExKrZjvMveqE=", "owner": "oxalica", "repo": "nil", - "rev": "bd93024db616a528473a7210d2756c7118155de9", + "rev": "5607d429016d6f9a72843b07127fad23ea9d661f", "type": "github" }, "original": { @@ -1102,27 +1102,6 @@ "type": "indirect" } }, - "nix-matlab": { - "inputs": { - "flake-compat": "flake-compat_4", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698505288, - "narHash": "sha256-zisMGZ/akYQUrPkLiZvyAi7kJrge34XaOyT/YQS7pzw=", - "owner": "doronbehar", - "repo": "nix-matlab", - "rev": "aa979bfe814051b15bc562c2b7f10b5fc1b08451", - "type": "gitlab" - }, - "original": { - "owner": "doronbehar", - "repo": "nix-matlab", - "type": "gitlab" - } - }, "nix-mode": { "flake": false, "locked": { @@ -1193,11 +1172,11 @@ "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { - "lastModified": 1698359940, - "narHash": "sha256-GqDocJl7bb7g2cu+sw1VAd6ld6G3054kbmwm0QfDhfQ=", + "lastModified": 1700370378, + "narHash": "sha256-NUKdDhwCBZbqVhMMC0XcozTC4X13cHaY1nqraQb8f8k=", "owner": "NixOS", "repo": "nix", - "rev": "a6e587923c9d5d716fe0f0049bed96d1cc210bff", + "rev": "c4a74d6dcc64f5d00358db9f9d9af84028d97564", "type": "github" }, "original": { @@ -1278,11 +1257,11 @@ }, "nixos-2305": { "locked": { - "lastModified": 1694724971, - "narHash": "sha256-NazxO2WuzV1pVnVoFpo7vJbgTTDhywhDxEDwFw6tyWY=", + "lastModified": 1698911509, + "narHash": "sha256-FFwqTbF+1laraWTL/t7LI+gN+DYfoj+iFYLof5wCea8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "16a63df66bfefec64daab3da10d414055d782d66", + "rev": "ecd985f22e007e6ac3152d68590c06cbbaea8c0e", "type": "github" }, "original": { @@ -1302,11 +1281,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1698480628, - "narHash": "sha256-J1WzYa9NkhHPSO8qWWSMAYJLQd8zaZNZCd2dpnf24tw=", + "lastModified": 1700336089, + "narHash": "sha256-Os0D98qIsR+ABi5WmCqD8BpbTWcjwd/GWhKmJKtzniw=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "0a929da703b18b9191cbbd92c3092b38514d450b", + "rev": "5317af5f1425e89dc723c81a4e33190c1e61b059", "type": "github" }, "original": { @@ -1327,11 +1306,11 @@ ] }, "locked": { - "lastModified": 1694429687, - "narHash": "sha256-fopTSMmOjk7/ro8+P2wZxAC8OPUKtuwHLNp2xSPXVjc=", + "lastModified": 1697515196, + "narHash": "sha256-EZivLoJHCqJdi23Mn/p+lPNHBBctGSWzEnAhYfC0VD0=", "owner": "nix-community", "repo": "nixos-images", - "rev": "c4c73bce65306a1e747684dd0d4bcf0ab2779585", + "rev": "87bccdbdfbeb07e0c4fb4c2ec3d71986e8fa24d9", "type": "github" }, "original": { @@ -1454,11 +1433,11 @@ }, "nixpkgs-hashicorp": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -1471,11 +1450,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -1570,11 +1549,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1698434055, - "narHash": "sha256-Phxi5mUKSoL7A0IYUiYtkI9e8NcGaaV5PJEaJApU1Ko=", + "lastModified": 1700097215, + "narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1a3c95e3b23b3cdb26750621c08cc2f1560cb883", + "rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f", "type": "github" }, "original": { @@ -1634,11 +1613,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1694669921, - "narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=", + "lastModified": 1700218750, + "narHash": "sha256-ft54Un/pZ/KoI6hx9HLeb/SLg0SB8NvV+z7vzrpWs8c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c", + "rev": "2542afeb0d81db4d1e5bc8df8354cbdcc29c2f53", "type": "github" }, "original": { @@ -1650,11 +1629,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -1817,11 +1796,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1700204040, + "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", "type": "github" }, "original": { @@ -1881,16 +1860,16 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1695283060, - "narHash": "sha256-CJz71xhCLlRkdFUSQEL0pIAAfcnWFXMzd9vXhPrnrEg=", + "lastModified": 1698876495, + "narHash": "sha256-nsQo2/mkDUFeAjuu92p0dEqhRvHHiENhkKVIV1y0/Oo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "31ed632c692e6a36cfc18083b88ece892f863ed4", + "rev": "9eb24edd6a0027fed010ccfe300a9734d029983c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05-small", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } @@ -1952,11 +1931,11 @@ "numen": "numen" }, "locked": { - "lastModified": 1693098696, - "narHash": "sha256-Gc9K4ho6fR/GZg3/UwjLfoJkXvhHXci92NLxeZLSnXc=", + "lastModified": 1699002865, + "narHash": "sha256-uvgO61FUuqLVW3uzoTYvwWwHMJ5cmIk1SGqP8E+X3C8=", "owner": "anpandey", "repo": "numen-nix", - "rev": "27350448dd39553070d722426b888eedc865bc4d", + "rev": "b9b81a41b1da7d36ce074bc8894ecd64cdf7b945", "type": "github" }, "original": { @@ -2026,11 +2005,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1695576016, - "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", + "lastModified": 1700064067, + "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", + "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8", "type": "github" }, "original": { @@ -2115,9 +2094,9 @@ "secret": { "flake": false, "locked": { - "lastModified": 1698965954, - "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", - "path": "/var/empty", + "lastModified": 1699358355, + "narHash": "sha256-Jn7BMgV3Dng+6hJ2Mn+cNseFimZApPuvSLNz+9ub7E0=", + "path": "/home/main/dotfiles/secret", "type": "path" }, "original": { @@ -2155,11 +2134,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1698538187, - "narHash": "sha256-n0BDH9D9EXjxeR2HgAe1oeDwdHOuJJg29cYktHqcyRA=", + "lastModified": 1700352621, + "narHash": "sha256-u2BfJlxp3gqVX2FWCvWsIAKuAwpUph1HtQi4pm8HmWA=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "acae28932ea28d4132f7cf1718983a3ab7adf11b", + "rev": "dc5bc31d2c23fc30dce14fe8b97c22a2d7b085f1", "type": "github" }, "original": { @@ -2252,11 +2231,11 @@ ] }, "locked": { - "lastModified": 1694528738, - "narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=", + "lastModified": 1698438538, + "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8", + "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", "type": "github" }, "original": { @@ -2273,11 +2252,11 @@ ] }, "locked": { - "lastModified": 1697576357, - "narHash": "sha256-nMlx9L5SaaRRzKeixx2TtRtE8RrWdK7h1jXba1TZcNs=", + "lastModified": 1698750271, + "narHash": "sha256-Bb8PUO9lOVjLWmzSHQ/ymG/+pyRy4PdQ3xt9urAPtpU=", "owner": "blitz", "repo": "tuxedo-nixos", - "rev": "a6a1b5cd29300f1b8b73f134f9f541e8c0c8c237", + "rev": "fda17eb3acef01c7ad1536749ceb107b9ef7bd2d", "type": "github" }, "original": { @@ -2295,11 +2274,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1698079085, - "narHash": "sha256-Yujki2vGzaT8Ze5Usk8FPg8bn86MvyyPTiWuWwEw7Xs=", + "lastModified": 1700389136, + "narHash": "sha256-5F9Xo+tnmYqmFiKrKMe+EEqypmG9iIvwai5yuKCm00Y=", "owner": "AaronErhardt", "repo": "tuxedo-rs", - "rev": "74b863e6dcb1ec2e6c8fb02c16bb6f23b59e67f6", + "rev": "388e5fc96c38412e3640759ba8a1a80dfff1218a", "type": "github" }, "original": { From 7398a811ca7d11c31abed711482191a008fd5cb6 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 19 Nov 2023 12:45:29 +0100 Subject: [PATCH 19/21] Home Assistant no longer has a `safe_mode` component Signed-off-by: magic_rb --- nixng/containers/home-assistant/home-assistant.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixng/containers/home-assistant/home-assistant.nix b/nixng/containers/home-assistant/home-assistant.nix index 5cb749f..eab8de0 100644 --- a/nixng/containers/home-assistant/home-assistant.nix +++ b/nixng/containers/home-assistant/home-assistant.nix @@ -104,7 +104,6 @@ makeSystem { "camera" "onboarding" "frontend" - "safe_mode" "met" "zha" "mobile_app" From 40d9dd12e2ae84be6731bafcc5b8782fca15021f Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 19 Nov 2023 12:45:51 +0100 Subject: [PATCH 20/21] Emacs `generic.nix` to `make-emacs.nix` Signed-off-by: magic_rb --- overlays/emacs-master-nativecomp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlays/emacs-master-nativecomp/default.nix b/overlays/emacs-master-nativecomp/default.nix index b119f28..1171e28 100644 --- a/overlays/emacs-master-nativecomp/default.nix +++ b/overlays/emacs-master-nativecomp/default.nix @@ -4,7 +4,7 @@ { emacs-master-nativecomp = let - emacs-master = import (inputs.nixpkgs + "/pkgs/applications/editors/emacs/generic.nix") { + emacs-master = import (inputs.nixpkgs + "/pkgs/applications/editors/emacs/make-emacs.nix") { version = "30"; pname = "emacs-nativecomp"; variant = "nativecomp"; From 9ad6239c565fc74680e426efee1def033a482ce3 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sun, 19 Nov 2023 13:12:21 +0100 Subject: [PATCH 21/21] Set secret to `/var/empty` properly Signed-off-by: magic_rb --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6b2f455..4f58c23 100644 --- a/flake.lock +++ b/flake.lock @@ -2094,9 +2094,9 @@ "secret": { "flake": false, "locked": { - "lastModified": 1699358355, - "narHash": "sha256-Jn7BMgV3Dng+6hJ2Mn+cNseFimZApPuvSLNz+9ub7E0=", - "path": "/home/main/dotfiles/secret", + "lastModified": 1700075641, + "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", + "path": "/var/empty", "type": "path" }, "original": {