diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/development/tools/misc/patchelf | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/patchelf')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/patchelf/default.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix index a0c002d8a8c5..c1e283ece129 100644 --- a/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "0.12"; + version = "0.13"; src = fetchurl { url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "14npmdxppmh0ci140w8i8cy7zg1pnqg81a1mdsnza711ab7k36k9"; + sha256 = "1v8px6g0zvhfxqa1inmdqfj4gc8dm70x7874hri4s48szjyd8zjc"; }; setupHook = [ ./setup-hook.sh ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.name == "stdenv-linux"; meta = with lib; { - homepage = "https://github.com/NixOS/patchelf/blob/master/README"; + homepage = "https://github.com/NixOS/patchelf"; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix index 1d790740e697..dd7f4ac881b4 100644 --- a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with lib; { - homepage = "https://github.com/NixOS/patchelf/blob/master/README"; + homepage = "https://github.com/NixOS/patchelf"; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; |