b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pkgs/applications: rename name to pname&version part 2

Browse source
This commit is contained in:
Felix Buehler 2021-11-07 14:50:48 +01:00
parent 54ef803bf8
commit b52ab3b712
68 changed files with 605 additions and 301 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/misc/procmail/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "procmail-3.22"; pname = "procmail";
version = "3.22";
patches = [ patches = [
./CVE-2014-3618.patch ./CVE-2014-3618.patch
@ -15,17 +16,17 @@ stdenv.mkDerivation {
# getline is defined differently in glibc now. So rename it. # getline is defined differently in glibc now. So rename it.
# Without the .PHONY target "make install" won't install anything on Darwin. # Without the .PHONY target "make install" won't install anything on Darwin.
postPatch = '' postPatch = ''
sed -e "s%^RM.*$%#%" -i Makefile sed -e "s%^RM.*$%#%" -i Makefile
sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile
sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile
sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h
sed -e "3i\ sed -e "3i\
.PHONY: install .PHONY: install
" -i Makefile " -i Makefile
''; '';
src = fetchurl { 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"; sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08";
}; };

4
pkgs/applications/misc/rofi-menugen/default.nix
View file

@ -2,7 +2,9 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "168efd2608fdb88b1aff3e0244bda8402169f207"; 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 { src = fetchFromGitHub {
owner = "octotep"; owner = "octotep";
repo = "menugen"; repo = "menugen";

11
pkgs/applications/misc/xfontsel/default.nix
View file

@ -2,17 +2,18 @@
# at https://www.x.org/releases/individual/. # at https://www.x.org/releases/individual/.
# That is why this expression is not inside pkgs.xorg # 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 { stdenv.mkDerivation rec {
name = "xfontsel-1.0.6"; pname = "xfontsel";
version = "1.0.6";
src = fetchurl { src = fetchurl {
url = "mirror://xorg/individual/app/${name}.tar.bz2"; url = "mirror://xorg/individual/app/xfontsel-${version}.tar.bz2";
sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5";
}; };
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [libX11 libXaw]; buildInputs = [ libX11 libXaw ];
# Without this, it gets Xmu as a dependency, but without rpath entry # Without this, it gets Xmu as a dependency, but without rpath entry
NIX_LDFLAGS = "-lXmu"; NIX_LDFLAGS = "-lXmu";
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.x.org/"; homepage = "https://www.x.org/";
description = "Allows testing the fonts available in an X server"; description = "Allows testing the fonts available in an X server";
license = lib.licenses.free; license = lib.licenses.free;
maintainers = with lib.maintainers; [viric]; maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux ++ darwin; platforms = with lib.platforms; linux ++ darwin;
}; };
} }

28
pkgs/applications/misc/xxkb/default.nix
View file

@ -1,21 +1,37 @@
{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep { lib
, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkg-config , stdenv
, fetchurl
, libX11
, libXt
, libXext
, libXpm
, imake
, gccmakedep
, svgSupport ? false
, librsvg
, glib
, gdk-pixbuf
, pkg-config
}: }:
assert svgSupport -> 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 { stdenv.mkDerivation rec {
name = "xxkb-1.11.1"; pname = "xxkb";
version = "1.11.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/xxkb/${name}-src.tar.gz"; url = "mirror://sourceforge/xxkb/xxkb-${version}-src.tar.gz";
sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf";
}; };
nativeBuildInputs = [ imake gccmakedep ]; nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ buildInputs = [
libX11 libXt libXext libXpm libX11
libXt
libXext
libXpm
] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ];
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];

7
pkgs/applications/office/keepnote/default.nix
View file

@ -1,11 +1,12 @@
{ lib, fetchurl, python2Packages }: { lib, fetchurl, python2Packages }:
python2Packages.buildPythonApplication { python2Packages.buildPythonApplication rec {
name = "keepnote-0.7.8"; pname = "keepnote";
version = "0.7.8";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
url = "http://keepnote.org/download/keepnote-0.7.8.tar.gz"; url = "http://keepnote.org/download/keepnote-${version}.tar.gz";
sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh";
}; };

14
pkgs/applications/office/tagainijisho/default.nix
View file

@ -1,9 +1,11 @@
{ lib, stdenv, fetchurl, qt4, cmake, sqlite }: { lib, stdenv, fetchurl, qt4, cmake, sqlite }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "tagainijisho-1.0.3"; pname = "tagainijisho";
version = "1.0.3";
src = fetchurl { 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"; sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg";
}; };
@ -14,8 +16,10 @@ stdenv.mkDerivation {
description = "A free, open-source Japanese dictionary and kanji lookup tool"; description = "A free, open-source Japanese dictionary and kanji lookup tool";
homepage = "https://www.tagaini.net/"; homepage = "https://www.tagaini.net/";
license = with licenses; [ license = with licenses; [
/* program */ gpl3Plus /* program */
/* data */ cc-by-sa-30 gpl3Plus
/* data */
cc-by-sa-30
]; ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ vbgl ]; maintainers = with maintainers; [ vbgl ];

3
pkgs/applications/radio/kalibrate-hackrf/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, hackrf, libusb1 }: { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, hackrf, libusb1 }:
stdenv.mkDerivation { 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. # There are no tags/releases, so use the latest commit from git master.
# Currently, the latest commit is from 2016-07-03. # Currently, the latest commit is from 2016-07-03.

3
pkgs/applications/radio/kalibrate-rtl/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }: { lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }:
stdenv.mkDerivation { 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. # There are no tags/releases, so use the latest commit from git master.
# Currently, the latest commit is from 2013-12-14. # Currently, the latest commit is from 2013-12-14.

5
pkgs/applications/science/astronomy/gravit/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: { lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gravit-0.5.1"; pname = "gravit";
version = "0.5.1";
src = fetchurl { src = fetchurl {
url = "https://gravit.slowchop.com/media/downloads/${name}.tgz"; url = "https://gravit.slowchop.com/media/downloads/gravit-${version}.tgz";
sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
}; };

15
pkgs/applications/science/biology/cmtk/default.nix
View file

@ -1,11 +1,12 @@
{lib, stdenv, fetchurl, cmake}: { lib, stdenv, fetchurl, cmake }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "cmtk-3.3.1"; pname = "cmtk";
version = "3.3.1";
src = fetchurl { src = fetchurl {
name = "cmtk-source.tar.gz"; 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"; sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs";
}; };
@ -14,13 +15,13 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
meta = with lib; { meta = with lib; {
description = "Computational Morphometry Toolkit "; description = "Computational Morphometry Toolkit ";
longDescription = ''A software toolkit for computational morphometry of longDescription = ''A software toolkit for computational morphometry of
biomedical images, CMTK comprises a set of command line tools and a biomedical images, CMTK comprises a set of command line tools and a
back-end general-purpose library for processing and I/O''; back-end general-purpose library for processing and I/O'';
maintainers = with maintainers; [ tbenst ]; maintainers = with maintainers; [ tbenst ];
platforms = platforms.all; platforms = platforms.all;
license = licenses.gpl3; license = licenses.gpl3;
homepage = "https://www.nitrc.org/projects/cmtk/"; homepage = "https://www.nitrc.org/projects/cmtk/";
}; };
} }

