diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/development/python-modules/rflink/default.nix | |
parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/rflink/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/rflink/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/rflink/default.nix b/nixpkgs/pkgs/development/python-modules/rflink/default.nix index 82374a8a0423..c33d44f628fb 100644 --- a/nixpkgs/pkgs/development/python-modules/rflink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rflink/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "rflink"; - version = "0.0.58"; + version = "0.0.62"; format = "setuptools"; src = fetchFromGitHub { owner = "aequitas"; repo = "python-rflink"; rev = version; - sha256 = "1zab55lsw419gg0jfrl69ap6128vbi3wdmg5z7qin65ijpjdhasc"; + sha256 = "sha256-dEzkYE8xtUzvdsnPaSiQR8960WLOEcr/QhwDiQlobcs="; }; propagatedBuildInputs = [ @@ -34,15 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Remove loop, https://github.com/aequitas/python-rflink/pull/61 - (fetchpatch { - name = "remove-loop.patch"; - url = "https://github.com/aequitas/python-rflink/commit/777e19b5bde3398df5b8f142896c34a01ae18d52.patch"; - sha256 = "sJmihxY3fNSfZVFhkvQ/+9gysQup/1jklKDMyDDLOs8="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "version=version_from_git()" "version='${version}'" |