1
0
Fork 0
This commit is contained in:
Malte 2023-04-16 16:57:30 +02:00
parent 39bf4a3f72
commit 0c38673acd
3 changed files with 24 additions and 15 deletions

View file

@ -215,11 +215,11 @@
]
},
"locked": {
"lastModified": 1680439236,
"narHash": "sha256-xKxFySOJpXUVtgjECc0eH4+CraqhSmz6cBxgU0XtBRU=",
"lastModified": 1681411022,
"narHash": "sha256-iZ2fWVI02n7D7VfcwF8k0KLouU0v3v8ed/fJ2YXSt9Q=",
"owner": "mweinelt",
"repo": "nur-packages",
"rev": "12429bc79a92e4410d53338e9eb6a12897c62b45",
"rev": "0024a4dac60c5505a72111708510b51ec7f2c46b",
"type": "github"
},
"original": {
@ -272,11 +272,11 @@
]
},
"locked": {
"lastModified": 1679224439,
"narHash": "sha256-QkvcuC4b67FUkkxlMsLTMPbwoD7yZr0UvJpu6jkFuLo=",
"lastModified": 1681591833,
"narHash": "sha256-lW+xOELafAs29yw56FG4MzNOFkh8VHC/X/tRs1wsGn8=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "2f5e6e915d70c04d673a8930f94591595c73eb84",
"rev": "68ec961c51f48768f72d2bbdb396ce65a316677e",
"type": "github"
},
"original": {
@ -365,11 +365,11 @@
},
"nixos-stable": {
"locked": {
"lastModified": 1681154110,
"narHash": "sha256-OQwWzlzAY1dCqgSsgZzsPIOGmX4pBGaoXOy0rSl4b5Y=",
"lastModified": 1681482634,
"narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "115a96e2ac1e92937cd47c30e073e16dcaaf6247",
"rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad",
"type": "github"
},
"original": {
@ -380,11 +380,11 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1681217261,
"narHash": "sha256-RbxCHWN3Vhyv/WEsXcJlDwF7bpvZ9NxDjfSouQxXEKo=",
"lastModified": 1681557730,
"narHash": "sha256-j2E3639kS3Qop2jQPyqWCdenZNaqIdxfoTvAHnGuAGI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3fb8eedc450286d5092e4953118212fa21091b3b",
"rev": "85b081528b937df4bfcaee80c3541b58f397df8b",
"type": "github"
},
"original": {
@ -417,11 +417,11 @@
"nixpkgs-stable": []
},
"locked": {
"lastModified": 1681227715,
"narHash": "sha256-kQZOoTa177VF5uk1JK7bA9ZTU5g6d5IuDp/6YdxUWao=",
"lastModified": 1681413034,
"narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "c77e64a5adab96866ea97449a5a7a327d4629828",
"rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
"type": "github"
},
"original": {

View file

@ -24,6 +24,8 @@
in
lib.genAttrs machines makeSystem);
nixosModules.unstableNFTables = _: {
# Only until 23.05.
networking.nftables.checkRuleset = false;
disabledModules = [
"services/networking/firewall.nix"
"services/networking/nftables.nix"

View file

@ -45,6 +45,13 @@
haskellPackagesOverlay = final: prev:
lib.mapAttrs (_: package: package final) myHaskellPackages
// {
jsaddle-webkit2gtk =
appendPatch (unstable-pkgs.fetchpatch {
url = "https://github.com/ghcjs/jsaddle/commit/f990366f19d23a8008d482572d52351c1a6f7215.patch";
hash = "sha256-IbkJrlyG6q5rqMIhn//Dt3u6T314Pug+mQMwwe0LK5w=";
relative = "jsaddle-webkit2gtk";
})
prev.jsaddle-webkit2gtk;
streamly = final.streamly_0_9_0;
};
selectHaskellPackages = attrs: lib.mapAttrs (name: _: attrs.${name}) myHaskellPackages;