diff options
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 1244347cc53..b9b62c41674 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 6c9e5f6feff..7073be79c87 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 365f6217861..e5beca06b03 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 b579579195f..d6f96007bd0 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 14f48da2230..1ff88d49d2b 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 18126b5e2b7..7869b54a5f0 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 5792031c802..f10840e1bea 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 255938b11d5..53b58adb997 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 baf9ed7fc18..d557f32bb6d 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 f147c0422e4..b6286d11c8c 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 2e11c1d8c58..4f23f3f9a82 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 01937037860..4ed11857a30 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 5cbcd46ee07..29669d02730 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 a variety of formats and even allows transparent retrieval of sequence data from the web.''; - license = lib.licenses.gpl2; - homepage = "http://emboss.sourceforge.net/"; + license = lib.licenses.gpl2; + homepage = "http://emboss.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index 72cf9c86e65..ba1b91298bb 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -1,32 +1,43 @@ -{ lib, stdenv, fetchurl, neuron-version -, libX11, libXext, patchelf +{ lib +, stdenv +, fetchurl +, neuron-version +, libX11 +, libXext +, patchelf }: -stdenv.mkDerivation rec - { name = "iv-19"; - src = fetchurl - { url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz"; - sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; - }; - nativeBuildInputs = [ patchelf ]; - buildInputs = [ libXext ]; - propagatedBuildInputs = [ libX11 ]; - hardeningDisable = [ "format" ]; - postInstall = '' - for dir in $out/*; do # */ - if [ -d $dir/lib ]; then - mv $dir/* $out # */ - rmdir $dir - break - fi - done - '' + lib.optionalString stdenv.isLinux '' - patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so - ''; - meta = with lib; - { description = "InterViews graphical library for Neuron"; - license = licenses.bsd3; - homepage = "http://www.neuron.yale.edu/neuron"; - platforms = platforms.all; - }; - } +stdenv.mkDerivation rec { + pname = "iv"; + version = "19"; + + src = fetchurl { + url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/iv-${version}.tar.gz"; + sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; + }; + + nativeBuildInputs = [ patchelf ]; + buildInputs = [ libXext ]; + propagatedBuildInputs = [ libX11 ]; + + hardeningDisable = [ "format" ]; + + postInstall = '' + for dir in $out/*; do # */ + if [ -d $dir/lib ]; then + mv $dir/* $out # */ + rmdir $dir + break + fi + done + '' + lib.optionalString stdenv.isLinux '' + patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so + ''; + + meta = with lib; { + description = "InterViews graphical library for Neuron"; + license = licenses.bsd3; + homepage = "http://www.neuron.yale.edu/neuron"; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index f5c6d79e28a..c6339bab122 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: stdenv.mkDerivation rec { - name = "avogadro-1.1.1"; + pname = "avogadro"; + version = "1.1.1"; src = fetchurl { - url = "mirror://sourceforge/avogadro/${name}.tar.bz2"; + url = "mirror://sourceforge/avogadro/avogadro-${version}.tar.bz2"; sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; }; diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 731f2db56af..8bceed08e1d 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "archimedes-2.0.1"; + pname = "archimedes"; + version = "2.0.1"; src = fetchurl { - url = "mirror://gnu/archimedes/${name}.tar.gz"; + url = "mirror://gnu/archimedes/archimedes-${version}.tar.gz"; sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z"; }; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index de79abc3e51..b2e3704cba7 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: stdenv.mkDerivation rec { - name = "qfsm-0.54.0"; + pname = "qfsm"; + version = "0.54.0"; src = fetchurl { - url = "mirror://sourceforge/qfsm/${name}-Source.tar.bz2"; + url = "mirror://sourceforge/qfsm/qfsm-${version}-Source.tar.bz2"; sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; }; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 6a399958553..f8741cd8d18 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -5,10 +5,11 @@ let libiconvLib = lib.optionalString stdenv.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { - name = "tkgate-1.8.7"; + pname = "tkgate"; + version = "1.8.7"; src = fetchurl { - url = "http://www.tkgate.org/downloads/${name}.tgz"; + url = "http://www.tkgate.org/downloads/tkgate-${version}.tgz"; sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; }; diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix index 245d4c12bfe..684f5913f79 100644 --- a/pkgs/applications/science/geometry/tetgen/1.4.nix +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tetgen-1.4.3"; + pname = "tetgen"; + version = "1.4.3"; src = fetchurl { - url = "${meta.homepage}/files/tetgen1.4.3.tar.gz"; + url = "${meta.homepage}/files/tetgen${version}.tar.gz"; sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm"; }; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index f9cc97893da..fc16423b671 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -8,7 +8,8 @@ let in stdenv.mkDerivation { - name = "aspino-unstable-2017-03-09"; + pname = "aspino"; + version = "unstable-2017-03-09"; src = fetchFromGitHub { owner = "alviano"; diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix index be1d6f253bc..af6673caa54 100644 --- a/pkgs/applications/science/logic/gappa/default.nix +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gmp, mpfr, boost }: -stdenv.mkDerivation { - name = "gappa-1.4.0"; +stdenv.mkDerivation rec { + pname = "gappa"; + version = "1.4.0"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-1.4.0.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-${version}.tar.gz"; sha256 = "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb"; }; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 24faa98f777..e66fe992e18 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -3,11 +3,11 @@ let load_num = if num == null then "" else - '' - -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \ - -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \ - -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ - ''; + '' + -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \ + -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \ + -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ + ''; start_script = '' @@ -21,19 +21,22 @@ let in stdenv.mkDerivation { - name = "hol_light-2019-10-06"; + pname = "hol_light"; + version = "unstable-2019-10-06"; src = fetchFromGitHub { - owner = "jrh13"; - repo = "hol-light"; - rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; + owner = "jrh13"; + repo = "hol-light"; + rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; }; - patches = [(fetchpatch { - url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch"; - sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; - })]; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch"; + sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; + }) + ]; buildInputs = [ ocaml camlp5 ]; propagatedBuildInputs = [ num ]; @@ -47,9 +50,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Interactive theorem prover based on Higher-Order Logic"; - homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; - license = licenses.bsd2; - platforms = platforms.unix; + homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; + license = licenses.bsd2; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice maggesi vbgl ]; }; } diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix index 77db8ae3384..193f603656d 100644 --- a/pkgs/applications/science/logic/open-wbo/default.nix +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, zlib, gmp }: stdenv.mkDerivation { - name = "open-wbo-2.0"; + pname = "open-wbo"; + version = "2.0"; src = fetchFromGitHub { owner = "sat-group"; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 7fedca72b69..2f57fca9729 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -1,7 +1,8 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "prover9-2009-11a"; + pname = "prover9"; + version = "2009-11a"; src = fetchurl { url = "https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz"; @@ -40,6 +41,6 @@ stdenv.mkDerivation { the Otter Prover. This is the LADR command-line version. ''; platforms = lib.platforms.linux; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 43a2ec7e97e..05a7b63f556 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchgit, mlton }: stdenv.mkDerivation { - name = "redprl-2017-03-28"; + pname = "redprl"; + version = "unstable-2017-03-28"; + src = fetchgit { url = "https://github.com/RedPRL/sml-redprl.git"; rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b"; @@ -18,11 +20,11 @@ stdenv.mkDerivation { mkdir -p $out/bin mv ./bin/redprl $out/bin ''; - meta = { + meta = with lib; { description = "A proof assistant for Nominal Computational Type Theory"; homepage = "http://www.redprl.org/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.acowley ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ acowley ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index fe0ca1b3017..a509d70ed46 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, haskell, spass }: -stdenv.mkDerivation { - name = "system-for-automated-deduction-2.3.25"; +stdenv.mkDerivation rec { + pname = "system-for-automated-deduction"; + version = "2.3.25"; src = fetchurl { - url = "http://nevidal.org/download/sad-2.3-25.tar.gz"; + url = "http://nevidal.org/download/sad-${version}.tar.gz"; sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; }; buildInputs = [ haskell.compiler.ghc844 spass ]; @@ -15,7 +16,7 @@ stdenv.mkDerivation { ]; postPatch = '' substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt - ''; + ''; installPhase = '' mkdir -p $out/{bin,provers} install alice $out/bin @@ -23,18 +24,18 @@ stdenv.mkDerivation { substituteAll provers/provers.dat $out/provers/provers.dat substituteAll init.opt $out/init.opt cp -r examples $out - ''; + ''; inherit spass; meta = { description = "A program for automated proving of mathematical texts"; longDescription = '' The system for automated deduction is intended for automated processing of formal mathematical texts written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language - ''; + ''; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.schmitthenner ]; homepage = "http://nevidal.org/sad.en.html"; platforms = lib.platforms.linux; - broken = true; # ghc-8.4.4 is gone from Nixpkgs + broken = true; # ghc-8.4.4 is gone from Nixpkgs }; } diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index 02c4c134f92..6ce03008d3a 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, blas, gfortran, lapack }: -stdenv.mkDerivation { - name = "csdp-6.1.1"; +stdenv.mkDerivation rec { + pname = "csdp"; + version = "6.1.1"; src = fetchurl { - url = "https://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz"; + url = "https://www.coin-or.org/download/source/Csdp/Csdp-${version}.tgz"; sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05"; }; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 58b2a617bd6..808d89ef963 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchurl, ocamlPackages, makeWrapper -, libGLU, libGL, freeglut, mpfr, gmp +{ lib +, stdenv +, fetchurl +, ocamlPackages +, makeWrapper +, libGLU +, libGL +, freeglut +, mpfr +, gmp , pkgsHostTarget }: @@ -7,24 +15,32 @@ let inherit (pkgsHostTarget.targetPackages.stdenv) cc; in -stdenv.mkDerivation { - name = "glsurf-3.3.1"; +stdenv.mkDerivation rec { + pname = "glsurf"; + version = "3.3.1"; src = fetchurl { - url = "https://raffalli.eu/~christophe/glsurf/glsurf-3.3.1.tar.gz"; + url = "https://raffalli.eu/~christophe/glsurf/glsurf-${version}.tar.gz"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; nativeBuildInputs = [ makeWrapper ] ++ (with ocamlPackages; [ - ocaml findlib + ocaml + findlib ]); buildInputs = [ - freeglut libGL libGLU mpfr gmp + freeglut + libGL + libGLU + mpfr + gmp ] ++ (with ocamlPackages; [ - camlp4 lablgl camlimages_4_2_4 + camlp4 + lablgl + camlimages_4_2_4 ]); postPatch = '' diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 5c0de33a71a..3ddcd6206d6 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, gfortran, blas, lapack}: +{ lib, stdenv, fetchurl, gfortran, blas, lapack }: stdenv.mkDerivation rec { - name = "JAGS-4.3.0"; + pname = "JAGS"; + version = "4.3.0"; + src = fetchurl { - url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; + url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz"; sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; }; @@ -15,8 +17,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Just Another Gibbs Sampler"; - license = licenses.gpl2; - homepage = "http://mcmc-jags.sourceforge.net"; + license = licenses.gpl2; + homepage = "http://mcmc-jags.sourceforge.net"; maintainers = [ maintainers.andres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 88db3c4b2e9..90a7ada9950 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , coreutils , patchelf , requireFile @@ -22,11 +23,11 @@ let throw "Mathematica requires i686-linux or x86_64 linux"; in stdenv.mkDerivation rec { - - name = "mathematica-9.0.0"; + pname = "mathematica"; + version = "9.0.0"; src = requireFile { - name = "Mathematica_9.0.0_LINUX.sh"; + name = "Mathematica_${version}_LINUX.sh"; message = '' This nix expression requires that Mathematica_9.0.0_LINUX.sh is already part of the store. Find the file on your Mathematica CD @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ldpath = lib.makeLibraryPath buildInputs + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); + (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 588df51554a..6456608e7db 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl, zlib, gmp, ecm }: +{ lib, stdenv, fetchurl, zlib, gmp, ecm }: -stdenv.mkDerivation { - name = "msieve-1.53"; +stdenv.mkDerivation rec { + pname = "msieve"; + version = "1.53"; src = fetchurl { - url = "mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz"; + url = "mirror://sourceforge/msieve/msieve/Msieve%20v${version}/msieve${lib.replaceStrings ["."] [""] version}_src.tar.gz"; sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65"; }; diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index d53236d8070..4545203dacc 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { - name = "perseus-4-beta"; + pname = "perseus"; version = "4-beta"; nativeBuildInputs = [ unzip ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [erikryb]; + maintainers = with lib.maintainers; [ erikryb ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix index e46553d7b09..eb759723256 100644 --- a/pkgs/applications/science/math/ries/default.nix +++ b/pkgs/applications/science/math/ries/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchzip }: -stdenv.mkDerivation { - name = "ries-2018-04-11"; +stdenv.mkDerivation rec { + pname = "ries"; + version = "2018.04.11-1"; # upstream does not provide a stable link src = fetchzip { - url = "https://salsa.debian.org/debian/ries/-/archive/debian/2018.04.11-1/ries-debian-2018.04.11-1.zip"; + url = "https://salsa.debian.org/debian/ries/-/archive/debian/${version}/ries-debian-${version}.zip"; sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842"; }; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 731230130ca..a92920c5e79 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,9 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake -, eigen, opencv, ceres-solver, cgal, boost, vcg -, gmp, mpfr, glog, gflags, libjpeg_turbo }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, eigen +, opencv +, ceres-solver +, cgal +, boost +, vcg +, gmp +, mpfr +, glog +, gflags +, libjpeg_turbo +}: stdenv.mkDerivation { - name = "openmvs-unstable-2018-05-26"; + pname = "openmvs"; + version = "unstable-2018-05-26"; src = fetchFromGitHub { owner = "cdcseacave"; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index ed9d1852875..7d284d5eebb 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -10,7 +10,8 @@ let }; in stdenv.mkDerivation { - name = "vite-1.2pre${rev}"; + pname = "vite"; + version = "1.2pre${rev}"; src = fetchsvn { url = "svn://scm.gforge.inria.fr/svn/vite/trunk"; diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index c4f6362465f..2016d6afff7 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl, libextractor, gettext }: stdenv.mkDerivation rec { - name = "doodle-0.7.2"; + pname = "doodle"; + version = "0.7.2"; buildInputs = [ libextractor gettext ]; src = fetchurl { - url = "https://grothoff.org/christian/doodle/download/${name}.tar.gz"; + url = "https://grothoff.org/christian/doodle/download/doodle-${version}.tar.gz"; sha256 = "sha256-dtRPfUjhBNgN+5zHMYmszISmBv1+K6yjKsbQBiAXWRA="; }; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { homepage = "https://grothoff.org/christian/doodle/"; description = "Tool to quickly index and search documents on a computer"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index bd01b0843fb..c9f68ffc6bd 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -1,8 +1,20 @@ -{ lib, stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE -, freetype, pkg-config, which }: +{ lib +, stdenv +, fetchurl +, libX11 +, libXft +, libXi +, xorgproto +, libSM +, libICE +, freetype +, pkg-config +, which +}: -stdenv.mkDerivation { - name = "mrxvt-0.5.4"; +stdenv.mkDerivation rec { + pname = "mrxvt"; + version = "0.5.4"; buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; @@ -23,7 +35,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = "mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz"; + url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz"; sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; }; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix index b9c72c97d6d..9ecaffb185c 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, wmctrl }: stdenv.mkDerivation { - name = "urxvt-perl-2015-01-16"; + pname = "urxvt-perl"; + version = "unstable-2015-01-16"; src = fetchFromGitHub { owner = "effigies"; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix index 303555db722..d4a3b9a742a 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix @@ -2,7 +2,9 @@ stdenv.mkDerivation rec { rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; - name = "urxvt-theme-switch-2014-12-21_rev${builtins.substring 0 1 rev}"; + pname = "urxvt-theme-switch"; + version = "unstable-2014-12-21_rev${builtins.substring 0 1 rev}"; + dontPatchShebangs = true; src = fetchFromGitHub { diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix index 446126aad74..7d3d69122f6 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchgit, perl }: stdenv.mkDerivation { - - name = "rxvt-unicode-vtwheel-0.3.2"; + pname = "rxvt-unicode-vtwheel"; + version = "0.3.2"; src = fetchgit { - url = "https://aur.archlinux.org/urxvt-vtwheel.git"; - rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; - sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; + url = "https://aur.archlinux.org/urxvt-vtwheel.git"; + rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; + sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; }; installPhase = '' diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 2879b688c6a..9f039c4ab00 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, nano }: -stdenv.mkDerivation { - name = "cvs-1.12.13"; +stdenv.mkDerivation rec { + pname = "cvs"; + version = "1.12.13"; src = fetchurl { - url = "mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2"; + url = "mirror://savannah/cvs/source/feature/${version}/cvs-${version}.tar.bz2"; sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq"; }; diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index a1c63538220..b68179b182b 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -1,7 +1,8 @@ { fetchgit, lib, stdenv, perl }: -stdenv.mkDerivation { - name = "git2cl-20080827"; +stdenv.mkDerivation rec { + pname = "git2cl"; + version = "unstable-2008-08-27"; src = fetchgit { url = "git://repo.or.cz/git2cl.git"; diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 8f06050d090..6d6a3a4f988 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "subgit-3.3.11"; + pname = "subgit"; + version = "3.3.11"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "https://subgit.com/download/${name}.zip"; + url = "https://subgit.com/download/subgit-${version}.zip"; sha256 = "sha256-ltTpmXPCIGTmVDxKc6oelMEzQWXRbIf0NESzRugaXo0="; }; } diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index 541a2262f99..e3c48c5724f 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -1,25 +1,49 @@ -{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw -, bison, libtool, fontconfig, pango, gd, libwebp +{ lib +, stdenv +, fetchurl +, pkg-config +, xlibsWrapper +, libpng +, libjpeg +, expat +, libXaw +, bison +, libtool +, fontconfig +, pango +, gd +, libwebp }: stdenv.mkDerivation rec { - name = "graphviz-2.0"; + pname = "graphviz"; + version = "2.0"; src = fetchurl { - url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; + url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-${version}.tar.gz"; sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xlibsWrapper libpng libjpeg expat libXaw bison - libtool fontconfig pango gd libwebp + xlibsWrapper + libpng + libjpeg + expat + libXaw + bison + libtool + fontconfig + pango + gd + libwebp ]; hardeningDisable = [ "format" "fortify" ]; configureFlags = - [ "--with-pngincludedir=${libpng.dev}/include" + [ + "--with-pngincludedir=${libpng.dev}/include" "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index 6a9e910f801..36e9154571b 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -1,11 +1,11 @@ -{lib, stdenv, fetchurl, tcl, tk}: +{ lib, stdenv, fetchurl, tcl, tk }: -stdenv.mkDerivation -{ - name = "tkcvs-8.2.1"; +stdenv.mkDerivation rec { + pname = "tkcvs"; + version = "8.2.1"; src = fetchurl { - url = "mirror://sourceforge/tkcvs/tkcvs_8_2_1.tar.gz"; + url = "mirror://sourceforge/tkcvs/tkcvs_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; }; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 75d3cdbcc66..35138ec739f 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,13 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkg-config, faad2, faac, a52dec, alsa-lib, fftw, lame, libavc1394 -, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg -, libtiff, freetype, mjpegtools, x264, gettext, openexr -, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng -, libdv, libuuid, file, nasm, perl -, fontconfig, intltool }: +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, faad2 +, faac +, a52dec +, alsa-lib +, fftw +, lame +, libavc1394 +, libiec61883 +, libraw1394 +, libsndfile +, libvorbis +, libogg +, libjpeg +, libtiff +, freetype +, mjpegtools +, x264 +, gettext +, openexr +, libXext +, libXxf86vm +, libXv +, libXi +, libX11 +, libXft +, xorgproto +, libtheora +, libpng +, libdv +, libuuid +, file +, nasm +, perl +, fontconfig +, intltool +}: stdenv.mkDerivation { - name = "cinelerra-cv-2021-02-14"; + pname = "cinelerra-cv"; + version = "unstable-2021-02-14"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; @@ -30,12 +67,37 @@ stdenv.mkDerivation { nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ]; buildInputs = - [ faad2 faac - a52dec alsa-lib fftw lame libavc1394 libiec61883 - libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype - mjpegtools x264 gettext openexr - libXext libXxf86vm libXv libXi libX11 libXft xorgproto - libtheora libpng libdv libuuid + [ + faad2 + faac + a52dec + alsa-lib + fftw + lame + libavc1394 + libiec61883 + libraw1394 + libsndfile + libvorbis + libogg + libjpeg + libtiff + freetype + mjpegtools + x264 + gettext + openexr + libXext + libXxf86vm + libXv + libXi + libX11 + libXft + xorgproto + libtheora + libpng + libdv + libuuid nasm perl fontconfig diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 09289840030..7f57c79c5fe 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,11 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 -, SDL, automake, GConf }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, gtk2 +, libgnomeui +, libXv +, libraw1394 +, libdc1394 +, SDL +, automake +, GConf +}: -stdenv.mkDerivation { - name = "coriander-2.0.1"; +stdenv.mkDerivation rec { + pname = "coriander"; + version = "2.0.1"; src = fetchurl { - url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-2.0.1.tar.gz"; + url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-${version}.tar.gz"; sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5"; }; @@ -20,7 +33,7 @@ stdenv.mkDerivation { homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 502c4c69c3f..941b0808886 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,15 +1,28 @@ -{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkg-config -, flex, bison }: +{ lib +, stdenv +, fetchurl +, imagemagick +, libdvdread +, libxml2 +, freetype +, fribidi +, libpng +, zlib +, pkg-config +, flex +, bison +}: stdenv.mkDerivation rec { - name = "dvdauthor-0.7.1"; + pname = "dvdauthor"; + version = "0.7.1"; src = fetchurl { - url = "mirror://sourceforge/dvdauthor/${name}.tar.gz"; + url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz"; sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; }; - buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison]; + buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison ]; nativeBuildInputs = [ pkg-config ]; patches = [ diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 6a10aca398c..60604a4b8ab 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libdvdread }: stdenv.mkDerivation rec { - name = "lxdvdrip-1.76"; + pname = "lxdvdrip"; + version = "1.76"; src = fetchurl { - url = "mirror://sourceforge/lxdvdrip/${name}.tgz"; + url = "mirror://sourceforge/lxdvdrip/lxdvdrip-${version}.tgz"; sha256 = "0vgslc7dapfrbgslnaicc8bggdccyrvcgjv1dwi19qswhh7jkzj6"; }; diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index aa0f2404ab8..9f7e08a9ddf 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, libogg, libvorbis, libdvdread }: stdenv.mkDerivation rec { - name = "ogmtools-1.5"; + pname = "ogmtools"; + version = "1.5"; src = fetchurl { - url = "https://www.bunkus.org/videotools/ogmtools/${name}.tar.bz2"; + url = "https://www.bunkus.org/videotools/ogmtools/ogmtools-${version}.tar.bz2"; sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8"; }; - buildInputs = [libogg libvorbis libdvdread]; + buildInputs = [ libogg libvorbis libdvdread ]; meta = { description = "Tools for modifying and inspecting OGG media streams"; diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 3fe3dcf454a..f24a9914d0f 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -1,17 +1,24 @@ -{ lib, stdenv, fetchurl -, raspberrypifw, pcre, boost, freetype, zlib +{ lib +, stdenv +, fetchurl +, raspberrypifw +, pcre +, boost +, freetype +, zlib }: let ffmpeg = stdenv.mkDerivation rec { - name = "ffmpeg-1.1.3"; + pname = "ffmpeg"; + version = "1.1.3"; src = fetchurl { - url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; + url = "http://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; }; - configurePlatforms = []; + configurePlatforms = [ ]; configureFlags = [ "--arch=${stdenv.hostPlatform.parsed.cpu.name}" ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ @@ -61,10 +68,11 @@ let }; in stdenv.mkDerivation rec { - name = "omxplayer-20130328-fbee325dc2"; + pname = "omxplayer"; + version = "20130328-fbee325dc2"; src = fetchurl { url = "https://github.com/huceke/omxplayer/tarball/fbee325dc2"; - name = "${name}.tar.gz"; + name = "omxplayer-${version}.tar.gz"; sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg"; }; patchPhase = '' diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix index e115fbcdd04..1f0b424831b 100644 --- a/pkgs/applications/video/subdl/default.nix +++ b/pkgs/applications/video/subdl/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation { - name = "subdl-0.0pre.2017.11.06"; + pname = "subdl"; + version = "0.0pre.2017.11.06"; src = fetchFromGitHub { owner = "alexanderwink"; diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix index 70c3baa0b81..be0a7fcd241 100644 --- a/pkgs/applications/video/uvccapture/default.nix +++ b/pkgs/applications/video/uvccapture/default.nix @@ -8,11 +8,12 @@ let in -stdenv.mkDerivation { - name = "uvccapture-0.5"; +stdenv.mkDerivation rec { + pname = "uvccapture"; + version = "0.5"; src = fetchurl { - url = "mirror://debian/pool/main/u/uvccapture/uvccapture_0.5.orig.tar.gz"; + url = "mirror://debian/pool/main/u/uvccapture/uvccapture_${version}.orig.tar.gz"; sha256 = "1b3akkcmr3brbf93akr8xi20w8zqf2g0qfq928500wy04qi6jqpi"; }; diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index b046fbebaa2..d52feb8a66b 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , ncurses , libjpeg @@ -19,10 +20,11 @@ }: stdenv.mkDerivation rec { - name = "xawtv-3.107"; + pname = "xawtv"; + version = "3.107"; src = fetchurl { - url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; + url = "https://linuxtv.org/downloads/xawtv/xawtv-${version}.tar.bz2"; sha256 = "055p0wia0xsj073l8mg4ifa6m81dmv6p45qyh99brramq5iylfy5"; }; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index e0cca040987..06dc6bb465c 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,12 +1,26 @@ -{ lib, stdenv, fetchurl, perlPackages, pkg-config, gtk2 -, scrollkeeper, libglade, libXmu, libX11, libXext, gettext -, lame, libXfixes, libXdamage }: +{ lib +, stdenv +, fetchurl +, perlPackages +, pkg-config +, gtk2 +, scrollkeeper +, libglade +, libXmu +, libX11 +, libXext +, gettext +, lame +, libXfixes +, libXdamage +}: -stdenv.mkDerivation { - name = "xvidcap-1.1.7"; +stdenv.mkDerivation rec { + pname = "xvidcap"; + version = "1.1.7"; src = fetchurl { - url = "mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz"; + url = "mirror://sourceforge/xvidcap/xvidcap-${version}.tar.gz"; sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm"; }; @@ -14,8 +28,16 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - gtk2 scrollkeeper - libglade libXmu gettext lame libXdamage libXfixes libXext libX11 + gtk2 + scrollkeeper + libglade + libXmu + gettext + lame + libXdamage + libXfixes + libXext + libX11 ] ++ (with perlPackages; [ perl XMLParser ]); # !!! don't know why this is necessary @@ -24,7 +46,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Screencast video catpuring tool"; homepage = "http://xvidcap.sourceforge.net/"; - license = lib.licenses.gpl2; + license = licenses.gpl2; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index cf6395c8a53..7b9dc2de485 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchgit }: -stdenv.mkDerivation { - name = "win-pvdrivers-git-20150701"; - version = "20150701"; +stdenv.mkDerivation { + pname = "win-pvdrivers"; + version = "unstable-2015-07-01"; src = fetchgit { url = "https://github.com/ts468/win-pvdrivers"; @@ -12,13 +12,13 @@ stdenv.mkDerivation { buildPhase = let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/."; - in lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]); + in lib.concatStringsSep "\n" (map unpack [ "xenbus" "xeniface" "xenvif" "xennet" "xenvbd" ]); installPhase = '' mkdir -p $out cp -r x86 $out/. cp -r amd64 $out/. - ''; + ''; meta = with lib; { description = "Xen Subproject: Windows PV Driver"; diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index 7c1eb0055a3..a4cd8dacc44 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, p7zip }: -stdenv.mkDerivation { - name = "win-qemu-0.1.105-1"; +stdenv.mkDerivation rec { + pname = "win-qemu"; version = "0.1.105-1"; dontUnpack = true; src = fetchurl { - url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.105-1/virtio-win.iso"; + url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc"; }; buildPhase = '' ${p7zip}/bin/7z x $src - ''; + ''; installPhase = let @@ -23,10 +23,10 @@ stdenv.mkDerivation { mkdir -p $out/${arch}/qemuagent cp guest-agent/${if arch=="x86" then "qemu-ga-x86.msi" else "qemu-ga-x64.msi"} $out/${arch}/qemuagent/qemu-guest-agent.msi (cd $out/${arch}/qemuagent; ${p7zip}/bin/7z x qemu-guest-agent.msi; rm qemu-guest-agent.msi) - ''; + ''; copy = arch: version: (copy_pvpanic arch version) + (copy_pciserial arch) + (copy_agent arch); in - (copy "amd64" "w8.1") + (copy "x86" "w8.1"); + (copy "amd64" "w8.1") + (copy "x86" "w8.1"); meta = with lib; { description = "Windows QEMU Drivers"; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index e9ad3b86338..ef8ec062e4d 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -12,8 +12,8 @@ let }; in -stdenv.mkDerivation { - name = "gplpv-0.11.0.373"; +stdenv.mkDerivation { + pname = "gplpv"; version = "0.11.0.373"; dontUnpack = true; @@ -23,13 +23,13 @@ stdenv.mkDerivation { (cd x86; ${p7zip}/bin/7z e ${src_x86}) mkdir -p amd64 (cd amd64; ${p7zip}/bin/7z e ${src_amd64}) - ''; + ''; installPhase = '' mkdir -p $out/x86 $out/amd64 cp x86/* $out/x86/. cp amd64/* $out/amd64/. - ''; + ''; meta = with lib; { description = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation { Windows to be para-virtualized. The drivers are signed by Univention with a Software Publishers Certificate obtained from the VeriSign CA. - ''; + ''; homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 8ac00d1f8e1..c7a3620d644 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, meson, ninja, fetchFromGitHub, nixosTests }: stdenv.mkDerivation { - name = "qboot-20200423"; + pname = "qboot"; + version = "unstable-2020-04-23"; src = fetchFromGitHub { owner = "bonzini"; @@ -26,6 +27,6 @@ stdenv.mkDerivation { homepage = "https://github.com/bonzini/qboot"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ tstrobel ]; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index 84380bfc9d8..df7521cd2c4 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, pkg-config, libX11, libXft, libXinerama, libXpm }: -stdenv.mkDerivation { - name = "dzen2-0.9.5"; +stdenv.mkDerivation rec { + pname = "dzen2"; + version = "0.9.5"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXft libXinerama libXpm ]; src = fetchurl { - url = "https://github.com/robm/dzen/tarball/master/dzen2-0.9.5git.tar.gz"; + url = "https://github.com/robm/dzen/tarball/master/dzen2-${version}git.tar.gz"; sha256 = "d4f7943cd39dc23fd825eb684b49dc3484860fa8443d30b06ee38af72a53b556"; }; diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index 94562cd0d22..c11d3d6b14d 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -1,16 +1,30 @@ -{ lib, stdenv, fetchurl, libX11, libXext, libXrandr, libXrender, - xorgproto, patches ? [] }: +{ lib +, stdenv +, fetchurl +, libX11 +, libXext +, libXrandr +, libXrender +, xorgproto +, patches ? [ ] +}: stdenv.mkDerivation rec { - name = "evilwm-1.1.1"; + pname = "evilwm"; + version = "1.1.1"; src = fetchurl { - url = "http://www.6809.org.uk/evilwm/${name}.tar.gz"; + url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz"; sha256 = "79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a"; }; - buildInputs = [ libX11 libXext libXrandr libXrender - xorgproto ]; + buildInputs = [ + libX11 + libXext + libXrandr + libXrender + xorgproto + ]; prePatch = ''substituteInPlace ./Makefile --replace /usr $out \ --replace "CC = gcc" "#CC = gcc"''; @@ -27,7 +41,7 @@ stdenv.mkDerivation rec { fullName = "Custom, inherited from aewm and 9wm"; url = "http://www.6809.org.uk/evilwm/"; free = true; - }; # like BSD/MIT, but Share-Alike'y; See README. + }; # like BSD/MIT, but Share-Alike'y; See README. maintainers = with maintainers; [ amiloradovsky ]; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 7e42a8efd7e..7275d664468 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -1,10 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk -, i3lock-color, getopt, fontconfig +{ lib +, stdenv +, fetchFromGitHub +, coreutils +, scrot +, imagemagick +, gawk +, i3lock-color +, getopt +, fontconfig }: stdenv.mkDerivation rec { rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; - name = "i3lock-fancy-unstable-2018-11-25_rev${builtins.substring 0 7 rev}"; + pname = "i3lock-fancy"; + version = "unstable-2018-11-25_rev${builtins.substring 0 7 rev}"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 8e9cb2d2b76..bbbad532d09 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { - name = "i3status-2.13"; + pname = "i3status"; + version = "2.13"; src = fetchurl { - url = "https://i3wm.org/i3status/${name}.tar.bz2"; + url = "https://i3wm.org/i3status/i3status-${version}.tar.bz2"; sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff"; }; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 8f172ac8700..cdea6969dd9 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: -stdenv.mkDerivation { - name = "ion-3-20090110"; +stdenv.mkDerivation rec { + name = "ion"; + version = "3-20090110"; meta = { description = "Tiling tabbed window manager designed with keyboard users in mind"; homepage = "http://modeemi.fi/~tuomov/ion"; @@ -9,7 +10,7 @@ stdenv.mkDerivation { license = lib.licenses.lgpl21; }; src = fetchurl { - url = "http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz"; + url = "http://tuomov.iki.fi/software/dl/ion-${version}.tar.gz"; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; buildInputs = [ xlibsWrapper lua gettext groff ]; diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index e9d400378e6..ce212b1c682 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }: -stdenv.mkDerivation { - name = "larswm-7.5.3"; +stdenv.mkDerivation rec { + pname = "larswm"; + version = "7.5.3"; src = fetchurl { - url = "mirror://sourceforge/larswm/larswm-7.5.3.tar.gz"; + url = "mirror://sourceforge/larswm/larswm-${version}.tar.gz"; sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v"; }; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 2eeae7f4da5..938092bb8ab 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -1,9 +1,10 @@ -{lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [] }: +{ lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [ ] }: with lib; stdenv.mkDerivation { - name = "tabbed-20180310"; + name = "tabbed"; + version = "unstable-20180310"; src = fetchgit { url = "https://git.suckless.org/tabbed"; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index c210b39fe18..6be3a33ac0b 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, gtk2 }: stdenv.mkDerivation rec { - name = "trayer-1.1.8"; + pname = "trayer"; + version = "1.1.8"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gdk-pixbuf gtk2 ]; @@ -9,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sargon"; repo = "trayer-srg"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg"; }; diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 9eea18f79d6..7c47eb9c4d9 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -1,11 +1,21 @@ -{lib, stdenv, fetchurl, ncurses, pkg-config, glib, libviper, libpseudo, gpm, -libvterm}: +{ lib +, stdenv +, fetchurl +, ncurses +, pkg-config +, glib +, libviper +, libpseudo +, gpm +, libvterm +}: stdenv.mkDerivation rec { - name = "vwm-2.1.3"; + pname = "vwm"; + version = "2.1.3"; src = fetchurl { - url = "mirror://sourceforge/vwm/${name}.tar.gz"; + url = "mirror://sourceforge/vwm/vwm-${version}.tar.gz"; sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf"; }; |