9
pkgs/applications/science/biology/diamond/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, cmake, zlib }: { lib, stdenv, fetchurl, cmake, zlib }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "diamond-0.8.36"; pname = "diamond";
version = "0.8.36";
src = fetchurl { 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"; sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh";
}; };
@ -30,7 +31,7 @@ stdenv.mkDerivation {
B. Buchfink, Xie C., D. Huson, B. Buchfink, Xie C., D. Huson,
"Fast and sensitive protein alignment using DIAMOND", "Fast and sensitive protein alignment using DIAMOND",
Nature Methods 12, 59-60 (2015). Nature Methods 12, 59-60 (2015).
''; '';
homepage = "https://github.com/bbuchfink/diamond"; homepage = "https://github.com/bbuchfink/diamond";
license = { license = {
fullName = "University of Tuebingen, Benjamin Buchfink"; fullName = "University of Tuebingen, Benjamin Buchfink";

5
pkgs/applications/science/biology/ecopcr/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, gcc, zlib, python27 }: { lib, stdenv, fetchurl, gcc, zlib, python27 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ecopcr-0.8.0"; pname = "ecopcr";
version = "0.8.0";
src = fetchurl { 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"; sha256 = "10c58hj25z78jh0g3zcbx4890yd2qrvaaanyx8mn9p49mmyf5pk6";
}; };

16
pkgs/applications/science/biology/emboss/default.nix
View file

@ -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 { 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"; sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e";
}; };
@ -16,13 +18,13 @@ stdenv.mkDerivation {
''; '';
meta = { 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 longDescription = ''EMBOSS is a free Open Source software analysis package
specially developed for the needs of the molecular biology (e.g. EMBnet) specially developed for the needs of the molecular biology (e.g. EMBnet)
user community, including libraries. The software automatically copes with user community, including libraries. The software automatically copes with
data in a variety of formats and even allows transparent retrieval of data in a variety of formats and even allows transparent retrieval of
sequence data from the web.''; sequence data from the web.'';
license = lib.licenses.gpl2; license = lib.licenses.gpl2;
homepage = "http://emboss.sourceforge.net/"; homepage = "http://emboss.sourceforge.net/";
}; };
} }

71
pkgs/applications/science/biology/iv/default.nix
View file

@ -1,32 +1,43 @@
{ lib, stdenv, fetchurl, neuron-version { lib
, libX11, libXext, patchelf , stdenv
, fetchurl
, neuron-version
, libX11
, libXext
, patchelf
}: }:
stdenv.mkDerivation rec stdenv.mkDerivation rec {
{ name = "iv-19"; pname = "iv";
src = fetchurl version = "19";
{ url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz";
sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; src = fetchurl {
}; url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/iv-${version}.tar.gz";
nativeBuildInputs = [ patchelf ]; sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx";
buildInputs = [ libXext ]; };
propagatedBuildInputs = [ libX11 ];
hardeningDisable = [ "format" ]; nativeBuildInputs = [ patchelf ];
postInstall = '' buildInputs = [ libXext ];
for dir in $out/*; do # */ propagatedBuildInputs = [ libX11 ];
if [ -d $dir/lib ]; then
mv $dir/* $out # */ hardeningDisable = [ "format" ];
rmdir $dir
break postInstall = ''
fi for dir in $out/*; do # */
done if [ -d $dir/lib ]; then
'' + lib.optionalString stdenv.isLinux '' mv $dir/* $out # */
patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so rmdir $dir
''; break
meta = with lib; fi
{ description = "InterViews graphical library for Neuron"; done
license = licenses.bsd3; '' + lib.optionalString stdenv.isLinux ''
homepage = "http://www.neuron.yale.edu/neuron"; patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so
platforms = platforms.all; '';
};
} meta = with lib; {
description = "InterViews graphical library for Neuron";
license = licenses.bsd3;
homepage = "http://www.neuron.yale.edu/neuron";
platforms = platforms.all;
};
}

5
pkgs/applications/science/chemistry/avogadro/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: { lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "avogadro-1.1.1"; pname = "avogadro";
version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/avogadro/${name}.tar.bz2"; url = "mirror://sourceforge/avogadro/avogadro-${version}.tar.bz2";
sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy";
}; };

7
pkgs/applications/science/electronics/archimedes/default.nix
View file

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl}: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "archimedes-2.0.1"; pname = "archimedes";
version = "2.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/archimedes/${name}.tar.gz"; url = "mirror://gnu/archimedes/archimedes-${version}.tar.gz";
sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z"; sha256 = "0jfpnd3pns5wxcxbiw49v5sgpmm5b4v8s4q1a5292hxxk2hzmb3z";
}; };

