Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 88d5e1ed0823
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 869e137ded41
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 6, 2020

  1. patchelf: Fix homepage URL 

    Since this commit on nixos-homepage, the homepage was 404-ing:
NixOS/nixos-homepage@179733c
    @meithecatte
    meithecatte committed Apr 6, 2020
    Copy the full SHA
    2c40ba7 View commit details

  2. Merge pull request #84460 from NieDzejkob/patchelf-homepage 

    patchelf: Fix homepage URL
    @Ma27
    Ma27 authored Apr 6, 2020
    Copy the full SHA
    869e137 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 doc/stdenv/multiple-output.xml
  2. +1 −1 pkgs/development/tools/misc/patchelf/default.nix
  3. +1 −1 pkgs/development/tools/misc/patchelf/unstable.nix
2 changes: 1 addition & 1 deletion doc/stdenv/multiple-output.xml
View file
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@
</para>

<para>
The reason for why <literal>glibc</literal> deviates from the convention is because referencing a library provided by <literal>glibc</literal> is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of <literal>glibc</literal> libraries from Nix packages (please see the documentation on <link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more details).
The reason for why <literal>glibc</literal> deviates from the convention is because referencing a library provided by <literal>glibc</literal> is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of <literal>glibc</literal> libraries from Nix packages (please see the documentation on <link xlink:href="https://github.com/NixOS/patchelf/blob/master/README">patchelf</link> for more details).
</para>
</section>

2 changes: 1 addition & 1 deletion pkgs/development/tools/misc/patchelf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6

meta = with stdenv.lib; {
homepage = https://nixos.org/patchelf.html;
homepage = https://github.com/NixOS/patchelf/blob/master/README;
license = licenses.gpl3;
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
maintainers = [ maintainers.eelco ];
2 changes: 1 addition & 1 deletion pkgs/development/tools/misc/patchelf/unstable.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
doCheck = !stdenv.isDarwin;

meta = with stdenv.lib; {
homepage = https://nixos.org/patchelf.html;
homepage = https://github.com/NixOS/patchelf/blob/master/README;
license = licenses.gpl3;
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
maintainers = [ maintainers.eelco ];