privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

Merge pull request #111 from privatevoid-net/pr-flake-update

Browse source 
flake.lock: Update
This commit is contained in:
Max Headroom 2024-08-02 01:25:05 +02:00 committed by GitHub
commit 9f61cea276
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 54 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
flake.lock
View file

@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1718371084,
"narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
"lastModified": 1722339003,
"narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
"owner": "ryantm",
"repo": "agenix",
"rev": "3a56735779db467538fb2e577eda28a9daacaca6",
"rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
"type": "github"
},
"original": {
@ -40,11 +40,11 @@
]
},
"locked": {
"lastModified": 1717279440,
"narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",
"lastModified": 1722472866,
"narHash": "sha256-GJIz4M5HDB948Ex/8cPvbkrNzl/eKUE7/c21JBu4lb8=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "717cc95983cdc357bc347d70be20ced21f935843",
"rev": "e127acbf9a71ebc0c26bc8e28346822e0a6e16ba",
"type": "github"
},
"original": {
@ -113,19 +113,16 @@
},
"devshell": {
"inputs": {
"flake-utils": [
"repin-flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1717408969,
"narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
"lastModified": 1722113426,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide",
"repo": "devshell",
"rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github"
},
"original": {
@ -271,11 +268,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1719398431,
"narHash": "sha256-p6cC+0/c6GCBPtBkSnaOrhwLWl+uyoWYl/dReg+jcsk=",
"lastModified": 1720223941,
"narHash": "sha256-QDbU8LZzcUSqBp1CBqDj/f5Wd/sdgQ8pZwRWueoMUL4=",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"rev": "c37b2ada2dd001bc4be6771bcdea680b0b93fb94",
"rev": "2e10fb21fc2e07edf40763b73443e5934bd40947",
"type": "github"
},
"original": {
@ -336,11 +333,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1721065874,
"narHash": "sha256-WqIRfqqQwcSrJNPVRxbvCG6uZvKNuPruBL85VcnESRA=",
"lastModified": 1721084841,
"narHash": "sha256-zWajCfHFqPa3Z72DHcxBUq4bmcCu1lpEKUbZZewpYOE=",
"owner": "hyprspace",
"repo": "hyprspace",
"rev": "76a3f73a42c2f9bbeb4c56afa4b30a98a283b79f",
"rev": "b54fd70812b98994630cfa6aac17ad7c2be9b468",
"type": "github"
},
"original": {
@ -396,19 +393,17 @@
},
"nar-serve": {
"inputs": {
"flake-utils": [
"repin-flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
],
"systems": "systems_2"
},
"locked": {
"lastModified": 1716758395,
"narHash": "sha256-yM/ICgmMxUAk/feKojy/Jul8jh4OaVBhQoIChA6Vvq8=",
"lastModified": 1722409392,
"narHash": "sha256-8QuMS00EutmqzAIPxyJEPxM8EHiWlSKs6E2Htoh3Kes=",
"owner": "numtide",
"repo": "nar-serve",
"rev": "a1458804bb1ab9f1a44101e56a010ca95b8e8309",
"rev": "9d0eff868d328fe67c60c26c8ba50e0b9d8de867",
"type": "github"
},
"original": {
@ -461,11 +456,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1719254875,
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
"lastModified": 1719848872,
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"type": "github"
},
"original": {
@ -509,11 +504,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1720107418,
"narHash": "sha256-KPxjth7cCwNeTV9jJ90lPu8b/wMi3hcAnUbZ5NzogjA=",
"lastModified": 1722495206,
"narHash": "sha256-kJ/MgnoLxuVVnGcVrnZuzZ2eUasKhD7SJG/HI8ugWVQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d586b644539e41fafcee09f9b40a6552252dbdb4",
"rev": "43c433f2931b803dbe7853e0438ea0744ee48574",
"type": "github"
},
"original": {
@ -592,7 +587,7 @@
"nix-super": "nix-super",
"nixpkgs": "nixpkgs_4",
"repin-flake-utils": "repin-flake-utils",
"systems": "systems_2"
"systems": "systems_3"
}
},
"systems": {
@ -611,6 +606,21 @@
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1683988522,
"narHash": "sha256-cAVqq+Mjx4EiWovT7rwbwncX5QBnhNsqwsgyg+eeYrg=",

2
flake.nix
View file

@ -62,7 +62,6 @@
url = "github:numtide/nar-serve";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "repin-flake-utils";
};
};
@ -70,7 +69,6 @@
url = "github:numtide/devshell";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "repin-flake-utils";
};
};

12
patches/base/s3ql/remove-ssl-monkeypatch.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git a/tests/t0_http.py b/tests/t0_http.py
index 66ed564f..36bebab1 100755
--- a/tests/t0_http.py
+++ b/tests/t0_http.py
@@ -289,7 +289,6 @@ def do_GET(self):
# We don't *actually* want to establish SSL, that'd be
# to complex for our mock server
- monkeypatch.setattr('ssl.match_hostname', lambda x, y: True)
conn = HTTPConnection(
test_host,
test_port,