5
pkgs/applications/science/electronics/qfsm/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: { lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qfsm-0.54.0"; pname = "qfsm";
version = "0.54.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/qfsm/${name}-Source.tar.bz2"; url = "mirror://sourceforge/qfsm/qfsm-${version}-Source.tar.bz2";
sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb";
}; };

5
pkgs/applications/science/electronics/tkgate/1.x.nix
View file

@ -5,10 +5,11 @@ let
libiconvLib = lib.optionalString stdenv.isLinux "${glibc.out}/lib"; libiconvLib = lib.optionalString stdenv.isLinux "${glibc.out}/lib";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tkgate-1.8.7"; pname = "tkgate";
version = "1.8.7";
src = fetchurl { src = fetchurl {
url = "http://www.tkgate.org/downloads/${name}.tgz"; url = "http://www.tkgate.org/downloads/tkgate-${version}.tgz";
sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs"; sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs";
}; };

7
pkgs/applications/science/geometry/tetgen/1.4.nix
View file

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl}: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tetgen-1.4.3"; pname = "tetgen";
version = "1.4.3";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/files/tetgen1.4.3.tar.gz"; url = "${meta.homepage}/files/tetgen${version}.tar.gz";
sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm"; sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm";
}; };

3
pkgs/applications/science/logic/aspino/default.nix
View file

@ -8,7 +8,8 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "aspino-unstable-2017-03-09"; pname = "aspino";
version = "unstable-2017-03-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alviano"; owner = "alviano";

7
pkgs/applications/science/logic/gappa/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, gmp, mpfr, boost }: { lib, stdenv, fetchurl, gmp, mpfr, boost }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gappa-1.4.0"; pname = "gappa";
version = "1.4.0";
src = fetchurl { 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"; sha256 = "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb";
}; };

35
pkgs/applications/science/logic/hol_light/default.nix
View file

@ -3,11 +3,11 @@
let let
load_num = load_num =
if num == null then "" else if num == null then "" else
'' ''
-I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \ -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/top-num \
-I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
''; '';
start_script = start_script =
'' ''
@ -21,19 +21,22 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "hol_light-2019-10-06"; pname = "hol_light";
version = "unstable-2019-10-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jrh13"; owner = "jrh13";
repo = "hol-light"; repo = "hol-light";
rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e";
sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6";
}; };
patches = [(fetchpatch { patches = [
url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch"; (fetchpatch {
sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; 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 ]; buildInputs = [ ocaml camlp5 ];
propagatedBuildInputs = [ num ]; propagatedBuildInputs = [ num ];
@ -47,9 +50,9 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "Interactive theorem prover based on Higher-Order Logic"; description = "Interactive theorem prover based on Higher-Order Logic";
homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/";
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice maggesi vbgl ]; maintainers = with maintainers; [ thoughtpolice maggesi vbgl ];
}; };
} }

3
pkgs/applications/science/logic/open-wbo/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, zlib, gmp }: { lib, stdenv, fetchFromGitHub, zlib, gmp }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "open-wbo-2.0"; pname = "open-wbo";
version = "2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sat-group"; owner = "sat-group";

7
pkgs/applications/science/logic/prover9/default.nix
View file

@ -1,7 +1,8 @@
{lib, stdenv, fetchurl}: { lib, stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "prover9-2009-11a"; pname = "prover9";
version = "2009-11a";
src = fetchurl { src = fetchurl {
url = "https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz"; 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. the Otter Prover. This is the LADR command-line version.
''; '';
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = []; maintainers = [ ];
}; };
} }

12
pkgs/applications/science/logic/redprl/default.nix
View file

@ -1,6 +1,8 @@
{ lib, stdenv, fetchgit, mlton }: { lib, stdenv, fetchgit, mlton }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "redprl-2017-03-28"; pname = "redprl";
version = "unstable-2017-03-28";
src = fetchgit { src = fetchgit {
url = "https://github.com/RedPRL/sml-redprl.git"; url = "https://github.com/RedPRL/sml-redprl.git";
rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b"; rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b";
@ -18,11 +20,11 @@ stdenv.mkDerivation {
mkdir -p $out/bin mkdir -p $out/bin
mv ./bin/redprl $out/bin mv ./bin/redprl $out/bin
''; '';
meta = { meta = with lib; {
description = "A proof assistant for Nominal Computational Type Theory"; description = "A proof assistant for Nominal Computational Type Theory";
homepage = "http://www.redprl.org/"; homepage = "http://www.redprl.org/";
license = lib.licenses.mit; license = licenses.mit;
maintainers = [ lib.maintainers.acowley ]; maintainers = with maintainers; [ acowley ];
platforms = lib.platforms.unix; platforms = platforms.unix;
}; };
} }

15
pkgs/applications/science/logic/sad/default.nix
View file

@ -1,9 +1,10 @@
{ lib, stdenv, fetchurl, haskell, spass }: { lib, stdenv, fetchurl, haskell, spass }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "system-for-automated-deduction-2.3.25"; pname = "system-for-automated-deduction";
version = "2.3.25";
src = fetchurl { src = fetchurl {
url = "http://nevidal.org/download/sad-2.3-25.tar.gz"; url = "http://nevidal.org/download/sad-${version}.tar.gz";
sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b";
}; };
buildInputs = [ haskell.compiler.ghc844 spass ]; buildInputs = [ haskell.compiler.ghc844 spass ];
@ -15,7 +16,7 @@ stdenv.mkDerivation {
]; ];
postPatch = '' postPatch = ''
substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/{bin,provers} mkdir -p $out/{bin,provers}
install alice $out/bin install alice $out/bin
@ -23,18 +24,18 @@ stdenv.mkDerivation {
substituteAll provers/provers.dat $out/provers/provers.dat substituteAll provers/provers.dat $out/provers/provers.dat
substituteAll init.opt $out/init.opt substituteAll init.opt $out/init.opt
cp -r examples $out cp -r examples $out
''; '';
inherit spass; inherit spass;
meta = { meta = {
description = "A program for automated proving of mathematical texts"; description = "A program for automated proving of mathematical texts";
longDescription = '' longDescription = ''
The system for automated deduction is intended for automated processing of formal mathematical texts 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 written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language
''; '';
license = lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.schmitthenner ]; maintainers = [ lib.maintainers.schmitthenner ];
homepage = "http://nevidal.org/sad.en.html"; homepage = "http://nevidal.org/sad.en.html";
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
broken = true; # ghc-8.4.4 is gone from Nixpkgs broken = true; # ghc-8.4.4 is gone from Nixpkgs
}; };
} }

