diff options
author | Felix Buehler <account@buehler.rocks> | 2021-11-07 14:50:48 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2021-11-07 14:53:06 +0100 |
commit | b52ab3b712cc44b5eb88557ad2ca206dcd10af20 (patch) | |
tree | 150c6952f4b9cf2d164b7b424c9d1709b4a0cc6e /pkgs | |
parent | 54ef803bf82fa441de6d154086325137ff732028 (diff) |
pkgs/applications: rename name to pname&version part 2
Diffstat (limited to 'pkgs')
68 files changed, 605 insertions, 301 deletions
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 1244347cc53c..b9b62c416748 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "procmail-3.22"; +stdenv.mkDerivation rec { + pname = "procmail"; + version = "3.22"; patches = [ ./CVE-2014-3618.patch @@ -15,17 +16,17 @@ stdenv.mkDerivation { # getline is defined differently in glibc now. So rename it. # Without the .PHONY target "make install" won't install anything on Darwin. postPatch = '' - sed -e "s%^RM.*$%#%" -i Makefile - sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile - sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile - sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h - sed -e "3i\ -.PHONY: install -" -i Makefile + sed -e "s%^RM.*$%#%" -i Makefile + sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile + sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile + sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h + sed -e "3i\ + .PHONY: install + " -i Makefile ''; src = fetchurl { - url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz"; + url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz"; sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; }; diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/applications/misc/rofi-menugen/default.nix index 6c9e5f6feff8..7073be79c87f 100644 --- a/pkgs/applications/misc/rofi-menugen/default.nix +++ b/pkgs/applications/misc/rofi-menugen/default.nix @@ -2,7 +2,9 @@ stdenv.mkDerivation rec { rev = "168efd2608fdb88b1aff3e0244bda8402169f207"; - name = "rofi-menugen-2015-12-28-${builtins.substring 0 7 rev}"; + pname = "rofi-menugen"; + version = "unstable-2015-12-28-${builtins.substring 0 7 rev}"; + src = fetchFromGitHub { owner = "octotep"; repo = "menugen"; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 365f6217861b..e5beca06b032 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,17 +2,18 @@ # at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw}: +{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }: stdenv.mkDerivation rec { - name = "xfontsel-1.0.6"; + pname = "xfontsel"; + version = "1.0.6"; src = fetchurl { - url = "mirror://xorg/individual/app/${name}.tar.bz2"; + url = "mirror://xorg/individual/app/xfontsel-${version}.tar.bz2"; sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [libX11 libXaw]; + buildInputs = [ libX11 libXaw ]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://www.x.org/"; description = "Allows testing the fonts available in an X server"; license = lib.licenses.free; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index b579579195f6..d6f96007bd02 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -1,21 +1,37 @@ -{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep -, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkg-config +{ lib +, stdenv +, fetchurl +, libX11 +, libXt +, libXext +, libXpm +, imake +, gccmakedep +, svgSupport ? false +, librsvg +, glib +, gdk-pixbuf +, pkg-config }: assert svgSupport -> - librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null; +librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null; stdenv.mkDerivation rec { - name = "xxkb-1.11.1"; + pname = "xxkb"; + version = "1.11.1"; src = fetchurl { - url = "mirror://sourceforge/xxkb/${name}-src.tar.gz"; + url = "mirror://sourceforge/xxkb/xxkb-${version}-src.tar.gz"; sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; }; nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ - libX11 libXt libXext libXpm + libX11 + libXt + libXext + libXpm ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 14f48da22309..1ff88d49d2b7 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,11 +1,12 @@ { lib, fetchurl, python2Packages }: -python2Packages.buildPythonApplication { - name = "keepnote-0.7.8"; +python2Packages.buildPythonApplication rec { + pname = "keepnote"; + version = "0.7.8"; namePrefix = ""; src = fetchurl { - url = "http://keepnote.org/download/keepnote-0.7.8.tar.gz"; + url = "http://keepnote.org/download/keepnote-${version}.tar.gz"; sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; }; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 18126b5e2b76..7869b54a5f04 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, qt4, cmake, sqlite }: -stdenv.mkDerivation { - name = "tagainijisho-1.0.3"; +stdenv.mkDerivation rec { + pname = "tagainijisho"; + version = "1.0.3"; + src = fetchurl { - url = "https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz"; + url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"; sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; @@ -14,8 +16,10 @@ stdenv.mkDerivation { description = "A free, open-source Japanese dictionary and kanji lookup tool"; homepage = "https://www.tagaini.net/"; license = with licenses; [ - /* program */ gpl3Plus - /* data */ cc-by-sa-30 + /* program */ + gpl3Plus + /* data */ + cc-by-sa-30 ]; platforms = platforms.linux; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index 5792031c802d..f10840e1bea9 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, hackrf, libusb1 }: stdenv.mkDerivation { - name = "kalibrate-hackrf-unstable-20160827"; + pname = "kalibrate-hackrf"; + version = "unstable-2016-08-27"; # There are no tags/releases, so use the latest commit from git master. # Currently, the latest commit is from 2016-07-03. diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 255938b11d52..53b58adb9972 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }: stdenv.mkDerivation { - name = "kalibrate-rtl-20131214"; + pname = "kalibrate-rtl"; + version = "2013-12-14"; # There are no tags/releases, so use the latest commit from git master. # Currently, the latest commit is from 2013-12-14. diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index baf9ed7fc184..d557f32bb6da 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { - name = "gravit-0.5.1"; + pname = "gravit"; + version = "0.5.1"; src = fetchurl { - url = "https://gravit.slowchop.com/media/downloads/${name}.tgz"; + url = "https://gravit.slowchop.com/media/downloads/gravit-${version}.tgz"; sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; }; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index f147c0422e45..b6286d11c8cb 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -1,11 +1,12 @@ -{lib, stdenv, fetchurl, cmake}: +{ lib, stdenv, fetchurl, cmake }: -stdenv.mkDerivation { - name = "cmtk-3.3.1"; +stdenv.mkDerivation rec { + pname = "cmtk"; + version = "3.3.1"; src = fetchurl { name = "cmtk-source.tar.gz"; - url = "https://www.nitrc.org/frs/download.php/8198/CMTK-3.3.1-Source.tar.gz//?i_agree=1&download_now=1"; + url = "https://www.nitrc.org/frs/download.php/8198/CMTK-${version}-Source.tar.gz//?i_agree=1&download_now=1"; sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; }; @@ -14,13 +15,13 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with lib; { - description = "Computational Morphometry Toolkit "; + description = "Computational Morphometry Toolkit "; longDescription = ''A software toolkit for computational morphometry of biomedical images, CMTK comprises a set of command line tools and a back-end general-purpose library for processing and I/O''; maintainers = with maintainers; [ tbenst ]; platforms = platforms.all; - license = licenses.gpl3; - homepage = "https://www.nitrc.org/projects/cmtk/"; + license = licenses.gpl3; + homepage = "https://www.nitrc.org/projects/cmtk/"; }; } diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 2e11c1d8c58c..4f23f3f9a82c 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, zlib }: -stdenv.mkDerivation { - name = "diamond-0.8.36"; +stdenv.mkDerivation rec { + pname = "diamond"; + version = "0.8.36"; src = fetchurl { - url = "https://github.com/bbuchfink/diamond/archive/v0.8.36.tar.gz"; + url = "https://github.com/bbuchfink/diamond/archive/v${version}.tar.gz"; sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh"; }; @@ -30,7 +31,7 @@ stdenv.mkDerivation { B. Buchfink, Xie C., D. Huson, "Fast and sensitive protein alignment using DIAMOND", Nature Methods 12, 59-60 (2015). - ''; + ''; homepage = "https://github.com/bbuchfink/diamond"; license = { fullName = "University of Tuebingen, Benjamin Buchfink"; diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index 019370378605..4ed11857a30e 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gcc, zlib, python27 }: stdenv.mkDerivation rec { - name = "ecopcr-0.8.0"; + pname = "ecopcr"; + version = "0.8.0"; src = fetchurl { - url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/${name}.tar.gz"; + url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/ecopcr-${version}.tar.gz"; sha256 = "10c58hj25z78jh0g3zcbx4890yd2qrvaaanyx8mn9p49mmyf5pk6"; }; diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 5cbcd46ee07c..29669d027303 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}: +{ lib, stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib }: + +stdenv.mkDerivation rec { + pname = "emboss"; + version = "6.6.0"; -stdenv.mkDerivation { - name = "emboss-6.6.0"; src = fetchurl { - url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz"; + url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-${version}.tar.gz"; sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e"; }; @@ -16,13 +18,13 @@ stdenv.mkDerivation { ''; meta = { - description = "The European Molecular Biology Open Software Suite"; + description = "The European Molecular Biology Open Software Suite"; longDescription = ''EMBOSS is a free Open Source software analysis package specially developed for the needs of the molecular biology (e.g. EMBnet) user community, including libraries. The software automatically copes with data in |