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: 5d2cb158f390
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 401e07d41981
Choose a head ref
  • 3 commits
  • 6 files changed
  • 2 contributors

Commits on Apr 7, 2020

  1. treewide: Fix up stripDebugList attrs to be lists. 

    The documentation says this should be a list, and it already is in
about half the expressions that set it.

The difference doesn't matter at present, because these values are all
space-free literals.  But it will in a future with __structuredAttrs .

(The similar attr stripAllList has no users in the nixpkgs tree, so
there's nothing to do to fix any of those up.)
    @gnprice
    gnprice committed Apr 7, 2020
    Copy the full SHA
    7547cf9 View commit details

  2. doc/stdenv: Update default for stripDebugList. 

    This has changed a few times from 2008 to 2012: cdc74e1, d9213df,
and 095db9f.
    @gnprice
    gnprice committed Apr 7, 2020
    Copy the full SHA
    53d61f9 View commit details

Commits on Apr 14, 2020

  1. Merge pull request #84551 from gnprice/pr-stripDebugList 

    treewide: Fix types of stripDebugList attrs (and fix doc)
    @Ma27
    Ma27 authored Apr 14, 2020
    Copy the full SHA
    401e07d View commit details
2 changes: 1 addition & 1 deletion doc/stdenv/stdenv.xml
View file
Original file line number Diff line number Diff line change
@@ -1295,7 +1295,7 @@ installTargets = "install-bin install-doc";</programlisting>
</term>
<listitem>
<para>
List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to <literal>lib bin sbin</literal>.
List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to <literal>lib lib32 lib64 libexec bin sbin</literal>.
</para>
</listitem>
</varlistentry>
2 changes: 1 addition & 1 deletion pkgs/applications/misc/far2l/default.nix
View file
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/far2l --argv0 $out/bin/far2l
'';

stripDebugList = "bin share";
stripDebugList = [ "bin" "share" ];

enableParallelBuilding = true;

2 changes: 1 addition & 1 deletion pkgs/development/libraries/ldb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
"--without-ldb-lmdb"
];

stripDebugList = "bin lib modules";
stripDebugList = [ "bin" "lib" "modules" ];

meta = with stdenv.lib; {
description = "A LDAP-like embedded database";
2 changes: 1 addition & 1 deletion pkgs/development/misc/avr/libc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ automake autoconf ];

# Make sure we don't strip the libraries in lib/gcc/avr.
stripDebugList = "bin";
stripDebugList = [ "bin" ];
dontPatchELF = true;

passthru = {
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/syslinux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
enableParallelBuilding = false; # Fails very rarely with 'No rule to make target: ...'
hardeningDisable = [ "pic" "stackprotector" "fortify" ];

stripDebugList = "bin sbin share/syslinux/com32";
stripDebugList = [ "bin" "sbin" "share/syslinux/com32" ];

makeFlags = [
"BINDIR=$(out)/bin"
2 changes: 1 addition & 1 deletion pkgs/servers/http/apache-httpd/2.4.nix
View file
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

stripDebugList = "lib modules bin";
stripDebugList = [ "lib" "modules" "bin" ];

postInstall = ''
mkdir -p $doc/share/doc/httpd