7
pkgs/applications/science/math/csdp/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, blas, gfortran, lapack }: { lib, stdenv, fetchurl, blas, gfortran, lapack }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "csdp-6.1.1"; pname = "csdp";
version = "6.1.1";
src = fetchurl { 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"; sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05";
}; };

32
pkgs/applications/science/math/glsurf/default.nix
View file

@ -1,5 +1,13 @@
{ lib, stdenv, fetchurl, ocamlPackages, makeWrapper { lib
, libGLU, libGL, freeglut, mpfr, gmp , stdenv
, fetchurl
, ocamlPackages
, makeWrapper
, libGLU
, libGL
, freeglut
, mpfr
, gmp
, pkgsHostTarget , pkgsHostTarget
}: }:
@ -7,24 +15,32 @@ let
inherit (pkgsHostTarget.targetPackages.stdenv) cc; inherit (pkgsHostTarget.targetPackages.stdenv) cc;
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "glsurf-3.3.1"; pname = "glsurf";
version = "3.3.1";
src = fetchurl { 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"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
] ++ (with ocamlPackages; [ ] ++ (with ocamlPackages; [
ocaml findlib ocaml
findlib
]); ]);
buildInputs = [ buildInputs = [
freeglut libGL libGLU mpfr gmp freeglut
libGL
libGLU
mpfr
gmp
] ++ (with ocamlPackages; [ ] ++ (with ocamlPackages; [
camlp4 lablgl camlimages_4_2_4 camlp4
lablgl
camlimages_4_2_4
]); ]);
postPatch = '' postPatch = ''

12
pkgs/applications/science/math/jags/default.nix
View file

@ -1,9 +1,11 @@
{lib, stdenv, fetchurl, gfortran, blas, lapack}: { lib, stdenv, fetchurl, gfortran, blas, lapack }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "JAGS-4.3.0"; pname = "JAGS";
version = "4.3.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz";
sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica";
}; };
@ -15,8 +17,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Just Another Gibbs Sampler"; description = "Just Another Gibbs Sampler";
license = licenses.gpl2; license = licenses.gpl2;
homepage = "http://mcmc-jags.sourceforge.net"; homepage = "http://mcmc-jags.sourceforge.net";
maintainers = [ maintainers.andres ]; maintainers = [ maintainers.andres ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

11
pkgs/applications/science/math/mathematica/9.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, coreutils , coreutils
, patchelf , patchelf
, requireFile , requireFile
@ -22,11 +23,11 @@ let
throw "Mathematica requires i686-linux or x86_64 linux"; throw "Mathematica requires i686-linux or x86_64 linux";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mathematica";
name = "mathematica-9.0.0"; version = "9.0.0";
src = requireFile { src = requireFile {
name = "Mathematica_9.0.0_LINUX.sh"; name = "Mathematica_${version}_LINUX.sh";
message = '' message = ''
This nix expression requires that Mathematica_9.0.0_LINUX.sh is This nix expression requires that Mathematica_9.0.0_LINUX.sh is
already part of the store. Find the file on your Mathematica CD already part of the store. Find the file on your Mathematica CD
@ -61,7 +62,7 @@ stdenv.mkDerivation rec {
ldpath = lib.makeLibraryPath buildInputs ldpath = lib.makeLibraryPath buildInputs
+ lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux")
(":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs);
phases = "unpackPhase installPhase fixupPhase"; phases = "unpackPhase installPhase fixupPhase";

9
pkgs/applications/science/math/msieve/default.nix
View file

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl, zlib, gmp, ecm }: { lib, stdenv, fetchurl, zlib, gmp, ecm }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "msieve-1.53"; pname = "msieve";
version = "1.53";
src = fetchurl { 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"; sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65";
}; };

4
pkgs/applications/science/math/perseus/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, unzip }: { lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "perseus-4-beta"; pname = "perseus";
version = "4-beta"; version = "4-beta";
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
@ -34,7 +34,7 @@ stdenv.mkDerivation {
''; '';
homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html"; homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html";
license = lib.licenses.gpl3; license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [erikryb]; maintainers = with lib.maintainers; [ erikryb ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} }

7
pkgs/applications/science/math/ries/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchzip }: { lib, stdenv, fetchzip }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "ries-2018-04-11"; pname = "ries";
version = "2018.04.11-1";
# upstream does not provide a stable link # upstream does not provide a stable link
src = fetchzip { 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"; sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842";
}; };

23
pkgs/applications/science/misc/openmvs/default.nix
View file

@ -1,9 +1,24 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake { lib
, eigen, opencv, ceres-solver, cgal, boost, vcg , stdenv
, gmp, mpfr, glog, gflags, libjpeg_turbo }: , fetchFromGitHub
, pkg-config
, cmake
, eigen
, opencv
, ceres-solver
, cgal
, boost
, vcg
, gmp
, mpfr
, glog
, gflags
, libjpeg_turbo
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "openmvs-unstable-2018-05-26"; pname = "openmvs";
version = "unstable-2018-05-26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cdcseacave"; owner = "cdcseacave";

3
pkgs/applications/science/misc/vite/default.nix
View file

@ -10,7 +10,8 @@ let
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "vite-1.2pre${rev}"; pname = "vite";
version = "1.2pre${rev}";
src = fetchsvn { src = fetchsvn {
url = "svn://scm.gforge.inria.fr/svn/vite/trunk"; url = "svn://scm.gforge.inria.fr/svn/vite/trunk";

7
pkgs/applications/search/doodle/default.nix
View file

@ -1,12 +1,13 @@
{ lib, stdenv, fetchurl, libextractor, gettext }: { lib, stdenv, fetchurl, libextractor, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "doodle-0.7.2"; pname = "doodle";
version = "0.7.2";
buildInputs = [ libextractor gettext ]; buildInputs = [ libextractor gettext ];
src = fetchurl { 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="; sha256 = "sha256-dtRPfUjhBNgN+5zHMYmszISmBv1+K6yjKsbQBiAXWRA=";
}; };
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
homepage = "https://grothoff.org/christian/doodle/"; homepage = "https://grothoff.org/christian/doodle/";
description = "Tool to quickly index and search documents on a computer"; description = "Tool to quickly index and search documents on a computer";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [viric]; maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;
}; };
} }

