From 15bbf3e8a70f657f2264185746e4a511f2c11c12 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Oct 2022 21:48:12 +0200 Subject: [PATCH] chore: fix flake --- flake.lock | 82 +++++++++++++++++++++--------------------------------- flake.nix | 28 +++++++++---------- 2 files changed, 46 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index ed9736994..dedb5ba85 100644 --- a/flake.lock +++ b/flake.lock @@ -25,12 +25,12 @@ "rev": "40393c938111ac78232dc2c7eec5edb4a22d03e8", "revCount": 62, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/HaskellNet-SSL.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/HaskellNet-SSL.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git" } }, "cabal-32": { @@ -92,12 +92,12 @@ "rev": "f8170266ab25b533576e96715bedffc5aa4f19fa", "revCount": 153, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/colonnade.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/colonnade.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git" } }, "conduit-resumablesink": { @@ -109,12 +109,12 @@ "rev": "cbea6159c2975d42f948525e03e12fc390da53c5", "revCount": 10, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/conduit-resumablesink.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/conduit-resumablesink.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git" } }, "cryptoids": { @@ -126,12 +126,12 @@ "rev": "130b0dcbf2b09ccdf387b50262f1efbbbf1819e3", "revCount": 44, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/cryptoids.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/cryptoids.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git" } }, "cryptonite": { @@ -143,12 +143,12 @@ "rev": "71a630edaf5f22c464e24fac8d9d310f4055ea1f", "revCount": 1202, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/cryptonite.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/cryptonite.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git" } }, "docker-nixpkgs": { @@ -176,29 +176,29 @@ "rev": "22fc3bb14841d8d50997aa47f1be3852e666f787", "revCount": 162, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/encoding.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/encoding.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git" } }, "esqueleto": { "flake": false, "locked": { - "lastModified": 1625584503, - "narHash": "sha256-kgNcNKODv4xkmS6+MKDAVDpbL/IQ5Imucst0uV4HzYU=", + "lastModified": 1648739688, + "narHash": "sha256-rtKhMti9GNq0i7ngTLuNXIyr3zSUTh3G8anXPrKirTk=", "ref": "uni2work", - "rev": "b9987d94af9d7403eded8ca75ad761eb7fc06e4c", - "revCount": 697, + "rev": "e18dd125c5ea26fa4e88bed079b61d8c1365ee37", + "revCount": 708, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/esqueleto.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/esqueleto.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git" } }, "flake-utils": { @@ -319,12 +319,12 @@ "rev": "01afaf599ba6f8a9d804c269e91d3190b249d3f0", "revCount": 61, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/ldap-client.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/ldap-client.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git" } }, "memcached-binary": { @@ -336,12 +336,12 @@ "rev": "b7071df50bad3a251a544b984e4bf98fa09b8fae", "revCount": 28, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/memcached-binary.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/memcached-binary.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git" } }, "minio-hs": { @@ -353,12 +353,12 @@ "rev": "42103ab247057c04c8ce7a83d9d4c160713a3df1", "revCount": 197, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/minio-hs.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/minio-hs.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git" } }, "nix-tools": { @@ -498,7 +498,6 @@ "nixpkgs-unstable" ], "serversession": "serversession", - "tail-DateTime": "tail-DateTime", "xss-sanitize": "xss-sanitize", "yesod": "yesod", "zip-stream": "zip-stream" @@ -513,12 +512,12 @@ "rev": "b9d76def10da1260c7f6aa82bda32111f37a952b", "revCount": 174, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/serversession.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/serversession.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git" } }, "stackage": { @@ -537,23 +536,6 @@ "type": "github" } }, - "tail-DateTime": { - "flake": false, - "locked": { - "lastModified": 1576249828, - "narHash": "sha256-90okKfi5Nf5xw+IFsPXzdykdboLMbOYHmUVyNZS65Go=", - "ref": "uni2work", - "rev": "ef1237569ff22667acb64a9dfd64682ee55817eb", - "revCount": 132, - "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/tail.DateTime.git" - }, - "original": { - "ref": "uni2work", - "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/tail.DateTime.git" - } - }, "xss-sanitize": { "flake": false, "locked": { @@ -563,12 +545,12 @@ "rev": "dc928c3a456074b8777603bea20e81937321777f", "revCount": 114, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/xss-sanitize.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/xss-sanitize.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git" } }, "yesod": { @@ -580,12 +562,12 @@ "rev": "a59f63e0336ee61f7a90b8778e9147305d3127bb", "revCount": 5053, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/yesod.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/yesod.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git" } }, "zip-stream": { @@ -597,12 +579,12 @@ "rev": "843683d024f767de236f74d24a3348f69181a720", "revCount": 39, "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/zip-stream.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git" }, "original": { "ref": "uni2work", "type": "git", - "url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/zip-stream.git" + "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git" } } }, diff --git a/flake.nix b/flake.nix index 7e448666d..e8c0da651 100644 --- a/flake.nix +++ b/flake.nix @@ -13,59 +13,59 @@ }; inputs.encoding = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/encoding?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git?ref=uni2work"; flake = false; }; inputs.memcached-binary = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git?ref=uni2work"; flake = false; }; inputs.conduit-resumablesink = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git?ref=uni2work"; flake = false; }; inputs.HaskellNet-SSL = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git?ref=uni2work"; flake = false; }; inputs.ldap-client = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git?ref=uni2work"; flake = false; }; inputs.serversession = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/serversession?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git?ref=uni2work"; flake = false; }; inputs.xss-sanitize = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git?ref=uni2work"; flake = false; }; inputs.colonnade = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git?ref=uni2work"; flake = false; }; inputs.minio-hs = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git?ref=uni2work"; flake = false; }; inputs.cryptoids = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git?ref=uni2work"; flake = false; }; inputs.zip-stream = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git?ref=uni2work"; flake = false; }; inputs.yesod = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/yesod?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git?ref=uni2work"; flake = false; }; inputs.cryptonite = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git?ref=uni2work"; flake = false; }; inputs.esqueleto = { - url = "https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto?ref=uni2work"; + url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git?ref=uni2work"; flake = false; };