fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.ifi.lmu.de:fradrive/fradrive

Browse Source
This commit is contained in:
Steffen Jost 2022-10-27 17:45:24 +02:00
commit 0054544d1d
10 changed files with 92 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.gitlab-ci/construct-flake-url.sh Normal file → Executable file
View File

0
.gitlab-ci/make-minio-bucket.sh Normal file → Executable file
View File

0
.gitlab-ci/upload-to-cache.sh Normal file → Executable file
View File

0
.gitlab-ci/write-minio-creds.sh Normal file → Executable file
View File

9
.pre-commit-config.yaml Normal file
View File

@ -0,0 +1,9 @@
# SPDX-FileCopyrightText: 2022 Sarah Vaupel <sarah.vaupel@ifi.lmu.de>
#
# SPDX-License-Identifier: AGPL-3.0-or-later
repos:
- repo: https://github.com/fsfe/reuse-tool
rev: v1.0.0
hooks:
- id: reuse

33
CONTRIBUTING Normal file
View File

@ -0,0 +1,33 @@
Version 1.1
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

3
CONTRIBUTING.license Normal file
View File

@ -0,0 +1,3 @@
# SPDX-FileCopyrightText: Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
#
# SPDX-License-Identifier: AGPL-3.0-or-later

82
flake.lock
View File

@ -25,12 +25,12 @@
"rev": "40393c938111ac78232dc2c7eec5edb4a22d03e8", "rev": "40393c938111ac78232dc2c7eec5edb4a22d03e8",
"revCount": 62, "revCount": 62,
"type": "git", "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": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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": { "cabal-32": {
@ -92,12 +92,12 @@
"rev": "f8170266ab25b533576e96715bedffc5aa4f19fa", "rev": "f8170266ab25b533576e96715bedffc5aa4f19fa",
"revCount": 153, "revCount": 153,
"type": "git", "type": "git",
"url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/colonnade.git" "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git"
}, },
"original": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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": { "conduit-resumablesink": {
@ -109,12 +109,12 @@
"rev": "cbea6159c2975d42f948525e03e12fc390da53c5", "rev": "cbea6159c2975d42f948525e03e12fc390da53c5",
"revCount": 10, "revCount": 10,
"type": "git", "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": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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": { "cryptoids": {
@ -126,12 +126,12 @@
"rev": "130b0dcbf2b09ccdf387b50262f1efbbbf1819e3", "rev": "130b0dcbf2b09ccdf387b50262f1efbbbf1819e3",
"revCount": 44, "revCount": 44,
"type": "git", "type": "git",
"url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/cryptoids.git" "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git"
}, },
"original": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "type": "git",
"url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/cryptoids.git" "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git"
} }
}, },
"cryptonite": { "cryptonite": {
@ -143,12 +143,12 @@
"rev": "71a630edaf5f22c464e24fac8d9d310f4055ea1f", "rev": "71a630edaf5f22c464e24fac8d9d310f4055ea1f",
"revCount": 1202, "revCount": 1202,
"type": "git", "type": "git",
"url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/cryptonite.git" "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git"
}, },
"original": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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": { "docker-nixpkgs": {
@ -176,29 +176,29 @@
"rev": "22fc3bb14841d8d50997aa47f1be3852e666f787", "rev": "22fc3bb14841d8d50997aa47f1be3852e666f787",
"revCount": 162, "revCount": 162,
"type": "git", "type": "git",
"url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/encoding.git" "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git"
}, },
"original": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "type": "git",
"url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/encoding.git" "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git"
} }
}, },
"esqueleto": { "esqueleto": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1625584503, "lastModified": 1648739688,
"narHash": "sha256-kgNcNKODv4xkmS6+MKDAVDpbL/IQ5Imucst0uV4HzYU=", "narHash": "sha256-rtKhMti9GNq0i7ngTLuNXIyr3zSUTh3G8anXPrKirTk=",
"ref": "uni2work", "ref": "uni2work",
"rev": "b9987d94af9d7403eded8ca75ad761eb7fc06e4c", "rev": "e18dd125c5ea26fa4e88bed079b61d8c1365ee37",
"revCount": 697, "revCount": 708,
"type": "git", "type": "git",
"url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/esqueleto.git" "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git"
}, },
"original": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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": { "flake-utils": {
@ -319,12 +319,12 @@
"rev": "01afaf599ba6f8a9d804c269e91d3190b249d3f0", "rev": "01afaf599ba6f8a9d804c269e91d3190b249d3f0",
"revCount": 61, "revCount": 61,
"type": "git", "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": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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": { "memcached-binary": {
@ -336,12 +336,12 @@
"rev": "b7071df50bad3a251a544b984e4bf98fa09b8fae", "rev": "b7071df50bad3a251a544b984e4bf98fa09b8fae",
"revCount": 28, "revCount": 28,
"type": "git", "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": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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": { "minio-hs": {
@ -353,12 +353,12 @@
"rev": "42103ab247057c04c8ce7a83d9d4c160713a3df1", "rev": "42103ab247057c04c8ce7a83d9d4c160713a3df1",
"revCount": 197, "revCount": 197,
"type": "git", "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": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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": { "nix-tools": {
@ -498,7 +498,6 @@
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
"serversession": "serversession", "serversession": "serversession",
"tail-DateTime": "tail-DateTime",
"xss-sanitize": "xss-sanitize", "xss-sanitize": "xss-sanitize",
"yesod": "yesod", "yesod": "yesod",
"zip-stream": "zip-stream" "zip-stream": "zip-stream"
@ -513,12 +512,12 @@
"rev": "b9d76def10da1260c7f6aa82bda32111f37a952b", "rev": "b9d76def10da1260c7f6aa82bda32111f37a952b",
"revCount": 174, "revCount": 174,
"type": "git", "type": "git",
"url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/serversession.git" "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git"
}, },
"original": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "type": "git",
"url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/serversession.git" "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git"
} }
}, },
"stackage": { "stackage": {
@ -537,23 +536,6 @@
"type": "github" "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": { "xss-sanitize": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -563,12 +545,12 @@
"rev": "dc928c3a456074b8777603bea20e81937321777f", "rev": "dc928c3a456074b8777603bea20e81937321777f",
"revCount": 114, "revCount": 114,
"type": "git", "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": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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": { "yesod": {
@ -580,12 +562,12 @@
"rev": "a59f63e0336ee61f7a90b8778e9147305d3127bb", "rev": "a59f63e0336ee61f7a90b8778e9147305d3127bb",
"revCount": 5053, "revCount": 5053,
"type": "git", "type": "git",
"url": "ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/yesod.git" "url": "https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git"
}, },
"original": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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": { "zip-stream": {
@ -597,12 +579,12 @@
"rev": "843683d024f767de236f74d24a3348f69181a720", "rev": "843683d024f767de236f74d24a3348f69181a720",
"revCount": 39, "revCount": 39,
"type": "git", "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": { "original": {
"ref": "uni2work", "ref": "uni2work",
"type": "git", "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"
} }
} }
}, },