22
pkgs/applications/terminal-emulators/mrxvt/default.nix
View file

@ -1,8 +1,20 @@
{ lib, stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE { lib
, freetype, pkg-config, which }: , stdenv
, fetchurl
, libX11
, libXft
, libXi
, xorgproto
, libSM
, libICE
, freetype
, pkg-config
, which
}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "mrxvt-0.5.4"; pname = "mrxvt";
version = "0.5.4";
buildInputs = buildInputs =
[ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ];
@ -23,7 +35,7 @@ stdenv.mkDerivation {
''; '';
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz"; url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz";
sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl";
}; };

3
pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, wmctrl }: { lib, stdenv, fetchFromGitHub, wmctrl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "urxvt-perl-2015-01-16"; pname = "urxvt-perl";
version = "unstable-2015-01-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "effigies"; owner = "effigies";

4
pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
View file

@ -2,7 +2,9 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; 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; dontPatchShebangs = true;
src = fetchFromGitHub { src = fetchFromGitHub {

10
pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchgit, perl }: { lib, stdenv, fetchgit, perl }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "rxvt-unicode-vtwheel";
name = "rxvt-unicode-vtwheel-0.3.2"; version = "0.3.2";
src = fetchgit { src = fetchgit {
url = "https://aur.archlinux.org/urxvt-vtwheel.git"; url = "https://aur.archlinux.org/urxvt-vtwheel.git";
rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; rev = "36d3e861664aeae36a45f96100f10f8fe2218035";
sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7";
}; };
installPhase = '' installPhase = ''

7
pkgs/applications/version-management/cvs/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, fetchpatch, nano }: { lib, stdenv, fetchurl, fetchpatch, nano }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "cvs-1.12.13"; pname = "cvs";
version = "1.12.13";
src = fetchurl { 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"; sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq";
}; };

5
pkgs/applications/version-management/git-and-tools/git2cl/default.nix
View file

