chore(nix): update flake.nix

This commit is contained in:
Sarah Vaupel 2023-03-31 16:37:14 +00:00
parent 6810cdc15f
commit fc73e7d43c
2 changed files with 30 additions and 51 deletions

View File

@ -325,22 +325,6 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
"owner": "numtide",
"ref": "main",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1679360468, "lastModified": 1679360468,
"narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=",
@ -356,7 +340,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1653893745, "lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
@ -371,7 +355,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -446,7 +430,7 @@
"cabal-36": "cabal-36", "cabal-36": "cabal-36",
"cardano-shell": "cardano-shell", "cardano-shell": "cardano-shell",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
"hackage": "hackage", "hackage": "hackage",
"hpc-coveralls": "hpc-coveralls", "hpc-coveralls": "hpc-coveralls",
@ -713,7 +697,7 @@
}, },
"nix2container": { "nix2container": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
@ -940,22 +924,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": {
"locked": {
"lastModified": 1624788075,
"narHash": "sha256-xzO2aL5gGejNvey2jKGnbnFXbo99pdytlY5FF/IhvAE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4ba70da807359ed01d662763a96c7b442762e5ef",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nosys": { "nosys": {
"locked": { "locked": {
"lastModified": 1667881534, "lastModified": 1667881534,
@ -998,12 +966,18 @@
"docker-nixpkgs": "docker-nixpkgs", "docker-nixpkgs": "docker-nixpkgs",
"encoding": "encoding", "encoding": "encoding",
"esqueleto": "esqueleto", "esqueleto": "esqueleto",
"flake-utils": "flake-utils", "flake-utils": [
"haskell-nix",
"flake-utils"
],
"haskell-nix": "haskell-nix", "haskell-nix": "haskell-nix",
"ldap-client": "ldap-client", "ldap-client": "ldap-client",
"memcached-binary": "memcached-binary", "memcached-binary": "memcached-binary",
"minio-hs": "minio-hs", "minio-hs": "minio-hs",
"nixpkgs": "nixpkgs_5", "nixpkgs": [
"haskell-nix",
"nixpkgs-unstable"
],
"serversession": "serversession", "serversession": "serversession",
"xss-sanitize": "xss-sanitize", "xss-sanitize": "xss-sanitize",
"yesod": "yesod", "yesod": "yesod",
@ -1054,7 +1028,7 @@
"blank": "blank", "blank": "blank",
"devshell": "devshell", "devshell": "devshell",
"dmerge": "dmerge", "dmerge": "dmerge",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"incl": "incl", "incl": "incl",
"makes": [ "makes": [
"haskell-nix", "haskell-nix",

View File

@ -7,22 +7,27 @@ rec {
haskell-nix = { haskell-nix = {
url = "github:input-output-hk/haskell.nix"; url = "github:input-output-hk/haskell.nix";
}; };
nixpkgs = {
type = "github"; # nixpkgs = {
owner = "NixOS"; # type = "github";
repo = "nixpkgs"; # owner = "NixOS";
ref = "master"; # repo = "nixpkgs";
}; # ref = "master";
# };
# flake-utils = {
# type = "github";
# owner = "numtide";
# repo = "flake-utils";
# ref = "main";
# };
nixpkgs.follows = "haskell-nix/nixpkgs-unstable";
flake-utils.follows = "haskell-nix/flake-utils";
docker-nixpkgs = { docker-nixpkgs = {
url = "github:nix-community/docker-nixpkgs"; url = "github:nix-community/docker-nixpkgs";
flake = false; flake = false;
}; };
flake-utils = {
type = "github";
owner = "numtide";
repo = "flake-utils";
ref = "main";
};
encoding = { encoding = {
url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git?ref=uni2work";