JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #161414 from Stunkymonkey/treewide-appendToName

Browse Source
This commit is contained in:
Sandro 2022-02-28 14:25:43 +01:00 committed by GitHub
commit f31e080cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 31 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/misc/openlp/default.nix
View File

@ -37,7 +37,8 @@ let
# base pkg/lib # base pkg/lib
baseLib = python3Packages.callPackage ./lib.nix { }; baseLib = python3Packages.callPackage ./lib.nix { };
in mkDerivation { in mkDerivation {
inherit (baseLib) pname version src; pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full";
inherit (baseLib) version src;
nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ];
buildInputs = [ qtbase ] ++ optionals gstreamerSupport buildInputs = [ qtbase ] ++ optionals gstreamerSupport

2
pkgs/applications/science/biology/neuron/default.nix
View File

@ -14,7 +14,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "neuron"; pname = "neuron${lib.optionalString useMpi "-mpi"}";
version = "7.5"; version = "7.5";
nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; nativeBuildInputs = [ which pkg-config automake autoconf libtool ];

4
pkgs/applications/science/biology/raxml/default.nix
View File

@ -5,12 +5,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "RAxML"; pname = "RAxML${lib.optionalString useMpi "-mpi"}";
version = "8.2.12"; version = "8.2.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stamatak"; owner = "stamatak";
repo = "standard-${pname}"; repo = "standard-RAxML";
rev = "v${version}"; rev = "v${version}";
sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh";
}; };

6
pkgs/applications/version-management/mercurial/default.nix
View File

