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

Merge pull request #165303 from Stunkymonkey/treewide-pname-version-18

Browse Source
This commit is contained in:
Ben Siraphob 2022-03-24 22:55:34 -05:00 committed by GitHub
commit 1cf5591a99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 100 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/airwave/default.nix
View File

@ -3,7 +3,6 @@
}: }:
let let
version = "1.3.3"; version = "1.3.3";
airwave-src = fetchFromGitHub { airwave-src = fetchFromGitHub {
@ -38,7 +37,8 @@ let
in in
multiStdenv.mkDerivation { multiStdenv.mkDerivation {
name = "airwave-${version}"; pname = "airwave";
inherit version;
src = airwave-src; src = airwave-src;

5
pkgs/applications/audio/aj-snapshot/default.nix
View File

@ -1,12 +1,11 @@
{ lib, stdenv, fetchurl, alsa-lib, jack2, minixml, pkg-config }: { lib, stdenv, fetchurl, alsa-lib, jack2, minixml, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = packageName + "-" + version ; pname = "aj-snapshot" ;
packageName = "aj-snapshot" ;
version = "0.9.9"; version = "0.9.9";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${packageName}/${name}.tar.bz2"; url = "mirror://sourceforge/aj-snapshot/aj-snapshot-${version}.tar.bz2";
sha256 = "0z8wd5yvxdmw1h1rj6km9h01xd4xmp4d86gczlix7hsc7zrf0wil"; sha256 = "0z8wd5yvxdmw1h1rj6km9h01xd4xmp4d86gczlix7hsc7zrf0wil";
}; };

2
pkgs/applications/audio/ams/default.nix
View File

@ -12,7 +12,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ams"; pname = "ams";
version = "unstable-2019-04-27"; version = "unstable-2019-04-27";
src = fetchgit { src = fetchgit {

2
pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix
View File

@ -2,7 +2,7 @@
pulseaudio }: pulseaudio }:
bitwig-studio1.overrideAttrs (oldAttrs: rec { bitwig-studio1.overrideAttrs (oldAttrs: rec {
name = "bitwig-studio-${version}"; pname = "bitwig-studio";
version = "2.5"; version = "2.5";
src = fetchurl { src = fetchurl {

2
pkgs/applications/audio/cardinal/default.nix
View File

@ -22,7 +22,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cardinal-${version}"; pname = "cardinal";
version = "22.02"; version = "22.02";
src = fetchurl { src = fetchurl {

4
pkgs/applications/audio/cmt/default.nix
View File

@ -4,11 +4,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cmt"; pname = "cmt";
version = "1.17"; version = "1.17";
src = fetchurl { src = fetchurl {
url = "http://www.ladspa.org/download/${name}_${version}.tgz"; url = "http://www.ladspa.org/download/cmt_${version}.tgz";
sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb"; sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb";
}; };

2
pkgs/applications/audio/jamin/default.nix
View File

@ -4,7 +4,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.95.0"; version = "0.95.0";
name = "jamin-${version}"; pname = "jamin";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/jamin/jamin-${version}.tar.gz"; url = "mirror://sourceforge/jamin/jamin-${version}.tar.gz";

11
pkgs/applications/audio/mid2key/default.nix
View File

@ -1,10 +1,13 @@
{ lib, stdenv, fetchurl, alsa-lib, libX11, libXi, libXtst, xorgproto }: { lib, stdenv, fetchFromGitHub, alsa-lib, libX11, libXi, libXtst, xorgproto }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mid2key-r1"; pname = "mid2key";
version = "1";
src = fetchurl { src = fetchFromGitHub {
url = "http://mid2key.googlecode.com/files/${name}.tar.gz"; owner = "dnschneid";
repo = "mid2key";
rev = "v${version}";
sha256 = "0j2vsjvdgx51nd1qmaa18mcy0yw9pwrhbv2mdwnf913bwsk4y904"; sha256 = "0j2vsjvdgx51nd1qmaa18mcy0yw9pwrhbv2mdwnf913bwsk4y904";
}; };

9
pkgs/applications/audio/midas/generic.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, brand, type, version, homepage, url, sha256, ... }: { stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, brand, type, version, homepage, url, sha256, ... }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit type; pname = "${lib.toLower type}-edit";
baseName = "${type}-Edit"; inherit version;
name = "${lib.toLower baseName}-${version}";
src = fetchurl { src = fetchurl {
inherit url; inherit url;
@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp ${baseName} $out/bin cp ${pname} $out/bin
''; '';
preFixup = let preFixup = let
# we prepare our library path in the let clause to avoid it become part of the input of mkDerivation # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation
@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" \ --set-rpath "${libPath}" \
$out/bin/${baseName} $out/bin/${pname}
''; '';
meta = with lib; { meta = with lib; {

4
pkgs/applications/audio/qmidiarp/default.nix
View File

@ -10,13 +10,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qmidiarp"; pname = "qmidiarp";
version = "0.6.5"; version = "0.6.5";
src = fetchgit { src = fetchgit {
url = "https://git.code.sf.net/p/qmidiarp/code"; url = "https://git.code.sf.net/p/qmidiarp/code";
sha256 = "1g2143gzfbihqr2zi3k2v1yn1x3mwfbb2khmcd4m4cq3hcwhhlx9"; sha256 = "1g2143gzfbihqr2zi3k2v1yn1x3mwfbb2khmcd4m4cq3hcwhhlx9";
rev = "qmidiarp-0.6.5"; rev = "qmidiarp-${version}";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/audio/sisco.lv2/default.nix
View File

@ -1,7 +1,6 @@
{ lib, stdenv, fetchFromGitHub, lv2, pkg-config, libGLU, libGL, cairo, pango, libjack2 }: { lib, stdenv, fetchFromGitHub, lv2, pkg-config, libGLU, libGL, cairo, pango, libjack2 }:
let let
name = "sisco.lv2-${version}";
version = "0.7.0"; version = "0.7.0";
robtkVersion = "80a2585253a861c81f0bfb7e4579c75f5c73af89"; robtkVersion = "80a2585253a861c81f0bfb7e4579c75f5c73af89";
@ -22,7 +21,8 @@ let
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit name; pname = "sisco.lv2";
inherit version;
srcs = [ src robtkSrc ]; srcs = [ src robtkSrc ];
sourceRoot = src.name; sourceRoot = src.name;

2
pkgs/applications/audio/soundkonverter/default.nix
View File

@ -45,7 +45,7 @@ let runtimeDeps = []
in in
mkDerivation rec { mkDerivation rec {
name = "soundkonverter"; pname = "soundkonverter";
version = "3.0.1"; version = "3.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dfaust"; owner = "dfaust";

2
pkgs/applications/blockchains/bitcoin-unlimited/default.nix
View File

@ -6,7 +6,7 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited";
version = "1.9.2.0"; version = "1.9.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/applications/blockchains/dogecoin/default.nix
View File

@ -6,7 +6,7 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; pname = "dogecoin" + optionalString (!withGui) "d";
version = "1.14.5"; version = "1.14.5";
src = fetchFromGitHub { src = fetchFromGitHub {

3
pkgs/applications/blockchains/litecoin/default.nix
View File

@ -11,8 +11,7 @@
with lib; with lib;
mkDerivation rec { mkDerivation rec {
pname = "litecoin" + optionalString (!withGui) "d";
name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.18.1"; version = "0.18.1";
src = fetchFromGitHub { src = fetchFromGitHub {

2
pkgs/applications/blockchains/namecoin/default.nix
View File

@ -3,8 +3,8 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "namecoin" + optionalString (!withGui) "d";
version = "nc22.0"; version = "nc22.0";
name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "namecoin"; owner = "namecoin";

5
pkgs/applications/editors/jetbrains/darwin.nix
View File

@ -5,7 +5,7 @@
}: }:
{ meta { meta
, name , pname
, product , product
, productShort ? product , productShort ? product
, src , src
@ -17,7 +17,7 @@ let
loname = lib.toLower productShort; loname = lib.toLower productShort;
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
inherit meta src version; inherit pname meta src version;
desktopName = product; desktopName = product;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -32,6 +32,5 @@ in
runHook postInstall runHook postInstall
''; '';
nativeBuildInputs = [ undmg ]; nativeBuildInputs = [ undmg ];
pname = lib.concatStringsSep "-" (lib.init (lib.splitString "-" name));
sourceRoot = "."; sourceRoot = ".";
} }

64
pkgs/applications/editors/jetbrains/default.nix
View File

@ -24,9 +24,9 @@ let
# Sorted alphabetically # Sorted alphabetically
buildClion = { name, version, src, license, description, wmClass, ... }: buildClion = { pname, version, src, license, description, wmClass, ... }:
(mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit pname version src wmClass jdk;
product = "CLion"; product = "CLion";
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/clion/"; homepage = "https://www.jetbrains.com/clion/";
@ -62,9 +62,9 @@ let
''; '';
}); });
buildDataGrip = { name, version, src, license, description, wmClass, ... }: buildDataGrip = { pname, version, src, license, description, wmClass, ... }:
(mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit pname version src wmClass jdk;
product = "DataGrip"; product = "DataGrip";
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/datagrip/"; homepage = "https://www.jetbrains.com/datagrip/";
@ -78,9 +78,9 @@ let
}; };
}); });
buildGoland = { name, version, src, license, description, wmClass, ... }: buildGoland = { pname, version, src, license, description, wmClass, ... }:
(mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit pname version src wmClass jdk;
product = "Goland"; product = "Goland";
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/go/"; homepage = "https://www.jetbrains.com/go/";
@ -106,9 +106,9 @@ let
''; '';
}); });
buildIdea = { name, version, src, license, description, wmClass, product, ... }: buildIdea = { pname, version, src, license, description, wmClass, product, ... }:
(mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk product; inherit pname version src wmClass jdk product;
productShort = "IDEA"; productShort = "IDEA";
extraLdPath = [ zlib ]; extraLdPath = [ zlib ];
extraWrapperArgs = [ extraWrapperArgs = [
@ -129,9 +129,9 @@ let
}; };
}); });
buildMps = { name, version, src, license, description, wmClass, product, ... }: buildMps = { pname, version, src, license, description, wmClass, product, ... }:
(mkJetBrainsProduct rec { (mkJetBrainsProduct rec {
inherit name version src wmClass jdk product; inherit pname version src wmClass jdk product;
productShort = "MPS"; productShort = "MPS";
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/mps/"; homepage = "https://www.jetbrains.com/mps/";
@ -146,9 +146,9 @@ let
}; };
}); });
buildPhpStorm = { name, version, src, license, description, wmClass, ... }: buildPhpStorm = { pname, version, src, license, description, wmClass, ... }:
(mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit pname version src wmClass jdk;
product = "PhpStorm"; product = "PhpStorm";
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/phpstorm/"; homepage = "https://www.jetbrains.com/phpstorm/";
@ -162,9 +162,9 @@ let
}; };
}); });
buildPycharm = { name, version, src, license, description, wmClass, product, ... }: buildPycharm = { pname, version, src, license, description, wmClass, product, ... }:
(mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk product; inherit pname version src wmClass jdk product;
productShort = "PyCharm"; productShort = "PyCharm";
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/pycharm/"; homepage = "https://www.jetbrains.com/pycharm/";
@ -186,9 +186,9 @@ let
}; };
}); });
buildRider = { name, version, src, license, description, wmClass, ... }: buildRider = { pname, version, src, license, description, wmClass, ... }:
(mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit pname version src wmClass jdk;
product = "Rider"; product = "Rider";
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/rider/"; homepage = "https://www.jetbrains.com/rider/";
@ -211,9 +211,9 @@ let
''); '');
}); });
buildRubyMine = { name, version, src, license, description, wmClass, ... }: buildRubyMine = { pname, version, src, license, description, wmClass, ... }:
(mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit pname version src wmClass jdk;
product = "RubyMine"; product = "RubyMine";
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/ruby/"; homepage = "https://www.jetbrains.com/ruby/";
@ -223,9 +223,9 @@ let
}; };
}); });
buildWebStorm = { name, version, src, license, description, wmClass, ... }: buildWebStorm = { pname, version, src, license, description, wmClass, ... }:
(mkJetBrainsProduct { (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit pname version src wmClass jdk;
product = "WebStorm"; product = "WebStorm";
meta = with lib; { meta = with lib; {
homepage = "https://www.jetbrains.com/webstorm/"; homepage = "https://www.jetbrains.com/webstorm/";
@ -251,7 +251,7 @@ in
# Sorted alphabetically # Sorted alphabetically
clion = buildClion rec { clion = buildClion rec {
name = "clion-${version}"; pname = "clion";
version = products.clion.version; version = products.clion.version;
description = "C/C++ IDE. New. Intelligent. Cross-platform"; description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = lib.licenses.unfree; license = lib.licenses.unfree;
@ -264,7 +264,7 @@ in
}; };
datagrip = buildDataGrip rec { datagrip = buildDataGrip rec {
name = "datagrip-${version}"; pname = "datagrip";
version = products.datagrip.version; version = products.datagrip.version;
description = "Your Swiss Army Knife for Databases and SQL"; description = "Your Swiss Army Knife for Databases and SQL";
license = lib.licenses.unfree; license = lib.licenses.unfree;
@ -277,7 +277,7 @@ in
}; };
goland = buildGoland rec { goland = buildGoland rec {
name = "goland-${version}"; pname = "goland";
version = products.goland.version; version = products.goland.version;
description = "Up and Coming Go IDE"; description = "Up and Coming Go IDE";
license = lib.licenses.unfree; license = lib.licenses.unfree;
@ -290,7 +290,7 @@ in
}; };
idea-community = buildIdea rec { idea-community = buildIdea rec {
name = "idea-community-${version}"; pname = "idea-community";
product = "IntelliJ IDEA CE"; product = "IntelliJ IDEA CE";
version = products.idea-community.version; version = products.idea-community.version;
description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
@ -304,7 +304,7 @@ in
}; };
idea-ultimate = buildIdea rec { idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}"; pname = "idea-ultimate";
product = "IntelliJ IDEA"; product = "IntelliJ IDEA";
version = products.idea-ultimate.version; version = products.idea-ultimate.version;
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
@ -318,7 +318,7 @@ in
}; };
mps = buildMps rec { mps = buildMps rec {
name = "mps-${version}"; pname = "mps";
product = "MPS ${products.mps.version-major-minor}"; product = "MPS ${products.mps.version-major-minor}";
version = products.mps.version; version = products.mps.version;
description = "Create your own domain-specific language"; description = "Create your own domain-specific language";
@ -332,7 +332,7 @@ in
}; };
phpstorm = buildPhpStorm rec { phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}"; pname = "phpstorm";
version = products.phpstorm.version; version = products.phpstorm.version;
description = "Professional IDE for Web and PHP developers"; description = "Professional IDE for Web and PHP developers";
license = lib.licenses.unfree; license = lib.licenses.unfree;
@ -345,7 +345,7 @@ in
}; };
pycharm-community = buildPycharm rec { pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}"; pname = "pycharm-community";
product = "PyCharm CE"; product = "PyCharm CE";
version = products.pycharm-community.version; version = products.pycharm-community.version;
description = "PyCharm Community Edition"; description = "PyCharm Community Edition";
@ -359,7 +359,7 @@ in
}; };
pycharm-professional = buildPycharm rec { pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}"; pname = "pycharm-professional";
product = "PyCharm"; product = "PyCharm";
version = products.pycharm-professional.version; version = products.pycharm-professional.version;
description = "PyCharm Professional Edition"; description = "PyCharm Professional Edition";
@ -373,7 +373,7 @@ in
}; };
rider = buildRider rec { rider = buildRider rec {
name = "rider-${version}"; pname = "rider";
version = products.rider.version; version = products.rider.version;
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = lib.licenses.unfree; license = lib.licenses.unfree;
@ -386,7 +386,7 @@ in
}; };
ruby-mine = buildRubyMine rec { ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}"; pname = "ruby-mine";
version = products.ruby-mine.version; version = products.ruby-mine.version;
description = "The Most Intelligent Ruby and Rails IDE"; description = "The Most Intelligent Ruby and Rails IDE";
license = lib.licenses.unfree; license = lib.licenses.unfree;
@ -399,7 +399,7 @@ in
}; };
webstorm = buildWebStorm rec { webstorm = buildWebStorm rec {
name = "webstorm-${version}"; pname = "webstorm";
version = products.webstorm.version; version = products.webstorm.version;
description = "Professional IDE for Web and JavaScript development"; description = "Professional IDE for Web and JavaScript development";
license = lib.licenses.unfree; license = lib.licenses.unfree;

25
pkgs/applications/editors/jetbrains/linux.nix
View File

@ -3,30 +3,29 @@
, vmopts ? null , vmopts ? null
}: }:
{ name, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: { pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args:
with lib; with lib;
let loName = toLower productShort; let loName = toLower productShort;
hiName = toUpper productShort; hiName = toUpper productShort;
mainProgram = concatStringsSep "-" (init (splitString "-" name));
vmoptsName = loName vmoptsName = loName
+ lib.optionalString stdenv.hostPlatform.is64bit "64" + lib.optionalString stdenv.hostPlatform.is64bit "64"
+ ".vmoptions"; + ".vmoptions";
in in
with stdenv; lib.makeOverridable mkDerivation (rec { with stdenv; lib.makeOverridable mkDerivation (rec {
inherit name src; inherit pname version src;
meta = args.meta // { inherit mainProgram; }; meta = args.meta // { mainProgram = pname; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = mainProgram; name = pname;
exec = mainProgram; exec = pname;
comment = lib.replaceChars ["\n"] [" "] meta.longDescription; comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
desktopName = product; desktopName = product;
genericName = meta.description; genericName = meta.description;
categories = [ "Development" ]; categories = [ "Development" ];
icon = mainProgram; icon = pname;
startupWMClass = wmClass; startupWMClass = wmClass;
}; };
@ -62,16 +61,16 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} mkdir -p $out/{bin,$pname,share/pixmaps,libexec/${pname}}
cp -a . $out/$name cp -a . $out/$pname
ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png
mv bin/fsnotifier* $out/libexec/${name}/. mv bin/fsnotifier* $out/libexec/${pname}/.
jdk=${jdk.home} jdk=${jdk.home}
item=${desktopItem} item=${desktopItem}
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \ makeWrapper "$out/$pname/bin/${loName}.sh" "$out/bin/${pname}" \
--prefix PATH : "$out/libexec/${name}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
# Some internals want libstdc++.so.6 # Some internals want libstdc++.so.6
stdenv.cc.cc.lib libsecret e2fsprogs stdenv.cc.cc.lib libsecret e2fsprogs

3
pkgs/applications/editors/jupyter-kernels/octave/default.nix
View File

@ -32,7 +32,8 @@ rec {
''; '';
sizedLogo = size: stdenv.mkDerivation { sizedLogo = size: stdenv.mkDerivation {
name = ''octave-logo-${octave.version}-${size}x${size}.png''; pname = "octave-logo-${size}x${size}.png";
inherit (octave) version;
src = octave.src; src = octave.src;

2
pkgs/applications/editors/qxmledit/default.nix
View File

@ -2,7 +2,7 @@
qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }: qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qxmledit-${version}" ; pname = "qxmledit" ;
version = "0.9.15" ; version = "0.9.15" ;
src = fetchFromGitHub ( lib.importJSON ./qxmledit.json ) ; src = fetchFromGitHub ( lib.importJSON ./qxmledit.json ) ;
nativeBuildInputs = [ qmake ] ; nativeBuildInputs = [ qmake ] ;

8
pkgs/applications/emulators/wine/base.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, pkgArches, callPackage, makeSetupHook, { stdenv, lib, pkgArches, callPackage, makeSetupHook,
name, version, src, mingwGccs, monos, geckos, platforms, pname, version, src, mingwGccs, monos, geckos, platforms,
bison, flex, fontforge, makeWrapper, pkg-config, bison, flex, fontforge, makeWrapper, pkg-config,
autoconf, hexdump, perl, nixosTests, autoconf, hexdump, perl, nixosTests,
supportFlags, supportFlags,
@ -13,7 +13,7 @@ with import ./util.nix { inherit lib; };
let let
patches' = patches; patches' = patches;
prevName = name; prevName = pname;
prevPlatforms = platforms; prevPlatforms = platforms;
prevConfigFlags = configureFlags; prevConfigFlags = configureFlags;
setupHookDarwin = makeSetupHook { setupHookDarwin = makeSetupHook {
@ -42,9 +42,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
make loader/wine64-preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" make loader/wine64-preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}=""
''; '';
}) // rec { }) // rec {
inherit src; inherit version src;
name = if supportFlags.waylandSupport then "${prevName}-wayland" else prevName; pname = prevName + lib.optionalString supportFlags.waylandSupport "wayland";
# Fixes "Compiler cannot create executables" building wineWow with mingwSupport # Fixes "Compiler cannot create executables" building wineWow with mingwSupport
strictDeps = true; strictDeps = true;

6
pkgs/applications/emulators/wine/packages.nix
View File

@ -9,7 +9,7 @@ let
vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; }; vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; };
in with src; { in with src; {
wine32 = pkgsi686Linux.callPackage ./base.nix { wine32 = pkgsi686Linux.callPackage ./base.nix {
name = "wine-${version}"; pname = "wine";
inherit src version supportFlags patches moltenvk; inherit src version supportFlags patches moltenvk;
pkgArches = [ pkgsi686Linux ]; pkgArches = [ pkgsi686Linux ];
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ];
@ -19,7 +19,7 @@ in with src; {
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
}; };
wine64 = callPackage ./base.nix { wine64 = callPackage ./base.nix {
name = "wine64-${version}"; pname = "wine64";
inherit src version supportFlags patches moltenvk; inherit src version supportFlags patches moltenvk;
pkgArches = [ pkgs ]; pkgArches = [ pkgs ];
vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ];
@ -30,7 +30,7 @@ in with src; {
platforms = [ "x86_64-linux" "x86_64-darwin" ]; platforms = [ "x86_64-linux" "x86_64-darwin" ];
}; };
wineWow = callPackage ./base.nix { wineWow = callPackage ./base.nix {
name = "wine-wow-${version}"; pname = "wine-wow";
inherit src version supportFlags patches moltenvk; inherit src version supportFlags patches moltenvk;
stdenv = stdenv_32bit; stdenv = stdenv_32bit;
pkgArches = [ pkgs pkgsi686Linux ]; pkgArches = [ pkgs pkgsi686Linux ];

2
pkgs/applications/gis/grass/default.nix
View File

@ -5,7 +5,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "grass"; pname = "grass";
version = "7.8.6"; version = "7.8.6";
src = with lib; fetchFromGitHub { src = with lib; fetchFromGitHub {

4
pkgs/applications/graphics/inkscape/extensions.nix
View File

@ -9,8 +9,8 @@
applytransforms = callPackage ./extensions/applytransforms { }; applytransforms = callPackage ./extensions/applytransforms { };
hexmap = stdenv.mkDerivation { hexmap = stdenv.mkDerivation {
name = "hexmap"; pname = "hexmap";
version = "2020-06-06"; version = "unstable-2020-06-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lifelike"; owner = "lifelike";

8
pkgs/applications/graphics/mtpaint/default.nix
View File

@ -4,14 +4,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
p_name = "mtPaint"; pname = "mtPaint";
ver_maj = "3.50"; version = "3.50.01";
ver_min = "01";
name = "${p_name}-${ver_maj}.${ver_min}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wjaguar"; owner = "wjaguar";
repo = p_name; repo = "mtPaint";
rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f"; rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f";
sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y"; sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y";
}; };

2
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -114,7 +114,7 @@ let
}; };
base = rec { base = rec {
name = "${packageName}-unwrapped-${version}"; pname = "${packageName}-unwrapped";
inherit (upstream-info) version; inherit (upstream-info) version;
inherit packageName buildType buildPath; inherit packageName buildType buildPath;

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -157,8 +157,8 @@ let
else browser; else browser;
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = lib.optionalString ungoogled "ungoogled-" pname = lib.optionalString ungoogled "ungoogled-"
+ "chromium${suffix}-${version}"; + "chromium${suffix}";
inherit version; inherit version;
nativeBuildInputs = [ nativeBuildInputs = [

7
pkgs/applications/radio/gnuradio/wrapper.nix
View File

@ -50,7 +50,8 @@ let
; ;
pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs);
name = (lib.appendToName "wrapped" unwrapped).name; pname = unwrapped.pname + "-wrapped";
inherit (unwrapped) version;
makeWrapperArgs = builtins.concatStringsSep " " ([ makeWrapperArgs = builtins.concatStringsSep " " ([
] ]
# Emulating wrapGAppsHook & wrapQtAppsHook working together # Emulating wrapGAppsHook & wrapQtAppsHook working together
@ -59,7 +60,7 @@ let
|| (unwrapped.hasFeature "gr-qtgui") || (unwrapped.hasFeature "gr-qtgui")
) [ ) [
"--prefix" "XDG_DATA_DIRS" ":" "$out/share" "--prefix" "XDG_DATA_DIRS" ":" "$out/share"
"--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${name}" "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${pname}"
"--prefix" "XDG_DATA_DIRS" ":" "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" "--prefix" "XDG_DATA_DIRS" ":" "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
"--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share"
# Needs to run `gsettings` on startup, see: # Needs to run `gsettings` on startup, see:
@ -135,7 +136,7 @@ let
}; };
self = if doWrap then self = if doWrap then
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name passthru; inherit pname version passthru;
buildInputs = [ buildInputs = [
makeWrapper makeWrapper
xorg.lndir xorg.lndir

2
pkgs/applications/science/logic/why3/with-provers.nix
View File

@ -12,7 +12,7 @@ let configAwkScript = runCommand "why3-conf.awk" { inherit provers; }
''; '';
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${why3.name}-with-provers"; pname = "${why3.pname}-with-provers";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ why3 ] ++ provers; buildInputs = [ why3 ] ++ provers;