32
flake.nix
View File

@ -13,66 +13,62 @@
}; };
inputs.encoding = { inputs.encoding = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/encoding.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/encoding.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.memcached-binary = { inputs.memcached-binary = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/memcached-binary.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/memcached-binary.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.conduit-resumablesink = { inputs.conduit-resumablesink = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/conduit-resumablesink.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/conduit-resumablesink.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.HaskellNet-SSL = { inputs.HaskellNet-SSL = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/HaskellNet-SSL.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/HaskellNet-SSL.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.ldap-client = { inputs.ldap-client = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/ldap-client.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/ldap-client.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.serversession = { inputs.serversession = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/serversession.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/serversession.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.xss-sanitize = { inputs.xss-sanitize = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/xss-sanitize.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/xss-sanitize.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.colonnade = { inputs.colonnade = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/colonnade.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/colonnade.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.minio-hs = { inputs.minio-hs = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/minio-hs.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/minio-hs.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.cryptoids = { inputs.cryptoids = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/cryptoids.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/cryptoids.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.zip-stream = { inputs.zip-stream = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/zip-stream.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/zip-stream.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.yesod = { inputs.yesod = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/yesod.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/yesod.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.cryptonite = { inputs.cryptonite = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/cryptonite.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/cryptonite.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.esqueleto = { inputs.esqueleto = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/esqueleto.git?ref=uni2work"; url = "git+https://gitlab.ifi.lmu.de/uni2work/haskell/esqueleto.git?ref=uni2work";
flake = false; flake = false;
}; };
inputs.tail-DateTime = {
url = "git+ssh://git@gitlab2.rz.ifi.lmu.de/uni2work/tail.DateTime.git?ref=uni2work";
flake = false;
};
inputs.fontawesome-token = { inputs.fontawesome-token = {
url = "path:/etc/fontawesome-token"; url = "path:/etc/fontawesome-token";
flake = false; flake = false;

2
shell.nix
View File

@ -77,7 +77,7 @@ in pkgs.mkShell {
nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] nativeBuildInputs = [develop inDevelop killallUni2work diffRunning]
++ (with pkgs; ++ (with pkgs;
[ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client [ nodejs-14_x postgresql_12 openldap google-chrome exiftool memcached minio minio-client
gup skopeo gup skopeo reuse pre-commit
# busybox # for print services, but interferes with build commands in develop-shell # busybox # for print services, but interferes with build commands in develop-shell
htop htop
pdftk #pdftk just for testing pdf-passwords pdftk #pdftk just for testing pdf-passwords