ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-31 00:24:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bump nixpkgs-21.11 and drop the special zfec handling

Browse Source 
the latest zfec release works fine without help
This commit is contained in:
Jean-Paul Calderone 2022-04-13 08:24:53 -04:00
parent d4afa15d20
commit 2e8c51ac4e
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
default.nix
View File

@ -86,24 +86,10 @@ mach-nix.buildPythonPackage rec {
# There are some reasonable defaults so we only need to specify certain # There are some reasonable defaults so we only need to specify certain
# packages where the default configuration runs into some issue. # packages where the default configuration runs into some issue.
providers = { providers = {
# Through zfec 1.5.5 the wheel has an incorrect runtime dependency
# declared on argparse, not available for recent versions of Python 3.
# Force mach-nix to use the sdist instead. This allows us to apply a
# patch that removes the offending declaration.
zfec = "sdist";
}; };
# Define certain overrides to the way Python dependencies are built. # Define certain overrides to the way Python dependencies are built.
_ = { _ = {
# Apply the argparse declaration fix to zfec sdist.
zfec.patches = with pkgs; [
(fetchpatch {
name = "fix-argparse.patch";
url = "https://github.com/tahoe-lafs/zfec/commit/c3e736a72cccf44b8e1fb7d6c276400204c6bc1e.patch";
sha256 = "1md9i2fx1ya7mgcj9j01z58hs3q9pj4ch5is5b5kq4v86cf6x33x";
})
];
# Remove a click-default-group patch for a test suite problem which no # Remove a click-default-group patch for a test suite problem which no
# longer applies because the project apparently no longer has a test suite # longer applies because the project apparently no longer has a test suite
# in its source distribution. # in its source distribution.

6
nix/sources.json
View File

@ -41,10 +41,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca", "rev": "838eefb4f93f2306d4614aafb9b2375f315d917f",
"sha256": "1yl5gj0mzczhl1j8sl8iqpwa1jzsgr12fdszw9rq13cdig2a2r5f", "sha256": "1bm8cmh1wx4h8b4fhbs75hjci3gcrpi7k1m1pmiy3nc0gjim9vkg",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/838eefb4f93f2306d4614aafb9b2375f315d917f.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"pypi-deps-db": { "pypi-deps-db": {