@ -1,7 +1,8 @@
{ fetchgit, lib, stdenv, perl }: { fetchgit, lib, stdenv, perl }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "git2cl-20080827"; pname = "git2cl";
version = "unstable-2008-08-27";
src = fetchgit { src = fetchgit {
url = "git://repo.or.cz/git2cl.git"; url = "git://repo.or.cz/git2cl.git";

5
pkgs/applications/version-management/git-and-tools/subgit/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }: { lib, stdenv, fetchurl, unzip, makeWrapper, jre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "subgit-3.3.11"; pname = "subgit";
version = "3.3.11";
meta = { meta = {
description = "A tool for a smooth, stress-free SVN to Git migration"; description = "A tool for a smooth, stress-free SVN to Git migration";
@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
''; '';
src = fetchurl { src = fetchurl {
url = "https://subgit.com/download/${name}.zip"; url = "https://subgit.com/download/subgit-${version}.zip";
sha256 = "sha256-ltTpmXPCIGTmVDxKc6oelMEzQWXRbIf0NESzRugaXo0="; sha256 = "sha256-ltTpmXPCIGTmVDxKc6oelMEzQWXRbIf0NESzRugaXo0=";
}; };
} }

38
pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
View file

@ -1,25 +1,49 @@
{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw { lib
, bison, libtool, fontconfig, pango, gd, libwebp , stdenv
, fetchurl
, pkg-config
, xlibsWrapper
, libpng
, libjpeg
, expat
, libXaw
, bison
, libtool
, fontconfig
, pango
, gd
, libwebp
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "graphviz-2.0"; pname = "graphviz";
version = "2.0";
src = fetchurl { 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"; sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
xlibsWrapper libpng libjpeg expat libXaw bison xlibsWrapper
libtool fontconfig pango gd libwebp libpng
libjpeg
expat
libXaw
bison
libtool
fontconfig
pango
gd
libwebp
]; ];
hardeningDisable = [ "format" "fortify" ]; hardeningDisable = [ "format" "fortify" ];
configureFlags = configureFlags =
[ "--with-pngincludedir=${libpng.dev}/include" [
"--with-pngincludedir=${libpng.dev}/include"
"--with-pnglibdir=${libpng.out}/lib" "--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpegincludedir=${libjpeg.dev}/include"
"--with-jpeglibdir=${libjpeg.out}/lib" "--with-jpeglibdir=${libjpeg.out}/lib"

10
pkgs/applications/version-management/tkcvs/default.nix
View file

@ -1,11 +1,11 @@
{lib, stdenv, fetchurl, tcl, tk}: { lib, stdenv, fetchurl, tcl, tk }:
stdenv.mkDerivation stdenv.mkDerivation rec {
{ pname = "tkcvs";
name = "tkcvs-8.2.1"; version = "8.2.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tkcvs/tkcvs_8_2_1.tar.gz"; url = "mirror://sourceforge/tkcvs/tkcvs_${lib.replaceStrings ["."] ["_"] version}.tar.gz";
sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i";
}; };

90
pkgs/applications/video/cinelerra/default.nix
View file

@ -1,13 +1,50 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool { lib
, pkg-config, faad2, faac, a52dec, alsa-lib, fftw, lame, libavc1394 , stdenv
, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , fetchFromGitHub
, libtiff, freetype, mjpegtools, x264, gettext, openexr , autoconf
, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng , automake
, libdv, libuuid, file, nasm, perl , libtool
, fontconfig, intltool }: , 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 { stdenv.mkDerivation {
name = "cinelerra-cv-2021-02-14"; pname = "cinelerra-cv";
version = "unstable-2021-02-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cinelerra-cv-team"; owner = "cinelerra-cv-team";
@ -30,12 +67,37 @@ stdenv.mkDerivation {
nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ]; nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ];
buildInputs = buildInputs =
[ faad2 faac [
a52dec alsa-lib fftw lame libavc1394 libiec61883 faad2
libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype faac
mjpegtools x264 gettext openexr a52dec
libXext libXxf86vm libXv libXi libX11 libXft xorgproto alsa-lib
libtheora libpng libdv libuuid 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 nasm
perl perl
fontconfig fontconfig

25
pkgs/applications/video/coriander/default.nix
View file

@ -1,11 +1,24 @@
{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 { lib
, SDL, automake, GConf }: , stdenv
, fetchurl
, pkg-config
, glib
, gtk2
, libgnomeui
, libXv
, libraw1394
, libdc1394
, SDL
, automake
, GConf
}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "coriander-2.0.1"; pname = "coriander";
version = "2.0.1";
src = fetchurl { 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"; sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5";
}; };
@ -20,7 +33,7 @@ stdenv.mkDerivation {
homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; homepage = "https://damien.douxchamps.net/ieee1394/coriander/";
description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; description = "GUI for controlling a Digital Camera through the IEEE1394 bus";
license = lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [viric]; maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;
}; };
} }

23
pkgs/applications/video/dvdauthor/default.nix
View file

@ -1,15 +1,28 @@
{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkg-config { lib
, flex, bison }: , stdenv
, fetchurl
, imagemagick
, libdvdread
, libxml2
, freetype
, fribidi
, libpng
, zlib
, pkg-config
, flex
, bison
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dvdauthor-0.7.1"; pname = "dvdauthor";
version = "0.7.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/dvdauthor/${name}.tar.gz"; url = "mirror://sourceforge/dvdauthor/dvdauthor-${version}.tar.gz";
sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; 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 ]; nativeBuildInputs = [ pkg-config ];
patches = [ patches = [

5
pkgs/applications/video/lxdvdrip/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libdvdread }: { lib, stdenv, fetchurl, libdvdread }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lxdvdrip-1.76"; pname = "lxdvdrip";
version = "1.76";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/lxdvdrip/${name}.tgz"; url = "mirror://sourceforge/lxdvdrip/lxdvdrip-${version}.tgz";
sha256 = "0vgslc7dapfrbgslnaicc8bggdccyrvcgjv1dwi19qswhh7jkzj6"; sha256 = "0vgslc7dapfrbgslnaicc8bggdccyrvcgjv1dwi19qswhh7jkzj6";
}; };

7
pkgs/applications/video/ogmtools/default.nix
View file

@ -1,14 +1,15 @@
{ lib, stdenv, fetchurl, libogg, libvorbis, libdvdread }: { lib, stdenv, fetchurl, libogg, libvorbis, libdvdread }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ogmtools-1.5"; pname = "ogmtools";
version = "1.5";
src = fetchurl { 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"; sha256 = "1spx81p5wf59ksl3r3gvf78d77sh7gj8a6lw773iv67bphfivmn8";
}; };
buildInputs = [libogg libvorbis libdvdread]; buildInputs = [ libogg libvorbis libdvdread ];
meta = { meta = {
description = "Tools for modifying and inspecting OGG media streams"; description = "Tools for modifying and inspecting OGG media streams";

22
pkgs/applications/video/omxplayer/default.nix
View file

@ -1,17 +1,24 @@
{ lib, stdenv, fetchurl { lib
, raspberrypifw, pcre, boost, freetype, zlib , stdenv
, fetchurl
, raspberrypifw
, pcre
, boost
, freetype
, zlib
}: }:
let let
ffmpeg = stdenv.mkDerivation rec { ffmpeg = stdenv.mkDerivation rec {
name = "ffmpeg-1.1.3"; pname = "ffmpeg";
version = "1.1.3";
src = fetchurl { src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; url = "http://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j";
}; };
configurePlatforms = []; configurePlatforms = [ ];
configureFlags = [ configureFlags = [
"--arch=${stdenv.hostPlatform.parsed.cpu.name}" "--arch=${stdenv.hostPlatform.parsed.cpu.name}"
] ++ lib.optionals stdenv.hostPlatform.isAarch32 [ ] ++ lib.optionals stdenv.hostPlatform.isAarch32 [
@ -61,10 +68,11 @@ let
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "omxplayer-20130328-fbee325dc2"; pname = "omxplayer";
version = "20130328-fbee325dc2";
src = fetchurl { src = fetchurl {
url = "https://github.com/huceke/omxplayer/tarball/fbee325dc2"; url = "https://github.com/huceke/omxplayer/tarball/fbee325dc2";
name = "${name}.tar.gz"; name = "omxplayer-${version}.tar.gz";
sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg"; sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg";
}; };
patchPhase = '' patchPhase = ''

3
pkgs/applications/video/subdl/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, python3 }: { lib, stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "subdl-0.0pre.2017.11.06"; pname = "subdl";
version = "0.0pre.2017.11.06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexanderwink"; owner = "alexanderwink";

7
pkgs/applications/video/uvccapture/default.nix
View file

@ -8,11 +8,12 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "uvccapture-0.5"; pname = "uvccapture";
version = "0.5";
src = fetchurl { 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"; sha256 = "1b3akkcmr3brbf93akr8xi20w8zqf2g0qfq928500wy04qi6jqpi";
}; };

8
pkgs/applications/video/xawtv/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchurl , fetchurl
, ncurses , ncurses
, libjpeg , libjpeg
@ -19,10 +20,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xawtv-3.107"; pname = "xawtv";
version = "3.107";
src = fetchurl { src = fetchurl {
url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; url = "https://linuxtv.org/downloads/xawtv/xawtv-${version}.tar.bz2";
sha256 = "055p0wia0xsj073l8mg4ifa6m81dmv6p45qyh99brramq5iylfy5"; sha256 = "055p0wia0xsj073l8mg4ifa6m81dmv6p45qyh99brramq5iylfy5";
}; };

40
pkgs/applications/video/xvidcap/default.nix
View file

@ -1,12 +1,26 @@
{ lib, stdenv, fetchurl, perlPackages, pkg-config, gtk2 { lib
, scrollkeeper, libglade, libXmu, libX11, libXext, gettext , stdenv
, lame, libXfixes, libXdamage }: , fetchurl
, perlPackages
, pkg-config
, gtk2
, scrollkeeper
, libglade
, libXmu
, libX11
, libXext
, gettext
, lame
, libXfixes
, libXdamage
}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "xvidcap-1.1.7"; pname = "xvidcap";
version = "1.1.7";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz"; url = "mirror://sourceforge/xvidcap/xvidcap-${version}.tar.gz";
sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm"; sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm";
}; };
@ -14,8 +28,16 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
gtk2 scrollkeeper gtk2
libglade libXmu gettext lame libXdamage libXfixes libXext libX11 scrollkeeper
libglade
libXmu
gettext
lame
libXdamage
libXfixes
libXext
libX11
] ++ (with perlPackages; [ perl XMLParser ]); ] ++ (with perlPackages; [ perl XMLParser ]);
# !!! don't know why this is necessary # !!! don't know why this is necessary
@ -24,7 +46,7 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "Screencast video catpuring tool"; description = "Screencast video catpuring tool";
homepage = "http://xvidcap.sourceforge.net/"; homepage = "http://xvidcap.sourceforge.net/";
license = lib.licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

10
pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchgit }: { lib, stdenv, fetchgit }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "win-pvdrivers-git-20150701"; pname = "win-pvdrivers";
version = "20150701"; version = "unstable-2015-07-01";
src = fetchgit { src = fetchgit {
url = "https://github.com/ts468/win-pvdrivers"; url = "https://github.com/ts468/win-pvdrivers";
@ -12,13 +12,13 @@ stdenv.mkDerivation {
buildPhase = 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}/."; 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 = '' installPhase = ''
mkdir -p $out mkdir -p $out
cp -r x86 $out/. cp -r x86 $out/.
cp -r amd64 $out/. cp -r amd64 $out/.
''; '';
meta = with lib; { meta = with lib; {
description = "Xen Subproject: Windows PV Driver"; description = "Xen Subproject: Windows PV Driver";

12
pkgs/applications/virtualization/driver/win-qemu/default.nix
View file

@ -1,19 +1,19 @@
{ lib, stdenv, fetchurl, p7zip }: { lib, stdenv, fetchurl, p7zip }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "win-qemu-0.1.105-1"; pname = "win-qemu";
version = "0.1.105-1"; version = "0.1.105-1";
dontUnpack = true; dontUnpack = true;
src = fetchurl { 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"; sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc";
}; };
buildPhase = '' buildPhase = ''
${p7zip}/bin/7z x $src ${p7zip}/bin/7z x $src
''; '';
installPhase = installPhase =
let let
@ -23,10 +23,10 @@ stdenv.mkDerivation {
mkdir -p $out/${arch}/qemuagent 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 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) (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); copy = arch: version: (copy_pvpanic arch version) + (copy_pciserial arch) + (copy_agent arch);
in in
(copy "amd64" "w8.1") + (copy "x86" "w8.1"); (copy "amd64" "w8.1") + (copy "x86" "w8.1");
meta = with lib; { meta = with lib; {
description = "Windows QEMU Drivers"; description = "Windows QEMU Drivers";

10
pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
View file

@ -12,8 +12,8 @@ let
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gplpv-0.11.0.373"; pname = "gplpv";
version = "0.11.0.373"; version = "0.11.0.373";
dontUnpack = true; dontUnpack = true;
@ -23,13 +23,13 @@ stdenv.mkDerivation {
(cd x86; ${p7zip}/bin/7z e ${src_x86}) (cd x86; ${p7zip}/bin/7z e ${src_x86})
mkdir -p amd64 mkdir -p amd64
(cd amd64; ${p7zip}/bin/7z e ${src_amd64}) (cd amd64; ${p7zip}/bin/7z e ${src_amd64})
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/x86 $out/amd64 mkdir -p $out/x86 $out/amd64
cp x86/* $out/x86/. cp x86/* $out/x86/.
cp amd64/* $out/amd64/. cp amd64/* $out/amd64/.
''; '';
meta = with lib; { meta = with lib; {
description = '' description = ''
@ -37,7 +37,7 @@ stdenv.mkDerivation {
Windows to be para-virtualized. Windows to be para-virtualized.
The drivers are signed by Univention with a Software Publishers The drivers are signed by Univention with a Software Publishers
Certificate obtained from the VeriSign CA. Certificate obtained from the VeriSign CA.
''; '';
homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers";
maintainers = [ maintainers.tstrobel ]; maintainers = [ maintainers.tstrobel ];
platforms = platforms.linux; platforms = platforms.linux;

5
pkgs/applications/virtualization/qboot/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, meson, ninja, fetchFromGitHub, nixosTests }: { lib, stdenv, meson, ninja, fetchFromGitHub, nixosTests }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "qboot-20200423"; pname = "qboot";
version = "unstable-2020-04-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bonzini"; owner = "bonzini";
@ -26,6 +27,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/bonzini/qboot"; homepage = "https://github.com/bonzini/qboot";
license = lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ tstrobel ]; maintainers = with lib.maintainers; [ tstrobel ];
platforms = ["x86_64-linux" "i686-linux"]; platforms = [ "x86_64-linux" "i686-linux" ];
}; };
} }

7
pkgs/applications/window-managers/dzen2/default.nix
View file

@ -1,13 +1,14 @@
{ lib, stdenv, fetchurl, pkg-config, libX11, libXft, libXinerama, libXpm }: { lib, stdenv, fetchurl, pkg-config, libX11, libXft, libXinerama, libXpm }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "dzen2-0.9.5"; pname = "dzen2";
version = "0.9.5";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXft libXinerama libXpm ]; buildInputs = [ libX11 libXft libXinerama libXpm ];
src = fetchurl { 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"; sha256 = "d4f7943cd39dc23fd825eb684b49dc3484860fa8443d30b06ee38af72a53b556";
}; };

28
pkgs/applications/window-managers/evilwm/default.nix
View file

@ -1,16 +1,30 @@
{ lib, stdenv, fetchurl, libX11, libXext, libXrandr, libXrender, { lib
xorgproto, patches ? [] }: , stdenv
, fetchurl
, libX11
, libXext
, libXrandr
, libXrender
, xorgproto
, patches ? [ ]
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "evilwm-1.1.1"; pname = "evilwm";
version = "1.1.1";
src = fetchurl { 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"; sha256 = "79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a";
}; };
buildInputs = [ libX11 libXext libXrandr libXrender buildInputs = [
xorgproto ]; libX11
libXext
libXrandr
libXrender
xorgproto
];
prePatch = ''substituteInPlace ./Makefile --replace /usr $out \ prePatch = ''substituteInPlace ./Makefile --replace /usr $out \
--replace "CC = gcc" "#CC = gcc"''; --replace "CC = gcc" "#CC = gcc"'';
@ -27,7 +41,7 @@ stdenv.mkDerivation rec {
fullName = "Custom, inherited from aewm and 9wm"; fullName = "Custom, inherited from aewm and 9wm";
url = "http://www.6809.org.uk/evilwm/"; url = "http://www.6809.org.uk/evilwm/";
free = true; free = true;
}; # like BSD/MIT, but Share-Alike'y; See README. }; # like BSD/MIT, but Share-Alike'y; See README.
maintainers = with maintainers; [ amiloradovsky ]; maintainers = with maintainers; [ amiloradovsky ];
platforms = platforms.all; platforms = platforms.all;

15
pkgs/applications/window-managers/i3/lock-fancy.nix
View file

@ -1,10 +1,19 @@
{ lib, stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk { lib
, i3lock-color, getopt, fontconfig , stdenv
, fetchFromGitHub
, coreutils
, scrot
, imagemagick
, gawk
, i3lock-color
, getopt
, fontconfig
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; 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 { src = fetchFromGitHub {
owner = "meskarune"; owner = "meskarune";
repo = "i3lock-fancy"; repo = "i3lock-fancy";

5
pkgs/applications/window-managers/i3/status.nix
View file

@ -1,10 +1,11 @@
{ fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: { fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "i3status-2.13"; pname = "i3status";
version = "2.13";
src = fetchurl { src = fetchurl {
url = "https://i3wm.org/i3status/${name}.tar.bz2"; url = "https://i3wm.org/i3status/i3status-${version}.tar.bz2";
sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff"; sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff";
}; };

7
pkgs/applications/window-managers/ion-3/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }: { lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "ion-3-20090110"; name = "ion";
version = "3-20090110";
meta = { meta = {
description = "Tiling tabbed window manager designed with keyboard users in mind"; description = "Tiling tabbed window manager designed with keyboard users in mind";
homepage = "http://modeemi.fi/~tuomov/ion"; homepage = "http://modeemi.fi/~tuomov/ion";
@ -9,7 +10,7 @@ stdenv.mkDerivation {
license = lib.licenses.lgpl21; license = lib.licenses.lgpl21;
}; };
src = fetchurl { 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"; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
}; };
buildInputs = [ xlibsWrapper lua gettext groff ]; buildInputs = [ xlibsWrapper lua gettext groff ];

7
pkgs/applications/window-managers/larswm/default.nix
View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }: { lib, stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "larswm-7.5.3"; pname = "larswm";
version = "7.5.3";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/larswm/larswm-7.5.3.tar.gz"; url = "mirror://sourceforge/larswm/larswm-${version}.tar.gz";
sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v"; sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v";
}; };

5
pkgs/applications/window-managers/tabbed/default.nix
View file

@ -1,9 +1,10 @@
{lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [] }: { lib, stdenv, fetchgit, xorgproto, libX11, libXft, customConfig ? null, patches ? [ ] }:
with lib; with lib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tabbed-20180310"; name = "tabbed";
version = "unstable-20180310";
src = fetchgit { src = fetchgit {
url = "https://git.suckless.org/tabbed"; url = "https://git.suckless.org/tabbed";

5
pkgs/applications/window-managers/trayer/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, gtk2 }: { lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, gtk2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "trayer-1.1.8"; pname = "trayer";
version = "1.1.8";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ gdk-pixbuf gtk2 ]; buildInputs = [ gdk-pixbuf gtk2 ];
@ -9,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sargon"; owner = "sargon";
repo = "trayer-srg"; repo = "trayer-srg";
rev = name; rev = "${pname}-${version}";
sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg"; sha256 = "1mvhwaqa9bng9wh3jg3b7y8gl7nprbydmhg963xg0r076jyzv0cg";
}; };

18
pkgs/applications/window-managers/vwm/default.nix
View file

@ -1,11 +1,21 @@
{lib, stdenv, fetchurl, ncurses, pkg-config, glib, libviper, libpseudo, gpm, { lib
libvterm}: , stdenv
, fetchurl
, ncurses
, pkg-config
, glib
, libviper
, libpseudo
, gpm
, libvterm
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vwm-2.1.3"; pname = "vwm";
version = "2.1.3";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/vwm/${name}.tar.gz"; url = "mirror://sourceforge/vwm/vwm-${version}.tar.gz";
sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf"; sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf";
}; };