diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2022-03-24 22:55:34 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-24 22:55:34 -0500 |
commit | 1cf5591a99f9d1f0b4bff66f1533917f4c597112 (patch) | |
tree | 782e1b7783c83738883e57937f0d975645e9ceed /pkgs/applications/audio | |
parent | cee88c2a1f636a3eaf5a1a07ed8ee904b1e22116 (diff) | |
parent | e0476d93fe71dabae965f153724648df813c4fe0 (diff) | |
download | nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar.gz nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar.bz2 nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar.lz nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar.xz nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar.zst nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.zip |
Merge pull request #165303 from Stunkymonkey/treewide-pname-version-18
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/airwave/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/aj-snapshot/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/audio/ams/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/cardinal/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/cmt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/jamin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/mid2key/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/audio/midas/generic.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/audio/qmidiarp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/sisco.lv2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/soundkonverter/default.nix | 2 |
12 files changed, 26 insertions, 25 deletions
diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 438159201de8..6ed488d7d643 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -3,7 +3,6 @@ }: let - version = "1.3.3"; airwave-src = fetchFromGitHub { @@ -38,7 +37,8 @@ let in multiStdenv.mkDerivation { - name = "airwave-${version}"; + pname = "airwave"; + inherit version; src = airwave-src; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 00fde01859c8..9143b5f5b08a 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, jack2, minixml, pkg-config }: stdenv.mkDerivation rec { - name = packageName + "-" + version ; - packageName = "aj-snapshot" ; + pname = "aj-snapshot" ; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/${packageName}/${name}.tar.bz2"; + url = "mirror://sourceforge/aj-snapshot/aj-snapshot-${version}.tar.bz2"; sha256 = "0z8wd5yvxdmw1h1rj6km9h01xd4xmp4d86gczlix7hsc7zrf0wil"; }; diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index 388d8b44dcf5..7b209994103e 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation rec { - name = "ams"; + pname = "ams"; version = "unstable-2019-04-27"; src = fetchgit { diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index 345750e9e2a9..0d93284e2942 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -2,7 +2,7 @@ pulseaudio }: bitwig-studio1.overrideAttrs (oldAttrs: rec { - name = "bitwig-studio-${version}"; + pname = "bitwig-studio"; version = "2.5"; src = fetchurl { diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 9200a36f9f34..1e77ade6cdb4 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation rec { - name = "cardinal-${version}"; + pname = "cardinal"; version = "22.02"; src = fetchurl { diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/applications/audio/cmt/default.nix index bb23f9b62bbd..1062d897c6bd 100644 --- a/pkgs/applications/audio/cmt/default.nix +++ b/pkgs/applications/audio/cmt/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "cmt"; + pname = "cmt"; version = "1.17"; src = fetchurl { - url = "http://www.ladspa.org/download/${name}_${version}.tgz"; + url = "http://www.ladspa.org/download/cmt_${version}.tgz"; sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb"; }; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 325d115b5816..2bd23b821f13 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.95.0"; - name = "jamin-${version}"; + pname = "jamin"; src = fetchurl { url = "mirror://sourceforge/jamin/jamin-${version}.tar.gz"; diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 5db17b99d1c3..0a5aecfecb0f 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -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 { - name = "mid2key-r1"; + pname = "mid2key"; + version = "1"; - src = fetchurl { - url = "http://mid2key.googlecode.com/files/${name}.tar.gz"; + src = fetchFromGitHub { + owner = "dnschneid"; + repo = "mid2key"; + rev = "v${version}"; sha256 = "0j2vsjvdgx51nd1qmaa18mcy0yw9pwrhbv2mdwnf913bwsk4y904"; }; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index 93a215e46b1b..b58bd0b27572 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, brand, type, version, homepage, url, sha256, ... }: stdenv.mkDerivation rec { - inherit type; - baseName = "${type}-Edit"; - name = "${lib.toLower baseName}-${version}"; + pname = "${lib.toLower type}-edit"; + inherit version; src = fetchurl { inherit url; @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ${baseName} $out/bin + cp ${pname} $out/bin ''; preFixup = let # 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 \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ - $out/bin/${baseName} + $out/bin/${pname} ''; meta = with lib; { diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index 618062dc2f37..487f86cf660f 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { - name = "qmidiarp"; + pname = "qmidiarp"; version = "0.6.5"; src = fetchgit { url = "https://git.code.sf.net/p/qmidiarp/code"; sha256 = "1g2143gzfbihqr2zi3k2v1yn1x3mwfbb2khmcd4m4cq3hcwhhlx9"; - rev = "qmidiarp-0.6.5"; + rev = "qmidiarp-${version}"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 3ecd4665f262..5aa407a15023 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, lv2, pkg-config, libGLU, libGL, cairo, pango, libjack2 }: let - name = "sisco.lv2-${version}"; version = "0.7.0"; robtkVersion = "80a2585253a861c81f0bfb7e4579c75f5c73af89"; @@ -22,7 +21,8 @@ let }; in stdenv.mkDerivation rec { - inherit name; + pname = "sisco.lv2"; + inherit version; srcs = [ src robtkSrc ]; sourceRoot = src.name; diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 1c1724fbce8b..d85367626416 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -45,7 +45,7 @@ let runtimeDeps = [] in mkDerivation rec { - name = "soundkonverter"; + pname = "soundkonverter"; version = "3.0.1"; src = fetchFromGitHub { owner = "dfaust"; |