Merge branch 'flake-update'

This commit is contained in:
magic_rb 2023-11-19 23:18:38 +01:00
commit 8cb85d620f
16 changed files with 325 additions and 247 deletions

View file

@ -139,11 +139,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1696468923, "lastModified": 1699781810,
"narHash": "sha256-qSM7NKgf8LcZ5hjKHZ8ANFI8+LQivvAypbhJHBJmYFM=", "narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "cde886a1c97ef2399b4f91409db045785020291f", "rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694710969, "lastModified": 1698422527,
"narHash": "sha256-5nMY+3JF/ktW8D8URataP6MCbbnID13P4CixARNoq6w=", "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "91af5b4a53ee8e57f4178ef58036dce49fbda91a", "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1696343447, "lastModified": 1698882062,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,11 +399,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1693611461, "lastModified": 1698882062,
"narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,11 +453,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1687709756, "lastModified": 1694529238,
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -550,14 +550,14 @@
"type": "github" "type": "github"
} }
}, },
"ghc980": { "ghc98X": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1692910316, "lastModified": 1696643148,
"narHash": "sha256-Qv8I3GzzIIN32RTEKI38BW5nO1f7j6Xm+dDeDUyYZWo=", "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=",
"ref": "ghc-9.8", "ref": "ghc-9.8",
"rev": "249aa8193e4c5c1ee46ce29b39d2fffa57de7904", "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6",
"revCount": 61566, "revCount": 61642,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc" "url": "https://gitlab.haskell.org/ghc/ghc"
@ -572,11 +572,11 @@
"ghc99": { "ghc99": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1695427505, "lastModified": 1697054644,
"narHash": "sha256-j0hXl6uEI+Uwf37z3WLuQZN4S0XqGtiepELv2Gl2aHU=", "narHash": "sha256-kKarOuXUaAH3QWv7ASx+gGFMHaHKe0pK5Zu37ky2AL4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "b8e4fe2318798185228fb5f8214ba2384ac95b4f", "rev": "f383a242c76f90bcca8a4d7ee001dcb49c172a9a",
"revCount": 61951, "revCount": 62040,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc" "url": "https://gitlab.haskell.org/ghc/ghc"
@ -628,11 +628,11 @@
"hackage": { "hackage": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696465466, "lastModified": 1700353452,
"narHash": "sha256-YlazbA1gGX6DGONHpGsA7vEgS0y43TzmarLkRjL0Nn0=", "narHash": "sha256-YUy4t7Wfow3K6nyfJV4GY7NCnEoxDEAufXiF9f7Ryg8=",
"owner": "input-output-hk", "owner": "input-output-hk",
"repo": "hackage.nix", "repo": "hackage.nix",
"rev": "a99556cc8d1b2296eb1cc11c301564e1ee9324d1", "rev": "6e756c20a4537db56d9bcb3e4936dae912381da1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -650,13 +650,14 @@
"cardano-shell": "cardano-shell", "cardano-shell": "cardano-shell",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
"ghc980": "ghc980", "ghc98X": "ghc98X",
"ghc99": "ghc99", "ghc99": "ghc99",
"hackage": "hackage", "hackage": "hackage",
"hls-1.10": "hls-1.10", "hls-1.10": "hls-1.10",
"hls-2.0": "hls-2.0", "hls-2.0": "hls-2.0",
"hls-2.2": "hls-2.2", "hls-2.2": "hls-2.2",
"hls-2.3": "hls-2.3", "hls-2.3": "hls-2.3",
"hls-2.4": "hls-2.4",
"hpc-coveralls": "hpc-coveralls", "hpc-coveralls": "hpc-coveralls",
"hydra": "hydra", "hydra": "hydra",
"iserv-proxy": "iserv-proxy", "iserv-proxy": "iserv-proxy",
@ -675,11 +676,11 @@
"stackage": "stackage" "stackage": "stackage"
}, },
"locked": { "locked": {
"lastModified": 1696467024, "lastModified": 1700354987,
"narHash": "sha256-I5sEmq164owgIeD5fpPFTWE4hWLIrxaP0pHxTnPCbFI=", "narHash": "sha256-FI/gnGxnY/ICUAu6bGWKzdFSb4OX0OsstFHowEOXotE=",
"owner": "input-output-hk", "owner": "input-output-hk",
"repo": "haskell.nix", "repo": "haskell.nix",
"rev": "ed278215e758fac7ce6514df2d3956bc5c478046", "rev": "666f4c93882e32ceae6a4166aa1986db84e33604",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -772,16 +773,33 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1696446489, "lastModified": 1700386809,
"narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=", "narHash": "sha256-2IPxWo0Yplv+70EueZVLTwRAijax0tirYp5Jh0QV1A4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a", "rev": "9a4725afa67db35cdf7be89f30527d745194cafa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1016,11 +1034,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1696405736, "lastModified": 1700320345,
"narHash": "sha256-Wb8qSpePi/cSLOGr9YStiU4F4w6KyycDlyHXNI8U3xA=", "narHash": "sha256-HDBVj9gEOG2ZBGc+UGtjqDsOIvYOQtDxDRGrbiWOXl0=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "abd63123e2b2dbc34d1ac38a73578b27ec9ef342", "rev": "b16e6261ad2f0bca6ac2a4b7a4d3377cf5e3d95d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1052,11 +1070,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1695485017, "lastModified": 1699423608,
"narHash": "sha256-aQyRBJnT4tftexM/Y3etfOk8tfMFZzt+vSVtL2J0KLY=", "narHash": "sha256-WEVUgivm5DCziwZqiXRPeoD3FQTXW38ExKrZjvMveqE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "510bc6e9b41d39c81b9c815065cb5b7e23a2428c", "rev": "5607d429016d6f9a72843b07127fad23ea9d661f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1154,11 +1172,11 @@
"nixpkgs-regression": "nixpkgs-regression_4" "nixpkgs-regression": "nixpkgs-regression_4"
}, },
"locked": { "locked": {
"lastModified": 1698066191, "lastModified": 1700370378,
"narHash": "sha256-Uak+L03LWQQQqT7K4BgTnnh6MAvSWyzqoLzOL73D/RY=", "narHash": "sha256-NUKdDhwCBZbqVhMMC0XcozTC4X13cHaY1nqraQb8f8k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "b461cac21aa5b9127d230ed3f1a1ca8e8266fb60", "rev": "c4a74d6dcc64f5d00358db9f9d9af84028d97564",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1239,11 +1257,11 @@
}, },
"nixos-2305": { "nixos-2305": {
"locked": { "locked": {
"lastModified": 1694724971, "lastModified": 1698911509,
"narHash": "sha256-NazxO2WuzV1pVnVoFpo7vJbgTTDhywhDxEDwFw6tyWY=", "narHash": "sha256-FFwqTbF+1laraWTL/t7LI+gN+DYfoj+iFYLof5wCea8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "16a63df66bfefec64daab3da10d414055d782d66", "rev": "ecd985f22e007e6ac3152d68590c06cbbaea8c0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1263,11 +1281,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1696441224, "lastModified": 1700336089,
"narHash": "sha256-HYuoi7TSSHpRXW9wqCgxjPe9mEWnsAzIWIl3Z9oUA+k=", "narHash": "sha256-Os0D98qIsR+ABi5WmCqD8BpbTWcjwd/GWhKmJKtzniw=",
"owner": "numtide", "owner": "numtide",
"repo": "nixos-anywhere", "repo": "nixos-anywhere",
"rev": "ffcbf8c326f05f7a66563a12e57562f53af2c28b", "rev": "5317af5f1425e89dc723c81a4e33190c1e61b059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1288,11 +1306,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694429687, "lastModified": 1697515196,
"narHash": "sha256-fopTSMmOjk7/ro8+P2wZxAC8OPUKtuwHLNp2xSPXVjc=", "narHash": "sha256-EZivLoJHCqJdi23Mn/p+lPNHBBctGSWzEnAhYfC0VD0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-images", "repo": "nixos-images",
"rev": "c4c73bce65306a1e747684dd0d4bcf0ab2779585", "rev": "87bccdbdfbeb07e0c4fb4c2ec3d71986e8fa24d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1303,11 +1321,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1696419054, "lastModified": 1697915759,
"narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1415,11 +1433,11 @@
}, },
"nixpkgs-hashicorp": { "nixpkgs-hashicorp": {
"locked": { "locked": {
"lastModified": 1696193975, "lastModified": 1700204040,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1432,11 +1450,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1696019113, "lastModified": 1698611440,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1530,6 +1548,22 @@
} }
}, },
"nixpkgs-stable": { "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": { "locked": {
"lastModified": 1685801374, "lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
@ -1579,11 +1613,11 @@
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1694669921, "lastModified": 1700218750,
"narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=", "narHash": "sha256-ft54Un/pZ/KoI6hx9HLeb/SLg0SB8NvV+z7vzrpWs8c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c", "rev": "2542afeb0d81db4d1e5bc8df8354cbdcc29c2f53",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1595,11 +1629,11 @@
}, },
"nixpkgs_12": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1696193975, "lastModified": 1700204040,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1762,11 +1796,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1696193975, "lastModified": 1700204040,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1810,11 +1844,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1690441914, "lastModified": 1696725822,
"narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", "narHash": "sha256-B7uAOS7TkLlOg1aX01rQlYbydcyB6ZnLJSfaYbKVww8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f", "rev": "5aabb5780a11c500981993d49ee93cfa6df9307b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1826,16 +1860,16 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1695283060, "lastModified": 1698876495,
"narHash": "sha256-CJz71xhCLlRkdFUSQEL0pIAAfcnWFXMzd9vXhPrnrEg=", "narHash": "sha256-nsQo2/mkDUFeAjuu92p0dEqhRvHHiENhkKVIV1y0/Oo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "31ed632c692e6a36cfc18083b88ece892f863ed4", "rev": "9eb24edd6a0027fed010ccfe300a9734d029983c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.05-small", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1897,11 +1931,11 @@
"numen": "numen" "numen": "numen"
}, },
"locked": { "locked": {
"lastModified": 1693098696, "lastModified": 1699002865,
"narHash": "sha256-Gc9K4ho6fR/GZg3/UwjLfoJkXvhHXci92NLxeZLSnXc=", "narHash": "sha256-uvgO61FUuqLVW3uzoTYvwWwHMJ5cmIk1SGqP8E+X3C8=",
"owner": "anpandey", "owner": "anpandey",
"repo": "numen-nix", "repo": "numen-nix",
"rev": "27350448dd39553070d722426b888eedc865bc4d", "rev": "b9b81a41b1da7d36ce074bc8894ecd64cdf7b945",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1968,14 +2002,14 @@
"tuxedo-rs", "tuxedo-rs",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1695576016, "lastModified": 1700064067,
"narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2003,6 +2037,7 @@
"nixos-anywhere": "nixos-anywhere", "nixos-anywhere": "nixos-anywhere",
"nixpkgs": "nixpkgs_12", "nixpkgs": "nixpkgs_12",
"nixpkgs-hashicorp": "nixpkgs-hashicorp", "nixpkgs-hashicorp": "nixpkgs-hashicorp",
"nixpkgs-stable": "nixpkgs-stable",
"notnft": "notnft", "notnft": "notnft",
"numen-nix": "numen-nix", "numen-nix": "numen-nix",
"secret": "secret", "secret": "secret",
@ -2027,11 +2062,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688783586, "lastModified": 1696817516,
"narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", "narHash": "sha256-Xt9OY4Wnk9/vuUfA0OHFtmSlaen5GyiS9msgwOz3okI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "7a29283cc242c2486fc67f60b431ef708046d176", "rev": "c0df7f2a856b5ff27a3ce314f6d7aacf5fda546f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2099,11 +2134,11 @@
"stackage": { "stackage": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696464547, "lastModified": 1700352621,
"narHash": "sha256-NABJBlKDwsQox6yrKZ8saWdhjLwQEGIwpmJlClaeO1A=", "narHash": "sha256-u2BfJlxp3gqVX2FWCvWsIAKuAwpUph1HtQi4pm8HmWA=",
"owner": "input-output-hk", "owner": "input-output-hk",
"repo": "stackage.nix", "repo": "stackage.nix",
"rev": "844c3b4c520cb4ead6113f6ba25dc2ad33e21273", "rev": "dc5bc31d2c23fc30dce14fe8b97c22a2d7b085f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2196,11 +2231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694528738, "lastModified": 1698438538,
"narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=", "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8", "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2217,11 +2252,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692543521, "lastModified": 1698750271,
"narHash": "sha256-/a6U3HkADtAZJq716PB4bxIw/7h5oEG6N7bvw8vTQtE=", "narHash": "sha256-Bb8PUO9lOVjLWmzSHQ/ymG/+pyRy4PdQ3xt9urAPtpU=",
"owner": "blitz", "owner": "blitz",
"repo": "tuxedo-nixos", "repo": "tuxedo-nixos",
"rev": "91f7d9ba249f5fd1357f8d55bc510c1641d54a52", "rev": "fda17eb3acef01c7ad1536749ceb107b9ef7bd2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2239,11 +2274,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1696452819, "lastModified": 1700389136,
"narHash": "sha256-BOmlPisJLHE0W+MyVTAnL/nfNimFxW6pSQZab9uw60g=", "narHash": "sha256-5F9Xo+tnmYqmFiKrKMe+EEqypmG9iIvwai5yuKCm00Y=",
"owner": "AaronErhardt", "owner": "AaronErhardt",
"repo": "tuxedo-rs", "repo": "tuxedo-rs",
"rev": "b5ce23303b0e40c5fc2bb5afc1b38bbfe84a289c", "rev": "388e5fc96c38412e3640759ba8a1a80dfff1218a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2255,11 +2290,11 @@
"udp-over-tcp": { "udp-over-tcp": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696508126, "lastModified": 1698218817,
"narHash": "sha256-rUR3QkiCgPY64CjIsa5v+DuhnpJ+CyqcD2TefmDe1as=", "narHash": "sha256-C14sj8z1e4KzNdLsMhnmEKsq8qsyjcSBUMPn/3+YALo=",
"owner": "mullvad", "owner": "mullvad",
"repo": "udp-over-tcp", "repo": "udp-over-tcp",
"rev": "233f17045592e32d0499c9d00a0bfd2d9fa43196", "rev": "104ccafcc03f95bcdf7a7d28fafe0eed6744bc45",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2355,11 +2390,11 @@
"yaml-mode": "yaml-mode" "yaml-mode": "yaml-mode"
}, },
"locked": { "locked": {
"lastModified": 1697379565, "lastModified": 1697390467,
"narHash": "sha256-wNFndZ+79VIVZPH3SdSc/WWvbsNgCNozO24edyp+7jE=", "narHash": "sha256-WQJ7Yyx0oFJcBbguMdj1tyjyX25R3nJWMYQcBAyaX64=",
"owner": "~magic_rb", "owner": "~magic_rb",
"repo": "website", "repo": "website",
"rev": "da2b4978096f348a24f589c1fb61aecdd9a75eaf", "rev": "0a80b11bac43fd7f5f8481b39aeff5182cfd8161",
"type": "sourcehut" "type": "sourcehut"
}, },
"original": { "original": {

View file

@ -139,11 +139,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1696468923, "lastModified": 1699781810,
"narHash": "sha256-qSM7NKgf8LcZ5hjKHZ8ANFI8+LQivvAypbhJHBJmYFM=", "narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "cde886a1c97ef2399b4f91409db045785020291f", "rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694710969, "lastModified": 1698422527,
"narHash": "sha256-5nMY+3JF/ktW8D8URataP6MCbbnID13P4CixARNoq6w=", "narHash": "sha256-SDu3Xg263t3oXIyTaH0buOvFnKIDeZsvKDBtOz+jRbs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "91af5b4a53ee8e57f4178ef58036dce49fbda91a", "rev": "944d338d24a9d043a3f7461c30ee6cfe4f9cca30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1696343447, "lastModified": 1698882062,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,11 +399,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1693611461, "lastModified": 1698882062,
"narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,11 +453,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1687709756, "lastModified": 1694529238,
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -550,14 +550,14 @@
"type": "github" "type": "github"
} }
}, },
"ghc980": { "ghc98X": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1692910316, "lastModified": 1696643148,
"narHash": "sha256-Qv8I3GzzIIN32RTEKI38BW5nO1f7j6Xm+dDeDUyYZWo=", "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=",
"ref": "ghc-9.8", "ref": "ghc-9.8",
"rev": "249aa8193e4c5c1ee46ce29b39d2fffa57de7904", "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6",
"revCount": 61566, "revCount": 61642,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc" "url": "https://gitlab.haskell.org/ghc/ghc"
@ -572,11 +572,11 @@
"ghc99": { "ghc99": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1695427505, "lastModified": 1697054644,
"narHash": "sha256-j0hXl6uEI+Uwf37z3WLuQZN4S0XqGtiepELv2Gl2aHU=", "narHash": "sha256-kKarOuXUaAH3QWv7ASx+gGFMHaHKe0pK5Zu37ky2AL4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "b8e4fe2318798185228fb5f8214ba2384ac95b4f", "rev": "f383a242c76f90bcca8a4d7ee001dcb49c172a9a",
"revCount": 61951, "revCount": 62040,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://gitlab.haskell.org/ghc/ghc" "url": "https://gitlab.haskell.org/ghc/ghc"
@ -628,11 +628,11 @@
"hackage": { "hackage": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696465466, "lastModified": 1700353452,
"narHash": "sha256-YlazbA1gGX6DGONHpGsA7vEgS0y43TzmarLkRjL0Nn0=", "narHash": "sha256-YUy4t7Wfow3K6nyfJV4GY7NCnEoxDEAufXiF9f7Ryg8=",
"owner": "input-output-hk", "owner": "input-output-hk",
"repo": "hackage.nix", "repo": "hackage.nix",
"rev": "a99556cc8d1b2296eb1cc11c301564e1ee9324d1", "rev": "6e756c20a4537db56d9bcb3e4936dae912381da1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -650,13 +650,14 @@
"cardano-shell": "cardano-shell", "cardano-shell": "cardano-shell",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
"ghc980": "ghc980", "ghc98X": "ghc98X",
"ghc99": "ghc99", "ghc99": "ghc99",
"hackage": "hackage", "hackage": "hackage",
"hls-1.10": "hls-1.10", "hls-1.10": "hls-1.10",
"hls-2.0": "hls-2.0", "hls-2.0": "hls-2.0",
"hls-2.2": "hls-2.2", "hls-2.2": "hls-2.2",
"hls-2.3": "hls-2.3", "hls-2.3": "hls-2.3",
"hls-2.4": "hls-2.4",
"hpc-coveralls": "hpc-coveralls", "hpc-coveralls": "hpc-coveralls",
"hydra": "hydra", "hydra": "hydra",
"iserv-proxy": "iserv-proxy", "iserv-proxy": "iserv-proxy",
@ -675,11 +676,11 @@
"stackage": "stackage" "stackage": "stackage"
}, },
"locked": { "locked": {
"lastModified": 1696467024, "lastModified": 1700354987,
"narHash": "sha256-I5sEmq164owgIeD5fpPFTWE4hWLIrxaP0pHxTnPCbFI=", "narHash": "sha256-FI/gnGxnY/ICUAu6bGWKzdFSb4OX0OsstFHowEOXotE=",
"owner": "input-output-hk", "owner": "input-output-hk",
"repo": "haskell.nix", "repo": "haskell.nix",
"rev": "ed278215e758fac7ce6514df2d3956bc5c478046", "rev": "666f4c93882e32ceae6a4166aa1986db84e33604",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -772,16 +773,33 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1696446489, "lastModified": 1700386809,
"narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=", "narHash": "sha256-2IPxWo0Yplv+70EueZVLTwRAijax0tirYp5Jh0QV1A4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a", "rev": "9a4725afa67db35cdf7be89f30527d745194cafa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1016,11 +1034,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1696405736, "lastModified": 1700320345,
"narHash": "sha256-Wb8qSpePi/cSLOGr9YStiU4F4w6KyycDlyHXNI8U3xA=", "narHash": "sha256-HDBVj9gEOG2ZBGc+UGtjqDsOIvYOQtDxDRGrbiWOXl0=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "abd63123e2b2dbc34d1ac38a73578b27ec9ef342", "rev": "b16e6261ad2f0bca6ac2a4b7a4d3377cf5e3d95d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1052,11 +1070,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1695485017, "lastModified": 1699423608,
"narHash": "sha256-aQyRBJnT4tftexM/Y3etfOk8tfMFZzt+vSVtL2J0KLY=", "narHash": "sha256-WEVUgivm5DCziwZqiXRPeoD3FQTXW38ExKrZjvMveqE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "510bc6e9b41d39c81b9c815065cb5b7e23a2428c", "rev": "5607d429016d6f9a72843b07127fad23ea9d661f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1154,11 +1172,11 @@
"nixpkgs-regression": "nixpkgs-regression_4" "nixpkgs-regression": "nixpkgs-regression_4"
}, },
"locked": { "locked": {
"lastModified": 1698066191, "lastModified": 1700370378,
"narHash": "sha256-Uak+L03LWQQQqT7K4BgTnnh6MAvSWyzqoLzOL73D/RY=", "narHash": "sha256-NUKdDhwCBZbqVhMMC0XcozTC4X13cHaY1nqraQb8f8k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "b461cac21aa5b9127d230ed3f1a1ca8e8266fb60", "rev": "c4a74d6dcc64f5d00358db9f9d9af84028d97564",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1239,11 +1257,11 @@
}, },
"nixos-2305": { "nixos-2305": {
"locked": { "locked": {
"lastModified": 1694724971, "lastModified": 1698911509,
"narHash": "sha256-NazxO2WuzV1pVnVoFpo7vJbgTTDhywhDxEDwFw6tyWY=", "narHash": "sha256-FFwqTbF+1laraWTL/t7LI+gN+DYfoj+iFYLof5wCea8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "16a63df66bfefec64daab3da10d414055d782d66", "rev": "ecd985f22e007e6ac3152d68590c06cbbaea8c0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1263,11 +1281,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1696441224, "lastModified": 1700336089,
"narHash": "sha256-HYuoi7TSSHpRXW9wqCgxjPe9mEWnsAzIWIl3Z9oUA+k=", "narHash": "sha256-Os0D98qIsR+ABi5WmCqD8BpbTWcjwd/GWhKmJKtzniw=",
"owner": "numtide", "owner": "numtide",
"repo": "nixos-anywhere", "repo": "nixos-anywhere",
"rev": "ffcbf8c326f05f7a66563a12e57562f53af2c28b", "rev": "5317af5f1425e89dc723c81a4e33190c1e61b059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1288,11 +1306,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694429687, "lastModified": 1697515196,
"narHash": "sha256-fopTSMmOjk7/ro8+P2wZxAC8OPUKtuwHLNp2xSPXVjc=", "narHash": "sha256-EZivLoJHCqJdi23Mn/p+lPNHBBctGSWzEnAhYfC0VD0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-images", "repo": "nixos-images",
"rev": "c4c73bce65306a1e747684dd0d4bcf0ab2779585", "rev": "87bccdbdfbeb07e0c4fb4c2ec3d71986e8fa24d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1303,11 +1321,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1696419054, "lastModified": 1697915759,
"narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1415,11 +1433,11 @@
}, },
"nixpkgs-hashicorp": { "nixpkgs-hashicorp": {
"locked": { "locked": {
"lastModified": 1696193975, "lastModified": 1700204040,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1432,11 +1450,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1696019113, "lastModified": 1698611440,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1530,6 +1548,22 @@
} }
}, },
"nixpkgs-stable": { "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": { "locked": {
"lastModified": 1685801374, "lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
@ -1579,11 +1613,11 @@
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1694669921, "lastModified": 1700218750,
"narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=", "narHash": "sha256-ft54Un/pZ/KoI6hx9HLeb/SLg0SB8NvV+z7vzrpWs8c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c", "rev": "2542afeb0d81db4d1e5bc8df8354cbdcc29c2f53",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1595,11 +1629,11 @@
}, },
"nixpkgs_12": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1696193975, "lastModified": 1700204040,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1762,11 +1796,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1696193975, "lastModified": 1700204040,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1810,11 +1844,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1690441914, "lastModified": 1696725822,
"narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=", "narHash": "sha256-B7uAOS7TkLlOg1aX01rQlYbydcyB6ZnLJSfaYbKVww8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f", "rev": "5aabb5780a11c500981993d49ee93cfa6df9307b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1826,16 +1860,16 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1695283060, "lastModified": 1698876495,
"narHash": "sha256-CJz71xhCLlRkdFUSQEL0pIAAfcnWFXMzd9vXhPrnrEg=", "narHash": "sha256-nsQo2/mkDUFeAjuu92p0dEqhRvHHiENhkKVIV1y0/Oo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "31ed632c692e6a36cfc18083b88ece892f863ed4", "rev": "9eb24edd6a0027fed010ccfe300a9734d029983c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.05-small", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1897,11 +1931,11 @@
"numen": "numen" "numen": "numen"
}, },
"locked": { "locked": {
"lastModified": 1693098696, "lastModified": 1699002865,
"narHash": "sha256-Gc9K4ho6fR/GZg3/UwjLfoJkXvhHXci92NLxeZLSnXc=", "narHash": "sha256-uvgO61FUuqLVW3uzoTYvwWwHMJ5cmIk1SGqP8E+X3C8=",
"owner": "anpandey", "owner": "anpandey",
"repo": "numen-nix", "repo": "numen-nix",
"rev": "27350448dd39553070d722426b888eedc865bc4d", "rev": "b9b81a41b1da7d36ce074bc8894ecd64cdf7b945",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1968,14 +2002,14 @@
"tuxedo-rs", "tuxedo-rs",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1695576016, "lastModified": 1700064067,
"narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2003,6 +2037,7 @@
"nixos-anywhere": "nixos-anywhere", "nixos-anywhere": "nixos-anywhere",
"nixpkgs": "nixpkgs_12", "nixpkgs": "nixpkgs_12",
"nixpkgs-hashicorp": "nixpkgs-hashicorp", "nixpkgs-hashicorp": "nixpkgs-hashicorp",
"nixpkgs-stable": "nixpkgs-stable",
"notnft": "notnft", "notnft": "notnft",
"numen-nix": "numen-nix", "numen-nix": "numen-nix",
"secret": "secret", "secret": "secret",
@ -2027,11 +2062,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688783586, "lastModified": 1696817516,
"narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", "narHash": "sha256-Xt9OY4Wnk9/vuUfA0OHFtmSlaen5GyiS9msgwOz3okI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "7a29283cc242c2486fc67f60b431ef708046d176", "rev": "c0df7f2a856b5ff27a3ce314f6d7aacf5fda546f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2059,7 +2094,7 @@
"secret": { "secret": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1698965954, "lastModified": 1700075641,
"narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=", "narHash": "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=",
"path": "/var/empty", "path": "/var/empty",
"type": "path" "type": "path"
@ -2099,11 +2134,11 @@
"stackage": { "stackage": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696464547, "lastModified": 1700352621,
"narHash": "sha256-NABJBlKDwsQox6yrKZ8saWdhjLwQEGIwpmJlClaeO1A=", "narHash": "sha256-u2BfJlxp3gqVX2FWCvWsIAKuAwpUph1HtQi4pm8HmWA=",
"owner": "input-output-hk", "owner": "input-output-hk",
"repo": "stackage.nix", "repo": "stackage.nix",
"rev": "844c3b4c520cb4ead6113f6ba25dc2ad33e21273", "rev": "dc5bc31d2c23fc30dce14fe8b97c22a2d7b085f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2196,11 +2231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1694528738, "lastModified": 1698438538,
"narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=", "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8", "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2217,11 +2252,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692543521, "lastModified": 1698750271,
"narHash": "sha256-/a6U3HkADtAZJq716PB4bxIw/7h5oEG6N7bvw8vTQtE=", "narHash": "sha256-Bb8PUO9lOVjLWmzSHQ/ymG/+pyRy4PdQ3xt9urAPtpU=",
"owner": "blitz", "owner": "blitz",
"repo": "tuxedo-nixos", "repo": "tuxedo-nixos",
"rev": "91f7d9ba249f5fd1357f8d55bc510c1641d54a52", "rev": "fda17eb3acef01c7ad1536749ceb107b9ef7bd2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2239,11 +2274,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1696452819, "lastModified": 1700389136,
"narHash": "sha256-BOmlPisJLHE0W+MyVTAnL/nfNimFxW6pSQZab9uw60g=", "narHash": "sha256-5F9Xo+tnmYqmFiKrKMe+EEqypmG9iIvwai5yuKCm00Y=",
"owner": "AaronErhardt", "owner": "AaronErhardt",
"repo": "tuxedo-rs", "repo": "tuxedo-rs",
"rev": "b5ce23303b0e40c5fc2bb5afc1b38bbfe84a289c", "rev": "388e5fc96c38412e3640759ba8a1a80dfff1218a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2255,11 +2290,11 @@
"udp-over-tcp": { "udp-over-tcp": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696508126, "lastModified": 1698218817,
"narHash": "sha256-rUR3QkiCgPY64CjIsa5v+DuhnpJ+CyqcD2TefmDe1as=", "narHash": "sha256-C14sj8z1e4KzNdLsMhnmEKsq8qsyjcSBUMPn/3+YALo=",
"owner": "mullvad", "owner": "mullvad",
"repo": "udp-over-tcp", "repo": "udp-over-tcp",
"rev": "233f17045592e32d0499c9d00a0bfd2d9fa43196", "rev": "104ccafcc03f95bcdf7a7d28fafe0eed6744bc45",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2355,11 +2390,11 @@
"yaml-mode": "yaml-mode" "yaml-mode": "yaml-mode"
}, },
"locked": { "locked": {
"lastModified": 1697379565, "lastModified": 1697390467,
"narHash": "sha256-wNFndZ+79VIVZPH3SdSc/WWvbsNgCNozO24edyp+7jE=", "narHash": "sha256-WQJ7Yyx0oFJcBbguMdj1tyjyX25R3nJWMYQcBAyaX64=",
"owner": "~magic_rb", "owner": "~magic_rb",
"repo": "website", "repo": "website",
"rev": "da2b4978096f348a24f589c1fb61aecdd9a75eaf", "rev": "0a80b11bac43fd7f5f8481b39aeff5182cfd8161",
"type": "sourcehut" "type": "sourcehut"
}, },
"original": { "original": {

View file

@ -4,6 +4,7 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; 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"; nixpkgs-hashicorp.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
nixinate.url = "github:MagicRB/nixinate"; nixinate.url = "github:MagicRB/nixinate";
home-manager.url = "github:nix-community/home-manager?ref=master"; home-manager.url = "github:nix-community/home-manager?ref=master";
@ -126,6 +127,7 @@
{ {
nixng = mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixngConfigurations; nixng = mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixngConfigurations;
nixos = mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixosConfigurations; nixos = mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixosConfigurations;
packages = mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixosConfigurations;
}; };
uterranix.config = [ uterranix.config = [
@ -182,9 +184,14 @@
let let
inherit (lib') inherit (lib')
attrValues; attrValues;
pkgs' = pkgs.appendOverlays (attrValues config.flake.overlays); pkgs' = pkgs.appendOverlays (attrValues config.flake.overlays ++ [
inputs.nixng.overlays.default
inputs.nix-matlab.overlay
]);
in in
{ {
terraform-provider-influxdb-v2 = pkgs'.terraform-providers.influxdb-v2;
terraform-provider-vault = pkgs'.terraform-providers.vault;
inherit (pkgs') inherit (pkgs')
emacsclient-remote emacsclient-remote
emacs-master-nativecomp emacs-master-nativecomp
@ -194,13 +201,11 @@
maildrop maildrop
zfs-relmount zfs-relmount
bootloadHID bootloadHID
terraform-provider-influxdb-v2
terrafrom-provider-vault
tree-sitter-grammars tree-sitter-grammars
udp-over-tcp udp-over-tcp
itp itp
ds3os
rolling_datasets; rolling_datasets;
# ds3os;
}; };
devShells.default = devShells.default =

View file

@ -1,7 +1,9 @@
{ ... }: { inputs', pkgs, ... }:
{ {
services.pantalaimon = { services.pantalaimon = {
enable = true; enable = true;
# TODO switch to unstable when PR263669 is merged
package = inputs'.nixpkgs-stable.legacyPackages.${pkgs.stdenv.system}.pantalaimon;
settings = settings =
{ {
Default = Default =

View file

@ -73,7 +73,10 @@ in
obs-studio obs-studio
mpv mpv
slack slack
schildichat-desktop # TODO remove when PR264018 is in
(schildichat-desktop.override {
electron = pkgs.electron_25;
})
# armcord # armcord
pavucontrol pavucontrol
@ -88,7 +91,8 @@ in
# 3d printing # 3d printing
openscad openscad
freecad # TODO move back to unstable when PR263599 is in
inputs'.nixpkgs-stable.legacyPackages.${stdenv.system}.freecad
cura cura
super-slicer super-slicer

View file

@ -104,7 +104,6 @@ makeSystem {
"camera" "camera"
"onboarding" "onboarding"
"frontend" "frontend"
"safe_mode"
"met" "met"
"zha" "zha"
"mobile_app" "mobile_app"

View file

@ -44,7 +44,7 @@ in
]; ];
environment.defaultPackages = mkForce []; environment.defaultPackages = mkForce [];
nix.allowedUsers = [ "@wheel" ]; nix.settings.allowed-users = [ "@wheel" ];
security.sudo.execWheelOnly = true; security.sudo.execWheelOnly = true;
security.auditd.enable = true; security.auditd.enable = true;

View file

@ -1,7 +1,7 @@
{ pkgs, lib, secret, ... }: { pkgs, lib, secret, ... }:
let let
inherit (lib) inherit (lib)
getExe; getExe';
in in
{ {
# boot.kernel.sysctl = {"net.ipv4.ip_forward" = "1";}; # boot.kernel.sysctl = {"net.ipv4.ip_forward" = "1";};
@ -30,11 +30,11 @@ in
interfaces."wg0" = interfaces."wg0" =
{ {
postSetup = '' 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 = '' 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 = ""; }; // secret.wireguard."altra" or { privateKey = ""; };

View file

@ -79,7 +79,7 @@ in
]; ];
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";
system.stateVersion = "20.09"; system.stateVersion = "23.05";
virtualisation.podman.enable = true; virtualisation.podman.enable = true;
virtualisation.podman.dockerCompat = true; virtualisation.podman.dockerCompat = true;

View file

@ -87,6 +87,8 @@
enable = true; enable = true;
settings.PermitRootLogin = "yes"; settings.PermitRootLogin = "yes";
}; };
system.stateVersion = "23.05";
}; };
}; };
} }

View file

@ -16,6 +16,7 @@ in
wireguard.interfaces."wg0" = wireguard.interfaces."wg0" =
secret.wireguard."omen" or { privateKey = ""; }; secret.wireguard."omen" or { privateKey = ""; };
useDHCP = false;
}; };
networking.notnft.rules = with notnft.dsl; with payload; ruleset { networking.notnft.rules = with notnft.dsl; with payload; ruleset {

View file

@ -3,7 +3,6 @@
boot.loader.grub = { boot.loader.grub = {
enable = true; enable = true;
device = "/dev/vda"; device = "/dev/vda";
version = 2;
efiSupport = false; efiSupport = false;
}; };
} }

View file

@ -1,7 +1,7 @@
{ pkgs, lib, secret, ... }: { pkgs, lib, secret, ... }:
let let
inherit (lib) inherit (lib)
getExe; getExe';
in in
{ {
boot.kernel.sysctl = {"net.ipv4.ip_forward" = "1";}; boot.kernel.sysctl = {"net.ipv4.ip_forward" = "1";};
@ -26,11 +26,11 @@ in
interfaces."wg0" = interfaces."wg0" =
{ {
postSetup = '' 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 = '' 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 = ""; }; // secret.wireguard."toothpick" or { privateKey = ""; };

View file

@ -8,10 +8,10 @@
version = "2012-12-08"; version = "2012-12-08";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "whiteson"; owner = "whiteneon";
repo = "bootloadHID"; repo = "bootloadHID";
rev = "42c6f246b79949892268d2212e0347f27e01bd53"; rev = "42c6f246b79949892268d2212e0347f27e01bd53";
sha = ""; sha256 = "sha256-JPcnPwgSFJE88YDGNTq6OsUjZjKx561pfnjxvyp2+1M=wn";
}; };
buildInputs = with prev; [ buildInputs = with prev; [

View file

@ -4,7 +4,7 @@
{ {
emacs-master-nativecomp = emacs-master-nativecomp =
let 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"; version = "30";
pname = "emacs-nativecomp"; pname = "emacs-nativecomp";
variant = "nativecomp"; variant = "nativecomp";
@ -37,7 +37,7 @@
in in
emacs-master-package.override { emacs-master-package.override {
withSQLite3 = true; withSQLite3 = true;
nativeComp = true; withNativeCompilation = true;
withWebP = true; withWebP = true;
withGTK3 = true; withGTK3 = true;
withImageMagick = true; withImageMagick = true;

View file

@ -3,12 +3,9 @@
flake.overlays.terraform-provider-influxdb-v2 = flake.overlays.terraform-provider-influxdb-v2 =
final: prev: final: prev:
{ {
terraform = prev.terraform.overrideAttrs (old: { terraform-providers = prev.terraform-providers // {
passthru.plugins =
old.passthru.plugins
// {
influxdb-v2 = influxdb-v2 =
old.passthru.plugins.mkProvider { prev.terraform-providers.mkProvider {
owner = "MagicRB"; owner = "MagicRB";
repo = "terraform-provider-influxdb-v2"; repo = "terraform-provider-influxdb-v2";
rev = "4f10e465f9526b47d1ef97a8f2e109aa85a7d647"; rev = "4f10e465f9526b47d1ef97a8f2e109aa85a7d647";
@ -18,6 +15,5 @@
provider-source-address = "registry.terraform.io/MagicRB/influxdb-v2"; provider-source-address = "registry.terraform.io/MagicRB/influxdb-v2";
}; };
}; };
} );
}; };
} }