diff --git a/flake.lock b/flake.lock index 427561469..02f2d47d3 100644 --- a/flake.lock +++ b/flake.lock @@ -25,22 +25,22 @@ "rev": "40393c938111ac78232dc2c7eec5edb4a22d03e8", "revCount": 62, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git" + "url": "https://gitlab.uniworx.de/haskell/HaskellNet-SSL.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git" + "url": "https://gitlab.uniworx.de/haskell/HaskellNet-SSL.git" } }, "cabal-32": { "flake": false, "locked": { "lastModified": 1603716527, - "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=", + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", "owner": "haskell", "repo": "cabal", - "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", "type": "github" }, "original": { @@ -53,11 +53,11 @@ "cabal-34": { "flake": false, "locked": { - "lastModified": 1622475795, - "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=", + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", "owner": "haskell", "repo": "cabal", - "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", "type": "github" }, "original": { @@ -67,6 +67,23 @@ "type": "github" } }, + "cabal-36": { + "flake": false, + "locked": { + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", + "owner": "haskell", + "repo": "cabal", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, "cardano-shell": { "flake": false, "locked": { @@ -92,12 +109,12 @@ "rev": "f8170266ab25b533576e96715bedffc5aa4f19fa", "revCount": 153, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git" + "url": "https://gitlab.uniworx.de/haskell/colonnade.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git" + "url": "https://gitlab.uniworx.de/haskell/colonnade.git" } }, "conduit-resumablesink": { @@ -109,12 +126,12 @@ "rev": "cbea6159c2975d42f948525e03e12fc390da53c5", "revCount": 10, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git" + "url": "https://gitlab.uniworx.de/haskell/conduit-resumablesink.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git" + "url": "https://gitlab.uniworx.de/haskell/conduit-resumablesink.git" } }, "cryptoids": { @@ -126,12 +143,12 @@ "rev": "130b0dcbf2b09ccdf387b50262f1efbbbf1819e3", "revCount": 44, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git" + "url": "https://gitlab.uniworx.de/haskell/cryptoids.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git" + "url": "https://gitlab.uniworx.de/haskell/cryptoids.git" } }, "cryptonite": { @@ -143,12 +160,12 @@ "rev": "71a630edaf5f22c464e24fac8d9d310f4055ea1f", "revCount": 1202, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git" + "url": "https://gitlab.uniworx.de/haskell/cryptonite.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git" + "url": "https://gitlab.uniworx.de/haskell/cryptonite.git" } }, "encoding": { @@ -160,12 +177,12 @@ "rev": "22fc3bb14841d8d50997aa47f1be3852e666f787", "revCount": 162, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git" + "url": "https://gitlab.uniworx.de/haskell/encoding.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git" + "url": "https://gitlab.uniworx.de/haskell/encoding.git" } }, "esqueleto": { @@ -177,12 +194,29 @@ "rev": "e18dd125c5ea26fa4e88bed079b61d8c1365ee37", "revCount": 708, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git" + "url": "https://gitlab.uniworx.de/haskell/esqueleto.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git" + "url": "https://gitlab.uniworx.de/haskell/esqueleto.git" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", + "repo": "flake-compat", + "type": "github" } }, "flake-utils": { @@ -190,11 +224,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -204,21 +238,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1623875721, - "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "ghc-8.6.5-iohk": { "flake": false, "locked": { @@ -236,14 +255,51 @@ "type": "github" } }, + "ghc98X": { + "flake": false, + "locked": { + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", + "ref": "ghc-9.8", + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "ref": "ghc-9.8", + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, + "ghc99": { + "flake": false, + "locked": { + "lastModified": 1701580282, + "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", + "ref": "refs/heads/master", + "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", + "revCount": 62197, + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://gitlab.haskell.org/ghc/ghc" + } + }, "hackage": { "flake": false, "locked": { - "lastModified": 1629940355, - "narHash": "sha256-o9/U8R/JtyHIcxhMLaWYP+D/52B6LH/ikCyNZ7+mymI=", + "lastModified": 1704587119, + "narHash": "sha256-TRFglZ7pCUUA/8nOuBSgl00/ZRCHEyjlChM7BKtOW7o=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "429deb2a137084c011310bad92f4cecf244f2fc2", + "rev": "ecd98fbd5469a20b4676d12a16cf0ddfb985839b", "type": "github" }, "original": { @@ -257,26 +313,42 @@ "HTTP": "HTTP", "cabal-32": "cabal-32", "cabal-34": "cabal-34", + "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", + "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", - "nix-tools": "nix-tools", - "nixpkgs": "nixpkgs", + "hydra": "hydra", + "iserv-proxy": "iserv-proxy", + "nixpkgs": [ + "haskell-nix", + "nixpkgs-unstable" + ], "nixpkgs-2003": "nixpkgs-2003", - "nixpkgs-2009": "nixpkgs-2009", "nixpkgs-2105": "nixpkgs-2105", + "nixpkgs-2111": "nixpkgs-2111", + "nixpkgs-2205": "nixpkgs-2205", + "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", "stackage": "stackage" }, "locked": { - "lastModified": 1629940530, - "narHash": "sha256-cf/bshYWloj+rJSmOcFokN6Rs1lpFkiECKpykN3JBH8=", + "lastModified": 1704588627, + "narHash": "sha256-r2PBVhwymJcsILZ7bjPu5s7gZei4TWB3oQ18j/XEU3Q=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "5fcd4faf98fc8ca8287e2c7bc1fff71dfd340f1f", + "rev": "a7c10d298ecb807ec403f717cb4b095af01f8137", "type": "github" }, "original": { @@ -285,6 +357,91 @@ "type": "github" } }, + "hls-1.10": { + "flake": false, + "locked": { + "lastModified": 1680000865, + "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "1.10.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.0": { + "flake": false, + "locked": { + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.2": { + "flake": false, + "locked": { + "lastModified": 1693064058, + "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.2.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.3": { + "flake": false, + "locked": { + "lastModified": 1695910642, + "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.3.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1699862708, + "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -301,6 +458,46 @@ "type": "github" } }, + "hydra": { + "inputs": { + "nix": "nix", + "nixpkgs": [ + "haskell-nix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "iserv-proxy": { + "flake": false, + "locked": { + "lastModified": 1691634696, + "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", + "ref": "hkm/remote-iserv", + "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", + "revCount": 14, + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + }, + "original": { + "ref": "hkm/remote-iserv", + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + } + }, "ldap-client": { "flake": false, "locked": { @@ -310,12 +507,28 @@ "rev": "01afaf599ba6f8a9d804c269e91d3190b249d3f0", "revCount": 61, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git" + "url": "https://gitlab.uniworx.de/haskell/ldap-client.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git" + "url": "https://gitlab.uniworx.de/haskell/ldap-client.git" + } + }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" } }, "memcached-binary": { @@ -327,12 +540,12 @@ "rev": "b7071df50bad3a251a544b984e4bf98fa09b8fae", "revCount": 28, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git" + "url": "https://gitlab.uniworx.de/haskell/memcached-binary.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git" + "url": "https://gitlab.uniworx.de/haskell/memcached-binary.git" } }, "minio-hs": { @@ -344,42 +557,47 @@ "rev": "42103ab247057c04c8ce7a83d9d4c160713a3df1", "revCount": 197, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git" + "url": "https://gitlab.uniworx.de/haskell/minio-hs.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git" + "url": "https://gitlab.uniworx.de/haskell/minio-hs.git" } }, - "nix-tools": { - "flake": false, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs", + "nixpkgs-regression": "nixpkgs-regression" + }, "locked": { - "lastModified": 1626997434, - "narHash": "sha256-1judQmP298ao6cGUNxcGhcAXHOnA9qSLvWk/ZtoUL7w=", - "owner": "input-output-hk", - "repo": "nix-tools", - "rev": "c8c5e6a6fbb12a73598d1a434984a36e880ce3cf", + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "owner": "NixOS", + "repo": "nix", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", "type": "github" }, "original": { - "owner": "input-output-hk", - "repo": "nix-tools", + "owner": "NixOS", + "ref": "2.11.0", + "repo": "nix", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1624291665, - "narHash": "sha256-kNkaoa3dai9WOi7fsPklCCWZ8hRAkXx0ZUhpYKShyUk=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-20.09-darwin", + "ref": "nixos-22.05-small", "repo": "nixpkgs", "type": "github" } @@ -400,29 +618,13 @@ "type": "github" } }, - "nixpkgs-2009": { - "locked": { - "lastModified": 1624271064, - "narHash": "sha256-qns/uRW7MR2EfVf6VEeLgCsCp7pIOjDeR44JzTF09MA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "46d1c3f28ca991601a53e9a14fdd53fcd3dd8416", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.09-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-2105": { "locked": { - "lastModified": 1624291665, - "narHash": "sha256-kNkaoa3dai9WOi7fsPklCCWZ8hRAkXx0ZUhpYKShyUk=", + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c6f3f84af60a8ed5b8a79cf3026b7630fcdefb8", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", "type": "github" }, "original": { @@ -432,7 +634,119 @@ "type": "github" } }, - "nixpkgs-recent": { + "nixpkgs-2111": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2205": { + "locked": { + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2211": { + "locked": { + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-22.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2305": { + "locked": { + "lastModified": 1701362232, + "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d2332963662edffacfddfad59ff4f709dde80ffe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2311": { + "locked": { + "lastModified": 1701386440, + "narHash": "sha256-xI0uQ9E7JbmEy/v8kR9ZQan6389rHug+zOtZeZFiDJk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "293822e55ec1872f715a66d0eda9e592dc14419f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1694822471, + "narHash": "sha256-6fSDCj++lZVMZlyqOe9SIOL8tYSBz1bI8acwovRwoX8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47585496bcb13fb72e4a90daeea2f434e2501998", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1669833724, "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=", @@ -448,51 +762,19 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1628785280, - "narHash": "sha256-2B5eMrEr6O8ff2aQNeVxTB+9WrGE80OB4+oM6T7fOcc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6525bbc06a39f26750ad8ee0d40000ddfdc24acb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1622516815, - "narHash": "sha256-ZjBd81a6J3TwtlBr3rHsZspYUwT9OdhDk+a/SgSEf7I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7e9b0dff974c89e070da1ad85713ff3c20b0ca97", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "21.05", - "repo": "nixpkgs", - "type": "github" - } - }, "old-ghc-nix": { "flake": false, "locked": { - "lastModified": 1621819714, - "narHash": "sha256-EJCnYQSWk7FRLwS0lZgTWIiQ6pcvDX1VuD6LGD4Uwzs=", + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", "owner": "angerman", "repo": "old-ghc-nix", - "rev": "f089a6f090cdb35fcf95f865fc6a31ba6b3ac4eb", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", "type": "github" }, "original": { "owner": "angerman", - "ref": "master2", + "ref": "master", "repo": "old-ghc-nix", "type": "github" } @@ -512,7 +794,6 @@ "memcached-binary": "memcached-binary", "minio-hs": "minio-hs", "nixpkgs": "nixpkgs_2", - "nixpkgs-recent": "nixpkgs-recent", "serversession": "serversession", "xss-sanitize": "xss-sanitize", "yesod": "yesod", @@ -528,22 +809,22 @@ "rev": "b9d76def10da1260c7f6aa82bda32111f37a952b", "revCount": 174, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git" + "url": "https://gitlab.uniworx.de/haskell/serversession.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git" + "url": "https://gitlab.uniworx.de/haskell/serversession.git" } }, "stackage": { "flake": false, "locked": { - "lastModified": 1629940472, - "narHash": "sha256-LFrNC25OpNoS6dGG5om+UGP8YdYjp01Qm6cenbemaVg=", + "lastModified": 1704586233, + "narHash": "sha256-fPoR/v1FWkc8KwXkTHp0uCV4sKy4WWgzLGnvEviOl7Y=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "c50dd0527babf85818cc67a7099e532e453752db", + "rev": "5858fedb06d93d88a20c68ca882b6dcb9e72a65d", "type": "github" }, "original": { @@ -576,12 +857,12 @@ "rev": "dc928c3a456074b8777603bea20e81937321777f", "revCount": 114, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git" + "url": "https://gitlab.uniworx.de/haskell/xss-sanitize.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git" + "url": "https://gitlab.uniworx.de/haskell/xss-sanitize.git" } }, "yesod": { @@ -593,12 +874,12 @@ "rev": "a59f63e0336ee61f7a90b8778e9147305d3127bb", "revCount": 5053, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git" + "url": "https://gitlab.uniworx.de/haskell/yesod.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git" + "url": "https://gitlab.uniworx.de/haskell/yesod.git" } }, "zip-stream": { @@ -610,12 +891,12 @@ "rev": "843683d024f767de236f74d24a3348f69181a720", "revCount": 39, "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git" + "url": "https://gitlab.uniworx.de/haskell/zip-stream.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git" + "url": "https://gitlab.uniworx.de/haskell/zip-stream.git" } } }, diff --git a/flake.nix b/flake.nix index 70f4146ef..e0f481cab 100644 --- a/flake.nix +++ b/flake.nix @@ -12,14 +12,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - # ref = "6525bbc06a39f26750ad8ee0d40000ddfdc24acb"; - ref = "21.05"; - }; - nixpkgs-recent = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - ref = "22.11"; + ref = "22.11"; # TODO deprecated, update ref }; flake-utils = { type = "github"; @@ -86,7 +79,7 @@ }; }; - outputs = inputs@{ self, nixpkgs, nixpkgs-recent, flake-utils, haskell-nix, ... }: flake-utils.lib.eachSystem ["x86_64-linux"] + outputs = inputs@{ self, nixpkgs, flake-utils, haskell-nix, ... }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: let frontendSource = pkgs.lib.sourceByRegex ./. [ "^(assets|frontend)(/.*)?$" @@ -112,17 +105,17 @@ overlays = [ (final: prev: let - pkgs-recent = import nixpkgs-recent { inherit system; }; + pkgs = import nixpkgs { inherit system; }; in { - inherit (pkgs-recent) dockerTools node2nix glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs-recent.stdenv) fetchurlBoot; + inherit (pkgs) dockerTools node2nix glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot; stack = pkgs.symlinkJoin { - inherit (pkgs-recent.stack) name; - paths = [pkgs-recent.stack]; - nativeBuildInputs = [pkgs-recent.makeWrapper]; + inherit (pkgs.stack) name; + paths = [pkgs.stack]; + nativeBuildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/stack \ - --prefix PATH : "${prev.lib.makeBinPath [pkgs-recent.nix]}" \ + --prefix PATH : "${prev.lib.makeBinPath [pkgs.nix]}" \ --add-flags "\ --nix \ --no-nix-pure \