@ -20,7 +20,7 @@ let
inherit (python3Packages) docutils python fb-re2 pygit2 pygments; inherit (python3Packages) docutils python fb-re2 pygit2 pygments;
self = python3Packages.buildPythonApplication rec { self = python3Packages.buildPythonApplication rec {
pname = "mercurial"; pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.0.3"; version = "6.0.3";
src = fetchurl { src = fetchurl {
@ -34,9 +34,9 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "mercurial-${version}";
sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE="; sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE=";
sourceRoot = "${pname}-${version}/rust"; sourceRoot = "mercurial-${version}/rust";
} else null; } else null;
cargoRoot = if rustSupport then "rust" else null; cargoRoot = if rustSupport then "rust" else null;

2
pkgs/development/libraries/highfive/default.nix
View File

@ -11,7 +11,7 @@
assert mpiSupport -> mpi != null; assert mpiSupport -> mpi != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "highfive"; pname = "highfive${lib.optionalString mpiSupport "-mpi"}";
version = "2.3.1"; version = "2.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {

4
pkgs/development/libraries/netcdf/default.nix
View File

@ -10,11 +10,11 @@
let let
inherit (hdf5) mpiSupport mpi; inherit (hdf5) mpiSupport mpi;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "netcdf"; pname = "netcdf" + lib.optionalString mpiSupport "-mpi";
version = "4.8.0"; # Remove patch mentioned below on upgrade version = "4.8.0"; # Remove patch mentioned below on upgrade
src = fetchurl { src = fetchurl {
url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz"; url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz";
sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7"; sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7";
}; };

2
pkgs/development/libraries/sqlite/default.nix
View File

@ -10,7 +10,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sqlite"; pname = "sqlite${optionalString interactive "-interactive"}";
version = "3.37.2"; version = "3.37.2";
# nixpkgs-update: no auto update # nixpkgs-update: no auto update

4
pkgs/tools/networking/davix/default.nix
View File

@ -30,7 +30,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.8.0"; version = "0.8.0";
pname = "davix"; pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy";
nativeBuildInputs = [ cmake pkg-config python3 ]; nativeBuildInputs = [ cmake pkg-config python3 ];
buildInputs = [ buildInputs = [
openssl openssl
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
# "please ignore the GitHub-generated tarballs, as they are incomplete" # "please ignore the GitHub-generated tarballs, as they are incomplete"
# https://github.com/cern-fts/davix/releases/tag/R_0_8_0 # https://github.com/cern-fts/davix/releases/tag/R_0_8_0
src = fetchurl { src = fetchurl {
url = "https://github.com/cern-fts/${pname}/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz"; url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz";
sha256 = "LxCNoECKg/tbnwxoFQ02C6cz5LOg/imNRbDTLSircSQ="; sha256 = "LxCNoECKg/tbnwxoFQ02C6cz5LOg/imNRbDTLSircSQ=";
}; };

2
pkgs/tools/text/gawk/default.nix
View File

@ -16,7 +16,7 @@
assert (doCheck && stdenv.isLinux) -> glibcLocales != null; assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gawk"; pname = "gawk" + lib.optionalString interactive "-interactive";
version = "5.1.1"; version = "5.1.1";
src = fetchurl { src = fetchurl {

2
pkgs/tools/typesetting/tex/dblatex/default.nix
View File

@ -14,7 +14,7 @@
# enable any extra features. # enable any extra features.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dblatex"; pname = "dblatex${lib.optionalString enableAllFeatures "-full"}";
version = "0.3.12"; version = "0.3.12";
src = fetchurl { src = fetchurl {

45
pkgs/top-level/all-packages.nix
View File

@ -4069,7 +4069,7 @@ with pkgs;
davix = callPackage ../tools/networking/davix { }; davix = callPackage ../tools/networking/davix { };
davix-copy = appendToName "copy" (davix.override { enableThirdPartyCopy = true; }); davix-copy = davix.override { enableThirdPartyCopy = true; };
cantata = libsForQt5.callPackage ../applications/audio/cantata { }; cantata = libsForQt5.callPackage ../applications/audio/cantata { };
@ -5681,8 +5681,7 @@ with pkgs;
}; };
gawkextlib = callPackage ../tools/text/gawk/gawkextlib.nix {}; gawkextlib = callPackage ../tools/text/gawk/gawkextlib.nix {};
gawkInteractive = appendToName "interactive" gawkInteractive = gawk.override { interactive = true; };
(gawk.override { interactive = true; });
gawp = callPackage ../tools/misc/gawp { }; gawp = callPackage ../tools/misc/gawp { };
@ -8085,9 +8084,9 @@ with pkgs;
hdf5 = hdf5.override { usev110Api = true; }; hdf5 = hdf5.override { usev110Api = true; };
}; };
netcdf-mpi = appendToName "mpi" (netcdf.override { netcdf-mpi = netcdf.override {
hdf5 = hdf5-mpi.override { usev110Api = true; }; hdf5 = hdf5-mpi.override { usev110Api = true; };
}); };
netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };
@ -15756,9 +15755,7 @@ with pkgs;
texinfo6_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop texinfo6_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop
texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { }; texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { };
texinfo = texinfo6; texinfo = texinfo6;
texinfoInteractive = appendToName "interactive" ( texinfoInteractive = texinfo.override { interactive = true; };
texinfo.override { interactive = true; }
);
texi2html = callPackage ../development/tools/misc/texi2html { }; texi2html = callPackage ../development/tools/misc/texi2html { };
@ -17276,9 +17273,7 @@ with pkgs;
highfive = callPackage ../development/libraries/highfive { }; highfive = callPackage ../development/libraries/highfive { };
highfive-mpi = appendToName "mpi" (highfive.override { highfive-mpi = highfive.override { hdf5 = hdf5-mpi; };
hdf5 = hdf5-mpi;
});
hiredis = callPackage ../development/libraries/hiredis { }; hiredis = callPackage ../development/libraries/hiredis { };
@ -20160,7 +20155,7 @@ with pkgs;
sqlitecpp = callPackage ../development/libraries/sqlitecpp { }; sqlitecpp = callPackage ../development/libraries/sqlitecpp { };
sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin; sqlite-interactive = (sqlite.override { interactive = true; }).bin;
sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { }; sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
@ -27316,7 +27311,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices;
}; };
mercurialFull = appendToName "full" (mercurial.override { fullBuild = true; }); mercurialFull = mercurial.override { fullBuild = true; };
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
@ -31818,12 +31813,12 @@ with pkgs;
octopus = callPackage ../applications/science/chemistry/octopus { }; octopus = callPackage ../applications/science/chemistry/octopus { };
openlp = libsForQt5.callPackage ../applications/misc/openlp { }; openlp = libsForQt5.callPackage ../applications/misc/openlp { };
openlpFull = appendToName "full" (openlp.override { openlpFull = openlp.override {
pdfSupport = true; pdfSupport = true;
presentationSupport = true; presentationSupport = true;
vlcSupport = true; vlcSupport = true;
gstreamerSupport = true; gstreamerSupport = true;
}); };
dkh = callPackage ../applications/science/chemistry/dkh { }; dkh = callPackage ../applications/science/chemistry/dkh { };
@ -31975,13 +31970,9 @@ with pkgs;
n3 = callPackage ../applications/science/biology/N3 { }; n3 = callPackage ../applications/science/biology/N3 { };
neuron = callPackage ../applications/science/biology/neuron { neuron = callPackage ../applications/science/biology/neuron { python = null; };
python = null;
};
neuron-mpi = appendToName "mpi" (neuron.override { neuron-mpi = neuron.override {useMpi = true; };
useMpi = true;
});
neuron-full = neuron-mpi.override { python = python2; }; neuron-full = neuron-mpi.override { python = python2; };
@ -32031,9 +32022,7 @@ with pkgs;
raxml = callPackage ../applications/science/biology/raxml { }; raxml = callPackage ../applications/science/biology/raxml { };
raxml-mpi = appendToName "mpi" (raxml.override { raxml-mpi = raxml.override { useMpi = true; };
useMpi = true;
});
sambamba = callPackage ../applications/science/biology/sambamba { }; sambamba = callPackage ../applications/science/biology/sambamba { };
@ -33008,13 +32997,9 @@ with pkgs;
dbacl = callPackage ../tools/misc/dbacl { }; dbacl = callPackage ../tools/misc/dbacl { };
dblatex = callPackage ../tools/typesetting/tex/dblatex { dblatex = callPackage ../tools/typesetting/tex/dblatex { };
enableAllFeatures = false;
};
dblatexFull = appendToName "full" (dblatex.override { dblatexFull = dblatex.override { enableAllFeatures = true; };
enableAllFeatures = true;
});
dbus-map = callPackage ../tools/misc/dbus-map { }; dbus-map = callPackage ../tools/misc/dbus-map { };