Unverified Commit 295d1439 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

Revert "treewide: passthru outputBin as `bin`" (#418419)

parents 9bc7d52a 90fce842

pkgs/by-name/ap/aprutil/package.nix

+3 −4
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ assert sslSupport -> openssl != null; 
assert bdbSupport -> db != null;

assert ldapSupport -> openldap != null;



stdenv.mkDerivation (finalAttrs: {

stdenv.mkDerivation rec {

  pname = "apr-util";

  version = "1.6.3";



  src = fetchurl {

    url = "mirror://apache/apr/apr-util-${finalAttrs.version}.tar.bz2";

    url = "mirror://apache/apr/${pname}-${version}.tar.bz2";

    sha256 = "sha256-pBB243EHRjJsOUUEKZStmk/KwM4Cd92P6gdv7DyXcrU=";

  };
@@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { 
    "dev"

  ];

  outputBin = "dev";

  passthru.bin = finalAttrs.finalPackage.${finalAttrs.outputBin}; # fixes lib.getExe



  nativeBuildInputs = [

    makeWrapper
@@ -122,4 +121,4 @@ stdenv.mkDerivation (finalAttrs: { 
    platforms = platforms.unix;

    license = licenses.asl20;

  };

})
 
}

pkgs/by-name/ca/cairo/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ stdenv.mkDerivation ( 
      "devdoc"

    ];

    outputBin = "dev"; # very small

    passthru.bin = finalAttrs.finalPackage.${finalAttrs.outputBin}; # fixes lib.getExe

    separateDebugInfo = true;



    nativeBuildInputs = [

pkgs/by-name/db/dbus-glib/package.nix

+3 −4
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ 
  glib,

}:



stdenv.mkDerivation (finalAttrs: {

stdenv.mkDerivation rec {

  pname = "dbus-glib";

  version = "0.114";



  src = fetchurl {

    url = "${finalAttrs.meta.homepage}/releases/dbus-glib/dbus-glib-${finalAttrs.version}.tar.gz";

    url = "${meta.homepage}/releases/dbus-glib/dbus-glib-${version}.tar.gz";

    sha256 = "sha256-wJxcCFsqDjkbjufXg6HWP+RE6WcXzBgU1htej8KCenw=";

  };
@@ -26,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: { 
    "devdoc"

  ];

  outputBin = "dev";

  passthru.bin = finalAttrs.finalPackage.${finalAttrs.outputBin}; # fixes lib.getExe



  nativeBuildInputs = [

    pkg-config
@@ -65,4 +64,4 @@ stdenv.mkDerivation (finalAttrs: { 
    maintainers = [ ];

    platforms = lib.platforms.unix;

  };

})
 
}

pkgs/by-name/ex/expat/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { 
    "dev"

  ]; # TODO: fix referrers

  outputBin = "dev";

  passthru.bin = finalAttrs.finalPackage.${finalAttrs.outputBin}; # fixes lib.getExe



  enableParallelBuilding = true;

pkgs/by-name/gs/gspell/package.nix

+4 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
  gnome,

}:



stdenv.mkDerivation (finalAttrs: {

stdenv.mkDerivation rec {

  pname = "gspell";

  version = "1.14.0";
@@ -28,10 +28,9 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  outputBin = "dev";

  passthru.bin = finalAttrs.finalPackage.${finalAttrs.outputBin}; # fixes lib.getExe



  src = fetchurl {

    url = "mirror://gnome/sources/gspell/${lib.versions.majorMinor finalAttrs.version}/gspell-${finalAttrs.version}.tar.xz";

    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    sha256 = "ZOodjp7cHCW0WpIOgNr2dVnRhm/81/hDL+z+ptD+iJc=";

  };
@@ -62,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru = {

    updateScript = gnome.updateScript {

      packageName = "gspell";

      packageName = pname;

      versionPolicy = "none";

    };

  };
@@ -75,4 +74,4 @@ stdenv.mkDerivation (finalAttrs: { 
    teams = [ teams.gnome ];

    platforms = platforms.unix;

  };

})
 
}