From 808962fe31b2a144274e2bf0eeb2bee0eb538c82 Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Tue, 29 Oct 2013 17:14:53 +0100 Subject: Attempt at compiling MilkyTracker, but recent zlib version may have broken it. There's a zlib version included with milkytracker, but there's no makefiles for it. I've only included the header here, but it fails at link-time with several 'undefined reference' errors, which simply means it can't find the definitions, e.g. compiled zlib. There's bug reports on other package systems although unfortunately still unresolved. https://bugs.archlinux.org/task/31324 http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082180.html --- pkgs/applications/audio/milkytracker/default.nix | 49 ++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/applications/audio/milkytracker/default.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix new file mode 100644 index 000000000000..c0ce0058ba42 --- /dev/null +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, alsaLib, SDL, automake, autoconf, perl}: + +stdenv.mkDerivation rec { + version = "0.90.85"; + name = "milkytracker-${version}"; + + src = fetchurl { + url = "http://milkytracker.org/files/milkytracker-0.90.85.tar.gz"; + sha256 = "184pk0k9nv461a61sh6lb62wfadjwwk8ri3z5kpdbqnyssz0zfpv"; + }; + + # Get two official patches. + no_zzip_patch = fetchurl { + url = "http://www.milkytracker.org/files/patches-0.90.85/no_zziplib_dep.patch"; + sha256 = "1w550q7pxa7w6v2v19ljk03hayacrs6y887izg11a1983wk7qzb3"; + }; + + fix_64bit_patch = fetchurl { + url = "http://www.milkytracker.org/files/patches-0.90.85/64bit_freebsd_fix.patch"; + sha256 = "0gwd4zslbd8kih80k4v7n2c65kvm2cq3kl6d7y33z1l007vzyvf6"; + }; + + preConfigure = '' + patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch} + patch < ${no_zzip_patch} + ''; + + # There's a zlib version included with milkytracker, + # but there's no makefiles for it. I've only included + # the header here, but it fails at link-time with + # several 'undefined reference' errors, which simply + # means it can't find the definitions, e.g. compiled + # zlib. + # There's bug reports on other package systems although + # unfortunately still unresolved. + # https://bugs.archlinux.org/task/31324 + # http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082180.html + preBuild='' + export CPATH="`pwd`/src/compression/zlib/generic" + ''; + + buildInputs = [ alsaLib SDL automake autoconf perl]; + + meta = { + description = "Music tracker application, similar to Fasttracker II."; + homepage = http://milkytracker.org; + license = "GPLv3"; + }; +} -- cgit 1.4.1 From 39525c52d8540a2e4103e09a7fde4553cec9be25 Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Wed, 30 Oct 2013 00:00:46 +0100 Subject: MilkyTracker: fix build, use system zlib and decompressor patch Also add JACK support --- .../audio/milkytracker/decompressor_gzip.patch | 20 +++++++++++++++++++ pkgs/applications/audio/milkytracker/default.nix | 23 +++++++--------------- 2 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/audio/milkytracker/decompressor_gzip.patch (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/milkytracker/decompressor_gzip.patch b/pkgs/applications/audio/milkytracker/decompressor_gzip.patch new file mode 100644 index 000000000000..c64421116dea --- /dev/null +++ b/pkgs/applications/audio/milkytracker/decompressor_gzip.patch @@ -0,0 +1,20 @@ +https://bugs.archlinux.org/task/31324 +https://410333.bugs.gentoo.org/attachment.cgi?id=322456 + +diff -ur src.old/compression/DecompressorGZIP.cpp src/compression/DecompressorGZIP.cpp +--- src.old/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200 ++++ src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200 +@@ -57,11 +57,11 @@ + + bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint) + { +- gzFile *gz_input_file = NULL; ++ gzFile gz_input_file = NULL; + int len = 0; + pp_uint8 *buf; + +- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL) ++ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL) + return false; + + if ((buf = new pp_uint8[0x10000]) == NULL) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index c0ce0058ba42..3a464fb9fdb9 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, SDL, automake, autoconf, perl}: +{ stdenv, fetchurl, alsaLib, SDL, automake, autoconf, jackaudio, perl, zlib, zziplib }: stdenv.mkDerivation rec { version = "0.90.85"; @@ -20,26 +20,17 @@ stdenv.mkDerivation rec { sha256 = "0gwd4zslbd8kih80k4v7n2c65kvm2cq3kl6d7y33z1l007vzyvf6"; }; - preConfigure = '' - patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch} - patch < ${no_zzip_patch} + patchPhase = '' + patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch} + patch < ${no_zzip_patch} + patch ./src/compression/DecompressorGZIP.cpp < ${./decompressor_gzip.patch} ''; - # There's a zlib version included with milkytracker, - # but there's no makefiles for it. I've only included - # the header here, but it fails at link-time with - # several 'undefined reference' errors, which simply - # means it can't find the definitions, e.g. compiled - # zlib. - # There's bug reports on other package systems although - # unfortunately still unresolved. - # https://bugs.archlinux.org/task/31324 - # http://lists.freebsd.org/pipermail/freebsd-ports/2013-March/082180.html preBuild='' - export CPATH="`pwd`/src/compression/zlib/generic" + export CPATH=${zlib}/lib ''; - buildInputs = [ alsaLib SDL automake autoconf perl]; + buildInputs = [ alsaLib SDL automake autoconf jackaudio perl zlib zziplib ]; meta = { description = "Music tracker application, similar to Fasttracker II."; -- cgit 1.4.1 From 9f6f87f76aed81c5d51a87d6934755d5dc4816a2 Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Wed, 30 Oct 2013 00:07:18 +0100 Subject: MilkyTracker: Tidy up, sort buildInputs and use the attrPath for the license --- pkgs/applications/audio/milkytracker/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 3a464fb9fdb9..8cbf85306b66 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, alsaLib, SDL, automake, autoconf, jackaudio, perl, zlib, zziplib }: +{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jackaudio, perl +, zlib, zziplib +}: stdenv.mkDerivation rec { version = "0.90.85"; @@ -30,11 +32,11 @@ stdenv.mkDerivation rec { export CPATH=${zlib}/lib ''; - buildInputs = [ alsaLib SDL automake autoconf jackaudio perl zlib zziplib ]; + buildInputs = [ SDL alsaLib autoconf automake jackaudio perl zlib zziplib ]; meta = { description = "Music tracker application, similar to Fasttracker II."; homepage = http://milkytracker.org; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3Plus; }; } -- cgit 1.4.1 From cd1605f729a651a03bb27f9d443c04c04a016150 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 10:53:44 +0100 Subject: maxima: update to version 5.31.3 --- pkgs/applications/science/math/maxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index b8f7f2e65b66..2c85a1c97d17 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.31.2"; + version = "5.31.3"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "12j5irwfckl5583h7lwh0wrp0c65q7mqzcsri2v086j50xvvv398"; + sha256 = "1g959569plywqaxxp488ylblgkirqg24arwa93dplfxi4h7fc4km"; }; buildInputs = [sbcl texinfo perl makeWrapper]; -- cgit 1.4.1 From dac108f51ba2eff7e5fdcc425879c53ee79ddd6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 16:33:54 +0100 Subject: ikiwiki: update to version 3.20130904 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index baf97e7a8247..b8bf0f38d104 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20130518"; + version = "3.20130904.1"; lib = stdenv.lib; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "00mmxxlbzv6bz3cz3746r5lqwby6liwsg7m3jfba8258y52w13qp"; + sha256 = "1nxycsz49y6801lbrvazzg7qc9q2vpr2ny1sba26f9gwc00c650h"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate -- cgit 1.4.1 From 576058fe0e6d2188a5f3ed9bc2506dd1a09f6ad4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Nov 2013 17:41:52 +0100 Subject: haskell-git-annex: update to version 4.20131101 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index e32a7dc52b9b..394e7580771e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20131024"; - sha256 = "1a4mrx8zr5znhcy2cszv5ri9avqj7lcn467nmaj172f00vn4fd5x"; + version = "4.20131101"; + sha256 = "0fm7bkd8rxcagrmn28a1fq8fidda4xb1arj6wi9ds7prc50ajlgw"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 8487fdd2091953e626a9f560e34359973352b482 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sat, 2 Nov 2013 18:05:16 +0100 Subject: mathematica: fix x86 build of mathematica the MathInstaller doesn't distinguish between 64bit and 32bit linux platforms. --- pkgs/applications/science/math/mathematica/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index cedb491cc8b9..997080ee303c 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -18,10 +18,8 @@ let platform = - if stdenv.system == "i686-linux" then + if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then "Linux" - else if stdenv.system == "x86_64-linux" then - "Linux-x86-64" else throw "Mathematica requires i686-linux or x86_64 linux"; in -- cgit 1.4.1 From 795753bbc6ceece3fabcdcaca24010f62538b77c Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Tue, 29 Oct 2013 11:33:46 +0100 Subject: quodlibet: update to version 2.6.3 also provides two distinctive flavours, which either wrap the program to pull in the gstreamer plugins or not. --- pkgs/applications/audio/quodlibet/default.nix | 34 ++++++++++++++++++--------- pkgs/top-level/all-packages.nix | 6 +++++ 2 files changed, 29 insertions(+), 11 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 9f4859d6e070..c865314cb175 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,11 +1,18 @@ { stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject -, pythonDBus, gst_python, gst_plugins_base, gst_plugins_good, gst_plugins_ugly }: +, pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null +, gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }: -let version = "2.5"; in +assert withGstPlugins -> gst_plugins_base != null + || gst_plugins_good != null + || gst_plugins_ugly != null + || gst_plugins_bad != null; + +let version = "2.6.3"; in buildPythonPackage { # call the package quodlibet and just quodlibet - name = "quodlibet-${version}"; + name = "quodlibet-${version}" + + stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"; namePrefix = ""; # XXX, tests fail @@ -13,12 +20,12 @@ buildPythonPackage { src = [ (fetchurl { - url = "https://quodlibet.googlecode.com/files/quodlibet-${version}.tar.gz"; - sha256 = "0qrmlz7m1jpmriy8bgycjiwzbf3annznkn4x5k32yy9bylxa7lwb"; + url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz"; + sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z"; }) (fetchurl { - url = "https://quodlibet.googlecode.com/files/quodlibet-plugins-${version}.tar.gz"; - sha256 = "0kf2mkq2zk38626bn48gscvy6ir04f5b2z57ahlxlqy8imv2cjff"; + url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz"; + sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc"; }) ]; @@ -30,19 +37,23 @@ buildPythonPackage { ''; patches = [ ./quodlibet-package-plugins.patch ]; - buildInputs = [ - gst_plugins_base gst_plugins_good gst_plugins_ugly + buildInputs = stdenv.lib.optionals withGstPlugins [ + gst_plugins_base gst_plugins_good gst_plugins_ugly gst_plugins_bad ]; propagatedBuildInputs = [ mutagen pygtk pygobject pythonDBus gst_python ]; - postInstall = '' + postInstall = stdenv.lib.optionalString withGstPlugins '' # Wrap quodlibet so it finds the GStreamer plug-ins wrapProgram "$out/bin/quodlibet" --prefix \ GST_PLUGIN_PATH ":" \ - "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_plugins_ugly}/lib/gstreamer-0.10" + ${ stdenv.lib.concatStringsSep ":" + (map (s: s+"/lib/gstreamer-0.10") + (stdenv.lib.filter (s: s != null) [ + gst_plugins_base gst_plugins_good gst_plugins_ugly gst_plugins_bad + ])) } ''; meta = { @@ -62,6 +73,7 @@ buildPythonPackage { & internet radio, and all major audio formats. ''; + maintainer = [ stdenv.lib.maintainers.coroa ]; homepage = http://code.google.com/p/quodlibet/; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be392278df6..8ed314daf40d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8561,6 +8561,12 @@ let inherit (pythonPackages) mutagen; }; + quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet { + inherit (pythonPackages) mutagen; + withGstPlugins = true; + gst_plugins_bad = null; + }; + rakarrack = callPackage ../applications/audio/rakarrack { inherit (xorg) libXpm libXft; fltk = fltk13; -- cgit 1.4.1 From 8274bd331aa17e660a8f31ac0e2cafa634eb857e Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Sun, 3 Nov 2013 01:03:45 +0100 Subject: redshift: add platforms --- pkgs/applications/misc/redshift/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 3bed6e1a2d76..ae983aedc679 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pyxdg}/lib/${python.libPrefix}/site-packages/pyxdg:$out/lib/${python.libPrefix}/site-packages ''; - meta = { + meta = with stdenv.lib; { description = "changes the color temperature of your screen gradually"; longDescription = '' The color temperature is set according to the position of the @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { ''; license = "GPLv3+"; homepage = "http://jonls.dk/redshift"; + platforms = platforms.linux; }; } -- cgit 1.4.1 From b232825c07b6dbb4b16f37c4a53f170f79374176 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 18:42:28 +0100 Subject: adobe-reader: Update to 9.5.5 --- pkgs/applications/misc/adobe-reader/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 46ccdb399467..a186f5f5ee0d 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -3,7 +3,7 @@ assert stdenv.system == "i686-linux"; -let version = "9.5.1"; in +let version = "9.5.5"; in stdenv.mkDerivation { name = "adobe-reader-${version}-1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${version}/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2"; - sha256 = "19mwhbfsivb21zmrz2hllf0kh4i225ac697y026bakyysn0vig56"; + sha256 = "0h35misxrqkl5zlmmvray1bqf4ywczkm89n9qw7d9arqbg3aj3pf"; }; # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16cf42d5de79..d3a32b2c6b32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7334,7 +7334,7 @@ let abook = callPackage ../applications/misc/abook { }; - adobeReader = callPackage_i686 ../applications/misc/adobe-reader { }; + adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { }; aewan = callPackage ../applications/editors/aewan { }; @@ -10240,9 +10240,9 @@ let LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib export LD_LIBRARY_PATH ''; - }; + }; - patoline = PatolineEnv ocamlPackages_4_00_1; + patoline = PatolineEnv ocamlPackages_4_00_1; znc = callPackage ../applications/networking/znc { }; @@ -10264,4 +10264,9 @@ let mg = callPackage ../applications/editors/mg { }; + + # Attributes for backward compatibility. + adobeReader = adobe-reader; + + }; in pkgs -- cgit 1.4.1 From d6d2de4147b8d0a19f6d70751d46eb405a2779b5 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 4 Nov 2013 22:55:13 +0400 Subject: Add qvim - an experimental Qt gui for Vim vim-qt has the most complete set of Ctrl-Alt-Meta binding functionality. For example, qvim is able to correctly bind keys like Alt-. More: https://bitbucket.org/equalsraf/vim-qt/wiki/Features --- pkgs/applications/editors/vim/qvim.nix | 133 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 +++ 2 files changed, 144 insertions(+) create mode 100644 pkgs/applications/editors/vim/qvim.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix new file mode 100644 index 000000000000..85c177f31bce --- /dev/null +++ b/pkgs/applications/editors/vim/qvim.nix @@ -0,0 +1,133 @@ +args@{...}: with args; + + +let inherit (args.composableDerivation) composableDerivation edf; in +composableDerivation { + # use gccApple to compile on darwin + mkDerivation = ( if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv ).mkDerivation; +} (fix: { + + name = "qvim-7.4"; + + enableParallelBuilding = true; # test this + + src = fetchgit { + url = https://bitbucket.org/equalsraf/vim-qt.git ; + rev = "4160bfd5c1380e899d2f426b494fc4f1cf6ae85e"; + sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b"; + }; + + preConfigure = assert (! stdenv.isDarwin); ""; + # # if darwin support is enabled, we want to make sure we're not building with + # # OS-installed python framework + # preConfigure + # = stdenv.lib.optionalString + # (stdenv.isDarwin && (config.vim.darwin or true)) '' + # # TODO: we should find a better way of doing this as, if the configure + # # file changes, we need to change these line numbers + # sed -i "5641,5644d" src/auto/configure + # sed -i "5648d" src/auto/configure + # ''; + + configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ]; + + nativeBuildInputs + = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw libXau + libXmu libICE qt4]; + + # prePatch = "cd src"; + + # patches = + # [ ./patches/7.4.001 ./patches/7.4.002 ./patches/7.4.003 ./patches/7.4.004 + # ./patches/7.4.005 ./patches/7.4.006 ./patches/7.4.007 ./patches/7.4.008 + # ./patches/7.4.009 ./patches/7.4.010 ./patches/7.4.011 ./patches/7.4.012 + # ./patches/7.4.013 ./patches/7.4.014 ./patches/7.4.015 ./patches/7.4.016 + # ./patches/7.4.017 ./patches/7.4.018 ./patches/7.4.019 ./patches/7.4.020 + # ./patches/7.4.021 ./patches/7.4.022 ./patches/7.4.023 ]; + + # most interpreters aren't tested yet.. (see python for example how to do it) + flags = { + ftNix = { + # because we cd to src in the main patch phase, we can't just add this + # patch to the list, we have to apply it manually + postPatch = '' + cd runtime + patch -p2 < ${./ft-nix-support.patch} + cd .. + ''; + }; + } + // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support. + // edf { name = "xsmp"; } #Disable XSMP session management + // edf { name = "xsmp_interact"; } #Disable XSMP interaction + // edf { name = "mzscheme"; } #Include MzScheme interpreter. + // edf { name = "perl"; feat = "perlinterp"; enable = { nativeBuildInputs = [perl]; };} #Include Perl interpreter. + + // edf { + name = "python"; + feat = "pythoninterp"; + enable = { + nativeBuildInputs = [ python ]; + } // lib.optionalAttrs stdenv.isDarwin { + configureFlags + = [ "--enable-pythoninterp=yes" + "--with-python-config-dir=${python}/lib" ]; + }; + } + + // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter. + // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter. + // edf { name = "lua" ; feat = "luainterp"; enable = { nativeBuildInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};} + // edf { name = "cscope"; } #Include cscope interface. + // edf { name = "workshop"; } #Include Sun Visual Workshop support. + // edf { name = "netbeans"; } #Disable NetBeans integration support. + // edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface. + // edf { name = "multibyte"; } #Include multibyte editing support. + // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support. + // edf { name = "xim"; } #Include XIM input support. + // edf { name = "fontset"; } #Include X fontset output support. + // edf { name = "acl"; } #Don't check for ACL support. + // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon). + // edf { name = "nls"; enable = {nativeBuildInputs = [gettext];}; } #Don't support NLS (gettext()). + ; + + cfg = { + pythonSupport = config.vim.python or true; + rubySupport = config.vim.ruby or true; + nlsSupport = config.vim.nls or false; + tclSupport = config.vim.tcl or false; + multibyteSupport = config.vim.multibyte or false; + cscopeSupport = config.vim.cscope or false; + netbeansSupport = config.netbeans or true; # eg envim is using it + + # by default, compile with darwin support if we're compiling on darwin, but + # allow this to be disabled by setting config.vim.darwin to false + darwinSupport = stdenv.isDarwin && (config.vim.darwin or true); + + # add .nix filetype detection and minimal syntax highlighting support + ftNixSupport = config.vim.ftNix or true; + }; + + postInstall = stdenv.lib.optionalString stdenv.isLinux '' + rpath=`patchelf --print-rpath $out/bin/qvim`; + for i in $nativeBuildInputs; do + echo adding $i/lib + rpath=$rpath:$i/lib + done + echo $nativeBuildInputs + echo $rpath + patchelf --set-rpath $rpath $out/bin/qvim + ''; + + dontStrip = 1; + + meta = with stdenv.lib; { + description = "The most popular clone of the VI editor (Qt GUI fork)"; + homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; + maintainers = with maintainers; [ smironov ]; + platforms = platforms.unix; + }; +}) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b274c4043bc..30089eeb1645 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8884,6 +8884,17 @@ let vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); + qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { + inherit (pkgs) fetchgit stdenv ncurses pkgconfig gettext + composableDerivation lib config python perl tcl ruby qt4; + inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu + libICE; + + features = "huge"; # one of tiny, small, normal, big or huge + lua = pkgs.lua5; + flags = [ "python" "X11" ]; # only flag "X11" by now + }); + virtviewer = callPackage ../applications/virtualization/virt-viewer {}; virtmanager = callPackage ../applications/virtualization/virt-manager { inherit (gnome) gnome_python; -- cgit 1.4.1 From 01087750bacd329543c69876c0a7faac395098d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 20:25:20 +0100 Subject: Don't build some packages on some platforms --- pkgs/applications/version-management/subversion/default.nix | 2 +- pkgs/development/libraries/aterm/2.5.nix | 3 ++- pkgs/development/libraries/aterm/2.8.nix | 10 +++++++--- pkgs/servers/http/apache-httpd/2.2.nix | 2 +- pkgs/servers/http/apache-httpd/2.4.nix | 2 +- pkgs/servers/monitoring/zabbix/2.0.nix | 2 +- pkgs/servers/monitoring/zabbix/default.nix | 2 +- pkgs/tools/security/fail2ban/default.nix | 2 +- pkgs/tools/text/wdiff/default.nix | 2 +- 9 files changed, 16 insertions(+), 11 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index b1469038d42d..8169011c325d 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; homepage = http://subversion.apache.org/; maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix index f116da12643e..df509943ba27 100644 --- a/pkgs/development/libraries/aterm/2.5.nix +++ b/pkgs/development/libraries/aterm/2.5.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; license = "LGPL"; description = "Library for manipulation of term data structures in C"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = stdenv.lib.maintainers.eelco; }; } diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix index 498b0244b877..6d4b13f165a6 100644 --- a/pkgs/development/libraries/aterm/2.8.nix +++ b/pkgs/development/libraries/aterm/2.8.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: let isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; in -stdenv.mkDerivation ( { +stdenv.mkDerivation { name = "aterm-2.8"; src = fetchurl { @@ -23,9 +23,13 @@ stdenv.mkDerivation ( { # feel too serious to just ignore. doCheck = true; + dontStrip = isMingw; + meta = { homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; license = "LGPL"; description = "Library for manipulation of term data structures in C"; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = stdenv.lib.maintainers.eelco; }; -} // ( if isMingw then { dontStrip = true; } else {}) ) +} diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index e9b1dba22e15..c91d6bbf761a 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Apache HTTPD, the world's most popular web server"; homepage = http://httpd.apache.org/; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ simons lovek323 ]; }; } diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index c6cec588a3cc..9e687e9c843a 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "Apache HTTPD, the world's most popular web server"; homepage = http://httpd.apache.org/; license = licenses.asl20; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with maintainers; [ lovek323 simons ]; }; } diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 1386e1609eb9..f4fde2dadefd 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -81,7 +81,7 @@ in homepage = http://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index b106921cdf69..22c10a6e972f 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -62,7 +62,7 @@ in homepage = http://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 1a443fc18b61..6196cc53bb28 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -48,6 +48,6 @@ pythonPackages.buildPythonPackage { description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 63de9c306939..70b9bf69e290 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "GNU wdiff, comparing files on a word by word basis"; license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1 From 754704ea1884563beda72ddff2ab328e690278d0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 20:32:49 +0100 Subject: Allow packages to be marked as "broken" by setting meta.broken The effect is that they won't show up in "nix-env -qa" anymore. --- doc/meta.xml | 9 +++++++++ nixos/modules/module-list.nix | 2 +- pkgs/applications/virtualization/nova/client.nix | 1 + pkgs/applications/virtualization/nova/default.nix | 15 ++++++++------- pkgs/applications/virtualization/xen/default.nix | 1 + pkgs/stdenv/generic/default.nix | 4 ++++ 6 files changed, 24 insertions(+), 8 deletions(-) (limited to 'pkgs/applications') diff --git a/doc/meta.xml b/doc/meta.xml index 09252410d807..df84915cc091 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -118,6 +118,15 @@ interpretation: package). + + broken + If set to true, the package is + marked as “broken”, meaning that it won’t show up in + nix-env -qa, and cannot be built or installed. + Sush packages should be removed from Nixpkgs eventually unless + they are fixed. + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index eaa8e03f17fd..b8f09bc48e0c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -279,5 +279,5 @@ ./virtualisation/libvirtd.nix #./virtualisation/nova.nix ./virtualisation/virtualbox-guest.nix - ./virtualisation/xen-dom0.nix + #./virtualisation/xen-dom0.nix ] diff --git a/pkgs/applications/virtualization/nova/client.nix b/pkgs/applications/virtualization/nova/client.nix index bb65f80d2066..bcc72d19bb39 100644 --- a/pkgs/applications/virtualization/nova/client.nix +++ b/pkgs/applications/virtualization/nova/client.nix @@ -16,5 +16,6 @@ pythonPackages.buildPythonPackage rec { meta = { homepage = https://github.com/rackspace/python-novaclient; description = "Client library and command line tool for the OpenStack Nova API"; + broken = true; }; } diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix index a9a36ffca4fe..c1ef20b7aa08 100644 --- a/pkgs/applications/virtualization/nova/default.nix +++ b/pkgs/applications/virtualization/nova/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that - # libxml2Python is a dependency of libvirt.py. + # libxml2Python is a dependency of libvirt.py. libvirt libxml2Python novaclient ]; buildInputs = - [ pythonPackages.python + [ pythonPackages.python pythonPackages.wrapPython pythonPackages.mox intltool @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { substituteInPlace nova/api/ec2/cloud.py \ --replace 'sh genrootca.sh' $out/libexec/nova/genrootca.sh ''; - + buildPhase = "python setup.py build"; installPhase = - '' + '' p=$(toPythonPath $out) export PYTHONPATH=$p:$PYTHONPATH mkdir -p $p @@ -59,14 +59,14 @@ stdenv.mkDerivation rec { # computes some stuff from its own argv[0]. So put the wrapped # programs in $out/libexec under their original names. mkdir -p $out/libexec/nova - + wrapProgram() { local prog="$1" local hidden=$out/libexec/nova/$(basename "$prog") mv $prog $hidden makeWrapper $hidden $prog "$@" } - + wrapPythonPrograms cp -prvd etc $out/etc @@ -86,9 +86,10 @@ stdenv.mkDerivation rec { doCheck = false; # !!! fix checkPhase = "python setup.py test"; - + meta = { homepage = http://nova.openstack.org/; description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller"; + broken = true; }; } diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 3cb16a6b4425..5f149b059787 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -136,5 +136,6 @@ stdenv.mkDerivation { description = "Xen hypervisor and management tools for Dom0"; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.eelco ]; + broken = true; }; } diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index f8aff33a327f..083a71548b91 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -18,6 +18,8 @@ let allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1"; + allowBroken = builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; + stdenvGenerator = setupScript: rec { # The stdenv that we are producing. @@ -51,6 +53,8 @@ let mkDerivation = attrs: if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" + else if !allowBroken && attrs.meta.broken or false then + throw "you can't use package ‘${attrs.name}’ because it has been marked as broken" else lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) -- cgit 1.4.1 From a0e21fd1ca2db70064cb65e0c1c99872c2ddf6ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 21:07:57 +0100 Subject: Mark more packages as broken --- pkgs/applications/networking/browsers/icecat-3/default.nix | 1 + pkgs/applications/networking/browsers/netsurf/haru.nix | 1 + pkgs/applications/networking/browsers/netsurf/libParserUtils.nix | 1 + pkgs/applications/networking/browsers/netsurf/libnsgif.nix | 1 + pkgs/applications/science/misc/vite/default.nix | 2 ++ pkgs/applications/version-management/veracity/default.nix | 1 + pkgs/applications/video/tvtime/default.nix | 1 + pkgs/development/libraries/caelum/default.nix | 1 + pkgs/development/libraries/java/icedtea/default.nix | 2 ++ pkgs/development/libraries/libdc1394avt/default.nix | 1 + pkgs/development/libraries/libmusclecard/default.nix | 1 + pkgs/development/libraries/libopensc-dnie/default.nix | 1 + pkgs/development/libraries/opencv/2.1.nix | 1 + pkgs/development/libraries/unicap/default.nix | 1 + pkgs/development/tools/profiling/systemtap/default.nix | 1 + pkgs/games/soi/default.nix | 1 + pkgs/misc/emulators/VisualBoyAdvance/default.nix | 3 ++- pkgs/os-specific/linux/v86d/default.nix | 1 + pkgs/servers/evolution-data-server/default.nix | 1 + pkgs/servers/openafs-client/default.nix | 5 ++--- pkgs/servers/radius/default.nix | 2 ++ pkgs/servers/x11/xorg/unichrome/default.nix | 3 ++- pkgs/tools/filesystems/xtreemfs/default.nix | 1 + pkgs/tools/misc/w3c-css-validator/default.nix | 1 + pkgs/tools/misc/xmltv/default.nix | 1 + pkgs/tools/networking/ntop/default.nix | 4 +--- pkgs/tools/security/opensc/0.11.7.nix | 1 + 27 files changed, 33 insertions(+), 8 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 7e181669cd1c..84269a290e9a 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -114,5 +114,6 @@ stdenv.mkDerivation { passthru = { inherit gtk version; isFirefox3Like = true; + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix index 883cf94b06fe..47f0c2f64552 100644 --- a/pkgs/applications/networking/browsers/netsurf/haru.nix +++ b/pkgs/applications/networking/browsers/netsurf/haru.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { license = "ZLIB/LIBPNG"; # see README. maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix index 8ee8518c531c..fec93c39ab9d 100644 --- a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { license = "MIT"; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 63ae2ef86d43..5894e5c1c033 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { license = "MIT"; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 4c1cf318b5a2..2e25ff582ee9 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -44,5 +44,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice + + broken = true; }; } diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix index 6bf452c18210..4c69f41106b8 100644 --- a/pkgs/applications/version-management/veracity/default.nix +++ b/pkgs/applications/version-management/veracity/default.nix @@ -102,6 +102,7 @@ rec { ]; platforms = with a.lib.platforms; linux ; + broken = true; }; }) x diff --git a/pkgs/applications/video/tvtime/default.nix b/pkgs/applications/video/tvtime/default.nix index eef6e9caf165..2ec5e813c412 100644 --- a/pkgs/applications/video/tvtime/default.nix +++ b/pkgs/applications/video/tvtime/default.nix @@ -60,5 +60,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix index e48ed5a76928..808310e326f0 100644 --- a/pkgs/development/libraries/caelum/default.nix +++ b/pkgs/development/libraries/caelum/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Add-on for the OGRE, aimed to render atmospheric effects"; homepage = http://code.google.com/p/caelum/; license = "LGPLv2.1+"; + broken = true; }; } diff --git a/pkgs/development/libraries/java/icedtea/default.nix b/pkgs/development/libraries/java/icedtea/default.nix index 51f375a36f95..094e2a10f950 100644 --- a/pkgs/development/libraries/java/icedtea/default.nix +++ b/pkgs/development/libraries/java/icedtea/default.nix @@ -108,5 +108,7 @@ stdenv.mkDerivation rec { # Restrict to GNU systems for now. platforms = stdenv.lib.platforms.gnu; + + broken = true; }; } diff --git a/pkgs/development/libraries/libdc1394avt/default.nix b/pkgs/development/libraries/libdc1394avt/default.nix index 1fcdeae0d116..69f66d7f5b7b 100644 --- a/pkgs/development/libraries/libdc1394avt/default.nix +++ b/pkgs/development/libraries/libdc1394avt/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = "LGPLv2.1+"; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/development/libraries/libmusclecard/default.nix b/pkgs/development/libraries/libmusclecard/default.nix index 5968c6d9a55b..af235b833826 100644 --- a/pkgs/development/libraries/libmusclecard/default.nix +++ b/pkgs/development/libraries/libmusclecard/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index d229933111e8..c231682b6211 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = "nonfree"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix index ea5b1313dc7f..4b0ccc0903ff 100644 --- a/pkgs/development/libraries/opencv/2.1.nix +++ b/pkgs/development/libraries/opencv/2.1.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 7a64017ca8ba..daec5a785662 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -45,6 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 293ff66f29d0..bdd11b88da5b 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 811d8d432ceb..a61d2f370d04 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -46,6 +46,7 @@ rec { platforms = with a.lib.platforms; linux; license = "free-noncopyleft"; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix index 95f7d9433f9b..942bf2c21840 100644 --- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix +++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix @@ -13,11 +13,12 @@ stdenv.mkDerivation { sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/Util.cpp ''; buildInputs = [ zlib libpng SDL ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; - + meta = { description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator"; license = "GPLv2+"; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://vba.ngemu.com; + broken = true; }; } diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 698a7ab4ec88..4c6045e1a6cb 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; license = "BSD"; platforms = [ "i686-linux" "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/servers/evolution-data-server/default.nix b/pkgs/servers/evolution-data-server/default.nix index 364bb55a5ee9..3a905a82db8b 100644 --- a/pkgs/servers/evolution-data-server/default.nix +++ b/pkgs/servers/evolution-data-server/default.nix @@ -46,6 +46,7 @@ rec { ]; platforms = with a.lib.platforms; linux; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 247628c30a62..462ecadd346d 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -40,8 +40,7 @@ stdenv.mkDerivation { homepage = http://www.openafs.org; license = stdenv.lib.licenses.ipl10; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ - z77z - ]; + maintainers = stdenv.lib.maintainers.z77z; + broken = true; }; } diff --git a/pkgs/servers/radius/default.nix b/pkgs/servers/radius/default.nix index 5533469a1da1..dcd577bb6cb7 100644 --- a/pkgs/servers/radius/default.nix +++ b/pkgs/servers/radius/default.nix @@ -29,5 +29,7 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; + + broken = true; }; } diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix index 720ccd10158d..bc1ebf4eb43e 100644 --- a/pkgs/servers/x11/xorg/unichrome/default.nix +++ b/pkgs/servers/x11/xorg/unichrome/default.nix @@ -4,7 +4,7 @@ xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake, autoconf, libtool, libXext, utilmacros, pixman}: stdenv.mkDerivation { - name = "xf86-video-unichrome-git"; + name = "xf86-video-unichrome"; src = fetchgit { url = "git://people.freedesktop.org/~libv/xf86-video-unichrome"; md5 = "6e5e0f8ee204af2385a02e502d1ca8f1"; @@ -27,5 +27,6 @@ stdenv.mkDerivation { license = "free"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 6d1f863fdeaa..81be62b5159a 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -69,6 +69,7 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.bsd3; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix index 5cfe87376388..f08fe87202f0 100644 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ b/pkgs/tools/misc/w3c-css-validator/default.nix @@ -72,5 +72,6 @@ stdenv.mkDerivation { license = "w3c"; # http://www.w3.org/Consortium/Legal/ maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/misc/xmltv/default.nix b/pkgs/tools/misc/xmltv/default.nix index 4b8ba43f597d..9d3939406066 100644 --- a/pkgs/tools/misc/xmltv/default.nix +++ b/pkgs/tools/misc/xmltv/default.nix @@ -12,4 +12,5 @@ import ../../../development/perl-modules/generic perl { perlPackages.DateManip perlPackages.HTMLTree perlPackages.HTMLParser perlPackages.HTMLTagset perlPackages.URI perlPackages.LWP ]; + meta.broken = true; } diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix index 48f2c9f08938..d5fa2deb68dc 100644 --- a/pkgs/tools/networking/ntop/default.nix +++ b/pkgs/tools/networking/ntop/default.nix @@ -19,11 +19,9 @@ stdenv.mkDerivation rec { meta = { description = "Traffic analysis with NetFlow and sFlow support"; - license = "GLPv3+"; - homepage = http://www.ntop.org/products/ntop/; - platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/security/opensc/0.11.7.nix b/pkgs/tools/security/opensc/0.11.7.nix index e18858363013..526b0276848f 100644 --- a/pkgs/tools/security/opensc/0.11.7.nix +++ b/pkgs/tools/security/opensc/0.11.7.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = "LGPL"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } -- cgit 1.4.1 From 8867304b5e8bab1741b5b32d7a503d58fccf055e Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Mon, 4 Nov 2013 22:41:16 +0100 Subject: filezilla: bump 3.6.0.2 -> 3.7.3 Includes security fixes, bug fixes and some (minor) new features. Changelog is available here: https://filezilla-project.org/versions.php Also: * break long lines * add meta.platforms * use licenses.gpl2 attribute instead of a literal string. --- pkgs/applications/networking/ftp/filezilla/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 24fdd1053417..b7c9a76e151f 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,30 +1,33 @@ -{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite }: +{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext +, pkgconfig, xdg_utils, gtk2, sqlite }: -let version = "3.6.0.2"; in +let version = "3.7.3"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "01n6k1q21i21451rdx3rgc4hhxghdn5b0ldzpjsp44ipgww5wsjk"; + sha256 = "0hn043jjb7qh040dgyhffp9jrrmca1xxbc998vyqyg83lrq2j09b"; }; configureFlags = [ "--disable-manualupdatecheck" ]; - buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite ]; + buildInputs = [ + dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite + ]; - meta = { + meta = with stdenv.lib; { homepage = "http://filezilla-project.org/"; description = "Graphical FTP, FTPS and SFTP client"; - license = "GPLv2"; - + license = licenses.gpl2; longDescription = '' FileZilla Client is a free, open source FTP client. It supports FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available under many platforms, binaries for Windows, Linux and Mac OS X are provided. ''; + platforms = platforms.linux; }; } -- cgit 1.4.1 From a2cbc77e4f1cf55a9c142d07377f67b0f83985ec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Nov 2013 23:31:08 +0100 Subject: Only show/build a package on the platforms listed in meta.platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function ‘mkDerivation’ now checks whether the current platform type is included in a package's meta.platform field. If not, it throws an exception: $ nix-build -A linux --argstr system x86_64-darwin error: user-thrown exception: the package ‘linux-3.10.15’ is not supported on ‘x86_64-darwin’ These packages also no longer show up in ‘nix-env -qa’ output. This means, for instance, that the number of packages shown on x86_64-freebsd has dropped from 9268 to 4764. Since meta.platforms was also used to prevent Hydra from building some packages, there now is a new attribute meta.hydraPlatforms listing the platforms on which Hydra should build the package (which defaults to meta.platforms). --- doc/meta.xml | 41 ++++++++++++++++++++++ .../version-management/darcs/default.nix | 9 +++-- pkgs/os-specific/linux/kernel/generic.nix | 3 -- pkgs/os-specific/linux/nvidia-x11/default.nix | 5 +-- pkgs/stdenv/generic/default.nix | 2 ++ pkgs/top-level/release-lib.nix | 8 ++--- 6 files changed, 55 insertions(+), 13 deletions(-) (limited to 'pkgs/applications') diff --git a/doc/meta.xml b/doc/meta.xml index df84915cc091..00e9b8ac67a1 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -118,6 +118,47 @@ interpretation: package). + + platforms + The list of Nix platform types on which the + package is supported. If this attribute is set, the package will + refuse to build, and won’t show up in nix-env + -qa output, on any platform not listed + here. An example is: + + +meta.platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + + + The set lib.platforms defines various common + lists of platforms types, so it’s more typical to write: + + +meta.platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + + + + + + + hydraPlatforms + The list of Nix platform types for which the Hydra + instance at hydra.nixos.org should build the + package. (Hydra is the Nix-based continuous build system.) It + defaults to the value of meta.platforms. Thus, + the only reason to set meta.hydraPlatforms is + if you want hydra.nixos.org to build the + package on a subset of meta.platforms, or not + at all, e.g. + + +meta.platforms = stdenv.lib.platforms.linux; +meta.hydraPlatforms = []; + + + + + broken If set to true, the package is diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index f33e479b3ada..8ec65e50adf3 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -21,10 +21,13 @@ cabal.mkDerivation (self: { mv contrib/darcs_completion $out/etc/bash_completion.d/darcs ''; meta = { - homepage = "http://darcs.net/"; - description = "a distributed, interactive, smart revision control system"; + homepage = http://darcs.net/; + description = "A distributed, interactive, smart revision control system"; license = "GPL"; - platforms = self.ghc.meta.platforms; + # FIXME: this gives an infinite recursion in the "darcs" attribute + # in all-packages.nix. + #platforms = self.ghc.meta.platforms; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 1ade24736279..3e1fc920a59b 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -40,9 +40,6 @@ , ... }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - || stdenv.isArm || stdenv.system == "mips64el-linux"; - assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; let diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 35595a7b8f4f..f9239bb5fba1 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -21,8 +21,7 @@ stdenv.mkDerivation { patches = [ ./version-test.patch ] - ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.11") ./nvidia-drivers-linux-3.11-incremental.patch - ; + ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.11") ./nvidia-drivers-linux-3.11-incremental.patch; src = if stdenv.system == "i686-linux" then @@ -58,5 +57,7 @@ stdenv.mkDerivation { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 083a71548b91..fcd7439e97e8 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -55,6 +55,8 @@ let throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" else if !allowBroken && attrs.meta.broken or false then throw "you can't use package ‘${attrs.name}’ because it has been marked as broken" + else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then + throw "the package ‘${attrs.name}’ is not supported on ‘${result.system}’" else lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 3280df09dd54..e2f5309ced33 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -119,14 +119,12 @@ rec { # May fail as much as it wishes, we will catch the error. processPackage = attrSet: - if attrSet ? recurseForDerivations && attrSet.recurseForDerivations then + if attrSet.recurseForDerivations or false then packagesWithMetaPlatform attrSet - else if attrSet ? recurseForRelease && attrSet.recurseForRelease then + else if attrSet.recurseForRelease or false then packagesWithMetaPlatform attrSet else - if attrSet ? meta && attrSet.meta ? platforms - then attrSet.meta.platforms - else []; + attrSet.meta.hydraPlatforms or (attrSet.meta.platforms or []); /* Common platform groups on which to test packages. */ -- cgit 1.4.1 From c88055e1a2703fbc7dd1d072f273626afe1d6b97 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Nov 2013 00:04:36 +0100 Subject: Set meta.hydraPlatforms instead of meta.platforms for some packages --- pkgs/applications/audio/mopidy/default.nix | 2 +- pkgs/applications/graphics/zgrviewer/default.nix | 2 +- pkgs/applications/science/logic/tptp/default.nix | 3 +-- pkgs/data/fonts/andagii/default.nix | 3 +-- pkgs/development/libraries/aqbanking/default.nix | 2 +- pkgs/development/libraries/haskell/accelerate-cuda/default.nix | 2 +- .../libraries/haskell/accelerate-examples/default.nix | 2 +- pkgs/development/libraries/haskell/accelerate-fft/default.nix | 2 +- pkgs/development/libraries/haskell/cuda/default.nix | 2 +- pkgs/development/libraries/haskell/cufft/default.nix | 2 +- pkgs/games/alienarena/default.nix | 3 ++- pkgs/games/dwarf-therapist/default.nix | 3 ++- pkgs/games/flightgear/default.nix | 3 ++- pkgs/games/naev/default.nix | 3 ++- pkgs/games/oilrush/default.nix | 3 ++- pkgs/games/sauerbraten/default.nix | 2 +- pkgs/games/speed-dreams/default.nix | 3 ++- pkgs/games/torcs/default.nix | 3 ++- pkgs/games/ufoai/default.nix | 3 ++- pkgs/games/unvanquished/default.nix | 3 ++- pkgs/games/urbanterror/default.nix | 3 ++- pkgs/games/vdrift/default.nix | 3 ++- pkgs/games/widelands/default.nix | 3 ++- pkgs/games/xonotic/default.nix | 3 ++- pkgs/os-specific/linux/ati-drivers/default.nix | 3 ++- pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix | 2 +- pkgs/servers/http/joseki/default.nix | 3 +-- pkgs/tools/graphics/welkin/default.nix | 3 +-- pkgs/tools/system/fdisk/default.nix | 3 +-- pkgs/tools/typesetting/tex/texlive/cm-super.nix | 2 +- pkgs/tools/typesetting/tex/texlive/extra.nix | 2 +- pkgs/tools/typesetting/tex/texlive/moderncv.nix | 2 +- pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 2 +- pkgs/top-level/all-packages.nix | 10 +++++----- 34 files changed, 52 insertions(+), 43 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 611d9f4226dd..b684fee37d56 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -39,6 +39,6 @@ pythonPackages.buildPythonPackage rec { local hard drive. ''; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = []; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index 5fe30bd7a03d..93d1b28854a6 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { # Quicker to unpack locally than load Hydra - platforms = []; + hydraPlatforms = []; maintainers = with stdenv.lib.maintainers; [raskin]; license = with stdenv.lib.licenses; lgpl21Plus; description = "GraphViz graph viewer/navigator"; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 5c8cb7203245..68d1cca7e736 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -74,8 +74,7 @@ rec { # A GiB of data. Installation is unpacking and editing a few files. # No sense in letting Hydra build it. # Also, it is unclear what is covered by "verbatim" - we will edit configs - platforms = with a.lib.platforms; - []; + hydraPlatforms = []; license = "verbatim-redistribution"; }; passthru = { diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 6e59e97171e2..8b08708fb1d0 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -43,8 +43,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - []; + hydraPlatforms = []; # There are multiple claims that the font is GPL, # so I include the package; but I cannot find the # original source, so use it on your own risk diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 0ddb1aaa7492..7dfc6a60a99f 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; # Tries to install gwenhywfar plugin, thus `make install` fails - platforms = []; + hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index cabfccc02669..49cb597b2a5d 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index b9536052dd2d..8cb5433726ff 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -23,7 +23,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index b3c1cb90b299..ef378faa08fd 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -9,6 +9,6 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; }; }) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index ac9e41fd628f..98d97c82e514 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -33,7 +33,7 @@ cabal.mkDerivation (self: { meta = { description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index e9f1fe166bdc..9de2cf9f80aa 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; }; }) diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index d9852971adfc..b3c2dd14718e 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { # Engine is under GPLv2, everything else is under license = [ "unfree-redistributable" ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index d8f39ceeea4a..c7e594f89bda 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -54,7 +54,8 @@ stdenv.mkDerivation rec { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = "MIT"; - platforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; homepage = https://code.google.com/r/splintermind-attributes/; }; } diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 71183d0ea2ad..f3ddb633e879 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -57,7 +57,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flight simulator"; maintainers = with maintainers; [ raskin ]; - #platforms = platforms.linux; # disabled from hydra because it's so big + platforms = platforms.linux; + hydraPlatforms = []; # disabled from hydra because it's so big license = licenses.gpl2; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 4516afaef6dc..c2a7ee90a1f6 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation { homepage = http://www.naev.org; license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index b96fd7c3e9f2..f62570dbd089 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation { homepage = http://oilrush-game.com/; license = "unfree"; #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 8bec0f7b1a95..eb5d933e885d 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -66,7 +66,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; + hydraPlatforms = # raskin: tested amd64-linux; # not setting platforms because it is 0.5+ GiB of game data []; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index e920b8c633e0..7a78235bdff1 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { homepage = http://speed-dreams.sourceforge.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric raskin]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index f5b713ae3373..9f1fdedd5779 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = http://torcs.sourceforge.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index d9955aec3eb4..2fef444328cd 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { description = "A squad-based tactical strategy game in the tradition of X-Com"; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 2768d2fad9e1..9ba3a442eb73 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -62,7 +62,8 @@ stdenv.mkDerivation rec { homepage = http://unvanquished.net; #license = "unknown"; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = stdenv.lib.platforms.linux; # This package can take a lot of disk space, so unavailable from channel - #platforms = with stdenv.lib.platforms; linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 535e575fdc40..020d60fa3fae 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { homepage = http://www.urbanterror.net; license = [ "unfree-redistributable" ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 97bd1ab432d9..af112c37af4f 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = http://vdrift.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index e20adc8faa73..65c991340728 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -64,7 +64,8 @@ rec { raskin jcumming ]; - #platforms = a.lib.platforms.linux; + platforms = a.lib.platforms.linux; + hydraPlatforms = []; license = a.lib.licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 957d7b2c7f45..5245c12e6ceb 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { homepage = http://www.xonotic.org; license = with stdenv.lib.licenses; gpl2Plus; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 326de9ed81ae..ab95accd7493 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -68,7 +68,8 @@ stdenv.mkDerivation rec { homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = "unfree"; maintainers = [stdenv.lib.maintainers.marcweber]; - #platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; + hydraPlatforms = []; }; # moved assertions here because the name is evaluated when the NixOS manual is generated diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix index fdf2f139c331..6d28c376078d 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix @@ -15,5 +15,5 @@ in import ./generic.nix (args // rec { features.iwlwifi = true; - extraMeta.platforms = []; + extraMeta.hydraPlatforms = []; }) diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix index 6ca5caba9440..f42ae81a700d 100644 --- a/pkgs/servers/http/joseki/default.nix +++ b/pkgs/servers/http/joseki/default.nix @@ -105,8 +105,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - []; # Builder is just unpacking/mixing what is needed + hydraPlatforms = []; # Builder is just unpacking/mixing what is needed license = "free"; # mix of packages under different licenses homepage = "http://openjena.org/"; }; diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index d02b38b41279..23c5ec11aaad 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -46,8 +46,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - []; + hydraPlatforms = []; license = "free-noncopyleft"; }; passthru = { diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 111408d1339c..e72497cf7c4e 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/fdisk/; - maintainers = [ ]; - #platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix index 4d161c3e0536..066796ed39c9 100644 --- a/pkgs/tools/typesetting/tex/texlive/cm-super.nix +++ b/pkgs/tools/typesetting/tex/texlive/cm-super.nix @@ -30,6 +30,6 @@ rec { maintainers = [ args.lib.maintainers.raskin ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 6613578e2c67..b49f02d6fda5 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -19,6 +19,6 @@ rec { maintainers = [ args.lib.maintainers.raskin ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 0ce1afbb41b3..f4db43f21f2b 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -21,6 +21,6 @@ rec { maintainers = [ args.lib.maintainers.simons ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 4cb93794edfe..f7d8f1254c55 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -24,6 +24,6 @@ rec { maintainers = [ args.lib.maintainers.simons ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d870057043d..8ed8524a0277 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2290,7 +2290,7 @@ let cross = assert crossSystem != null; crossSystem; }; - gcc44_realCross = lib.addMetaAttrs { platforms = []; } + gcc44_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.4) { inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs gettext which; @@ -2339,7 +2339,7 @@ let gcc47 = gcc47_real; - gcc45_realCross = lib.addMetaAttrs { platforms = []; } + gcc45_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.5) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib ppl cloogppl gettext which noSysDirs; @@ -2351,7 +2351,7 @@ let cross = assert crossSystem != null; crossSystem; }); - gcc46_realCross = lib.addMetaAttrs { platforms = []; } + gcc46_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.6) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib cloog ppl gettext which noSysDirs; @@ -2363,7 +2363,7 @@ let cross = assert crossSystem != null; crossSystem; }); - gcc47_realCross = lib.addMetaAttrs { platforms = []; } + gcc47_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.7) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib cloog ppl gettext which noSysDirs; @@ -2384,7 +2384,7 @@ let if isMingw then windows.mingw_headers1 else null; in wrapGCCCross { - gcc = forceNativeDrv (lib.addMetaAttrs { platforms = []; } ( + gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } ( gcc_realCross.override { crossStageStatic = true; langCC = false; -- cgit 1.4.1 From 1045df3197c5e735801952461538e3825961075d Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 5 Nov 2013 22:43:50 +0100 Subject: Updating mkvtoolnix, libebml, libmatroska to latest versions. --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- pkgs/development/libraries/libebml/default.nix | 4 ++-- pkgs/development/libraries/libmatroska/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7d2eb514c94b..ed64448c13a8 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "mkvtoolnix-6.2.0"; + name = "mkvtoolnix-6.5.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0864vmdcnfwk5cb2fv1y60yvp9kqcyaqxwbvy4nsj7bzwv1iqysn"; + sha256 = "0a3h878bsjbpb2r7b528xzyqzl8r82yhrniry9bnhmw7rcl53bd8"; }; buildInputs = [ libmatroska flac libvorbis file boost xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index d85c205c68a6..a2065111190f 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libebml-1.2.2"; + name = "libebml-1.3.0"; src = fetchurl { url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2"; - sha256 = "19dp8m97xaj46iv6ahb5v0fb9sawjiy8wy1ylljc15ka8g30hss7"; + sha256 = "1plnh2dv8k9s4d06c2blv2sl8bnz6d6shvj0h00al597nvb79c43"; }; configurePhase = "cd make/linux"; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 0bbc095c380f..67b9e7289550 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.3.0"; + name = "libmatroska-1.4.1"; src = fetchurl { url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2"; - sha256 = "0scfs5lc1nvdfv7ipgg02h7wzxks48hc5lvgk9qmwdkihnayqcaj"; + sha256 = "1dzglkl0hpimld1kahkrrp857hw5pg1r7xxbpnx7jmlj7s3j2vq8"; }; configurePhase = "cd make/linux"; -- cgit 1.4.1 From c8bb648f0f24ef891e9dead07b9bc6ff46929416 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Wed, 6 Nov 2013 11:27:06 +0400 Subject: qvim: clean up the code --- pkgs/applications/editors/vim/qvim.nix | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 85c177f31bce..ca8e71fc58f4 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -19,17 +19,8 @@ composableDerivation { sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b"; }; + # FIXME: adopt Darwin fixes from vim/default.nix preConfigure = assert (! stdenv.isDarwin); ""; - # # if darwin support is enabled, we want to make sure we're not building with - # # OS-installed python framework - # preConfigure - # = stdenv.lib.optionalString - # (stdenv.isDarwin && (config.vim.darwin or true)) '' - # # TODO: we should find a better way of doing this as, if the configure - # # file changes, we need to change these line numbers - # sed -i "5641,5644d" src/auto/configure - # sed -i "5648d" src/auto/configure - # ''; configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ]; @@ -37,16 +28,6 @@ composableDerivation { = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE qt4]; - # prePatch = "cd src"; - - # patches = - # [ ./patches/7.4.001 ./patches/7.4.002 ./patches/7.4.003 ./patches/7.4.004 - # ./patches/7.4.005 ./patches/7.4.006 ./patches/7.4.007 ./patches/7.4.008 - # ./patches/7.4.009 ./patches/7.4.010 ./patches/7.4.011 ./patches/7.4.012 - # ./patches/7.4.013 ./patches/7.4.014 ./patches/7.4.015 ./patches/7.4.016 - # ./patches/7.4.017 ./patches/7.4.018 ./patches/7.4.019 ./patches/7.4.020 - # ./patches/7.4.021 ./patches/7.4.022 ./patches/7.4.023 ]; - # most interpreters aren't tested yet.. (see python for example how to do it) flags = { ftNix = { -- cgit 1.4.1 From cadd2132302637dcfed9db43b2a31b980399e011 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 5 Nov 2013 14:44:54 +0100 Subject: Making mupdf build in 'release', not 'debug'. --- pkgs/applications/misc/mupdf/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 220309a8e221..17b86910de07 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -10,8 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; + enableParallelBuilding = true; + preBuild = '' - export makeFlags="prefix=$out" + export makeFlags="prefix=$out build=release" export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) " ''; -- cgit 1.4.1 From ac0019dc18bfcbdc764df1f87acb8ab4b35682ab Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 5 Nov 2013 13:00:33 +0400 Subject: Fix remmina the FreeRDP GUI frontend The patch fixes [undefined reference to `g_thread_init'] as suggested by http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html --- pkgs/applications/networking/remote/remmina/default.nix | 2 ++ .../networking/remote/remmina/lgthread.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/networking/remote/remmina/lgthread.patch (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index b2b24a2565c6..a3cffd51d94b 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF"; + patches = [ ./lgthread.patch ]; + postInstall = '' wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11}/lib" ''; diff --git a/pkgs/applications/networking/remote/remmina/lgthread.patch b/pkgs/applications/networking/remote/remmina/lgthread.patch new file mode 100644 index 000000000000..2d8e60f75726 --- /dev/null +++ b/pkgs/applications/networking/remote/remmina/lgthread.patch @@ -0,0 +1,16 @@ +Fix [undefined reference to `g_thread_init'] as suggested by +http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html + +diff -ru FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt FreeRDP-Remmina-356c033/remmina/CMakeLists.txt +--- FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt 2013-11-05 12:43:27.660276912 +0400 ++++ FreeRDP-Remmina-356c033/remmina/CMakeLists.txt 2013-11-05 12:53:39.607018349 +0400 +@@ -132,6 +132,8 @@ + endif() + endif() + ++set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgthread-2.0" ) ++ + add_subdirectory(po) + add_subdirectory(icons) + add_subdirectory(desktop) + -- cgit 1.4.1 From 82dedd9cada0f7fd607b8bf9de30051510704a22 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 5 Nov 2013 15:47:30 +0400 Subject: Fix remmina: add Desktop file and icons --- .../networking/remote/remmina/default.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index a3cffd51d94b..0d7092280da2 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,8 +1,21 @@ { stdenv, fetchurl, cmake, pkgconfig, makeWrapper , glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11 -, freerdp, libssh, libgcrypt, gnutls }: +, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }: + +let + version = "1.0.0"; + + desktopItem = makeDesktopItem { + name = "remmina"; + desktopName = "Remmina"; + genericName = "Remmina Remote Desktop Client"; + exec = "remmina"; + icon = "remmina"; + comment = "Connect to remote desktops"; + categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; + }; -let version = "1.0.0"; in +in stdenv.mkDerivation { name = "remmina-${version}"; @@ -21,6 +34,10 @@ stdenv.mkDerivation { patches = [ ./lgthread.patch ]; postInstall = '' + mkdir -pv $out/share/applications + mkdir -pv $out/share/icons + cp ${desktopItem}/share/applications/* $out/share/applications + cp -r $out/share/remmina/icons/* $out/share/icons wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11}/lib" ''; -- cgit 1.4.1 From db2075b6d826bd92d2187d2e641707dccc9ad96a Mon Sep 17 00:00:00 2001 From: Kim Simmons Date: Thu, 7 Nov 2013 11:05:13 +0100 Subject: Added milkytracker: Compiles and runs. --- lib/maintainers.nix | 1 + pkgs/applications/audio/milkytracker/default.nix | 2 ++ 2 files changed, 3 insertions(+) (limited to 'pkgs/applications') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 06c71b2b7ac8..25545fae65d5 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -62,4 +62,5 @@ winden = "Antonio Vargas Gonzalez "; z77z = "Marco Maggesi "; zef = "Zef Hemel "; + zoomulator = "Kim Simmons "; } diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 8cbf85306b66..df62fb0ab0da 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { description = "Music tracker application, similar to Fasttracker II."; homepage = http://milkytracker.org; license = stdenv.lib.licenses.gpl3Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.zoomulator ]; }; } -- cgit 1.4.1 From 38f85ac5aee87e17aa9d3999afe024c1e95a6a7f Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 7 Nov 2013 11:41:38 +0100 Subject: flashplayer: Update to 11.2.202.310 (fixes 4 critical security vulnerabilities) Fixes CVE-2013-3361, CVE-2013-3362, CVE-2013-3363 and CVE-2013-5324. --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 0363176257fd..d4d95f7e5b99 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -44,9 +44,9 @@ let throw "no x86_64 debugging version available" else rec { # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "11.2.202.297"; + version = "11.2.202.310"; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "0jfigq56p6zp61pmc4jl12p8gv2jhfmim18j1b30iikw3iv26lh8"; + sha256 = "03r9r7h3l4i15hw62k9il6pjzq122nldbgxr37b4y10xp08a9izj"; } else if stdenv.system == "i686-linux" then if debug then { @@ -55,9 +55,9 @@ let url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; } else rec { - version = "11.2.202.297"; + version = "11.2.202.310"; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0mpj25b2ar7gccqmw5lffdzlr3yyfalphpgwnl18s05wy1fx484y"; + sha256 = "0qf09p92silp81pjfcg2vcfcfi1padizmb58q5iaarnapgkawlbh"; } else throw "Flash Player is not supported on this platform"; -- cgit 1.4.1 From dc9efcd02d0c661f702c2e87413688fd25b1e8fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 12:59:45 +0100 Subject: milkytracker: fix evaluation --- pkgs/applications/audio/milkytracker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index df62fb0ab0da..965c941113c3 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = http://milkytracker.org; license = stdenv.lib.licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ maintainers.zoomulator ]; + maintainers = [ stdenv.lib.maintainers.zoomulator ]; }; } -- cgit 1.4.1 From 2b1b4f3d3a3b48b05916da29e44ae78a4b1532c1 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 8 Nov 2013 12:23:04 +0400 Subject: qvim: chage platforms from 'unix' to 'linux' I have no Darwin machine available so lets test qvim on Linux for now --- pkgs/applications/editors/vim/qvim.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index ca8e71fc58f4..15a147319a15 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -19,7 +19,8 @@ composableDerivation { sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b"; }; - # FIXME: adopt Darwin fixes from vim/default.nix + # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux + # to meta.platforms.unix preConfigure = assert (! stdenv.isDarwin); ""; configureFlags = [ "--with-vim-name=qvim" "--enable-gui=qt" "--with-features=${args.features}" ]; @@ -108,7 +109,7 @@ composableDerivation { description = "The most popular clone of the VI editor (Qt GUI fork)"; homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; maintainers = with maintainers; [ smironov ]; - platforms = platforms.unix; + platforms = platforms.linux; }; }) -- cgit 1.4.1 From 0aedd883e83a9b5731091fd9598327b8bbfe27f6 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 8 Nov 2013 09:59:28 +0100 Subject: Adding qbittorrent --- .../networking/p2p/qbittorrent/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/p2p/qbittorrent/default.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix new file mode 100644 index 000000000000..5aff37580d31 --- /dev/null +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, qt4, which, dbus_libs, boost, libtorrentRasterbar +, pkgconfig }: + +stdenv.mkDerivation rec { + name = "qbittorrent-3.1.2"; + + src = fetchurl { + url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; + sha256 = "1viia11qixp1qqxcyiw1x4if63cfyqk4rscpzp1vnhnzm06irv7y"; + }; + + buildInputs = [ qt4 which dbus_libs boost libtorrentRasterbar + pkgconfig ]; + + configureFlags = "--with-libboost-inc=${boost}/include " + + "--with-libboost-lib=${boost}/lib"; + + enableParallelBuilding = true; + + meta = { + description = "Free Software alternative to µtorrent"; + homepage = http://www.qbittorrent.org/; + maintainers = with stdenv.lib.maintainers; [ viric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2932c59b3eb9..674dd7dd9980 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8515,6 +8515,8 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; + qbittorrent = callPackage ../applications/networking/p2p/qbittorrent { }; + qemu = callPackage ../applications/virtualization/qemu { }; qemuImage = callPackage ../applications/virtualization/qemu/linux-img { }; -- cgit 1.4.1 From 46646feb17e33bf65ea38830260577277fd4090d Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sun, 25 Aug 2013 21:19:21 +0200 Subject: sane: add support for Epson snapscan scanners The firmware file needs to be downloaded or extracted from the windows driver file and configured in nixpkgs.config e.g.: sane.snapscanFirmware = /firmware/esfw41.bin; --- pkgs/applications/graphics/sane/backends-git.nix | 7 ++++++- pkgs/applications/graphics/sane/backends.nix | 5 ++++- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index c9cea4109dc4..0892933566de 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null }: +{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null, snapscanFirmware ? null }: let firmware = gt68xxFirmware { inherit fetchurl; }; in @@ -29,6 +29,11 @@ stdenv.mkDerivation { if gt68xxFirmware != null then "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + " \${out}/share/sane/gt68xx/" + firmware.name + else if snapscanFirmware != null then + "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware + + " \${out}/share/sane/snapscan/your-firmwarefile.bin ;" + + "mkdir -p \${out}/etc/sane.d ; " + + "echo epson2 > \${out}/etc/sane.d/dll.conf" else ""; meta = { diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index a53466ae8188..acb4ab12d4dd 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null, pkgconfig ? null , gt68xxFirmware ? null }: +{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null, pkgconfig ? null , gt68xxFirmware ? null , snapscanFirmware ? null }: assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); @@ -36,6 +36,9 @@ stdenv.mkDerivation rec { if gt68xxFirmware != null then "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + " \${out}/share/sane/gt68xx/" + firmware.name + else if snapscanFirmware != null then + "mkdir -p \${out}/share/sane/snapscan ; ln -s " + snapscanFirmware + + " \${out}/share/sane/snapscan/your-firmwarefile.bin" else ""; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 674dd7dd9980..2dbc9c2e1bb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10067,12 +10067,14 @@ let saneBackends = callPackage ../applications/graphics/sane/backends.nix { gt68xxFirmware = config.sane.gt68xxFirmware or null; + snapscanFirmware = config.sane.snapscanFirmware or null; hotplugSupport = config.sane.hotplugSupport or true; libusb = libusb1; }; saneBackendsGit = callPackage ../applications/graphics/sane/backends-git.nix { gt68xxFirmware = config.sane.gt68xxFirmware or null; + snapscanFirmware = config.sane.snapscanFirmware or null; hotplugSupport = config.sane.hotplugSupport or true; }; -- cgit 1.4.1 From b5bac4c7a4de0209cd4f704ddf23d88adf0b599a Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sat, 9 Nov 2013 14:35:35 +0100 Subject: sane: tidy-up, wrap expression arguments --- pkgs/applications/graphics/sane/backends-git.nix | 4 +++- pkgs/applications/graphics/sane/backends.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 0892933566de..7ba6e1756ba0 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null, snapscanFirmware ? null }: +{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null +, gt68xxFirmware ? null, snapscanFirmware ? null +}: let firmware = gt68xxFirmware { inherit fetchurl; }; in diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index acb4ab12d4dd..eaf1c3b725f0 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null, pkgconfig ? null , gt68xxFirmware ? null , snapscanFirmware ? null }: +{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null +, pkgconfig ? null, gt68xxFirmware ? null, snapscanFirmware ? null +}: assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); -- cgit 1.4.1 From 1ff90228b290b1449b2dc82b2647a21eead14a7f Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sat, 9 Nov 2013 12:32:30 +0100 Subject: xsane: add optional gimp plugin support --- pkgs/applications/graphics/sane/xsane.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index de8d4c336521..32b39c0160d3 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng, libusb ? null }: +{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng +, libusb ? null +, gimpSupport ? false, gimp_2_8 ? null +}: + +assert gimpSupport -> gimp_2_8 != null; stdenv.mkDerivation rec { name = "xsane-0.998"; @@ -12,8 +17,9 @@ stdenv.mkDerivation rec { sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c ''; - buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] ++ - (if libusb != null then [libusb] else []); + buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] + ++ (if libusb != null then [libusb] else []) + ++ stdenv.lib.optional gimpSupport gimp_2_8; meta = { homepage = http://www.sane-project.org/; -- cgit 1.4.1 From 0c555809d15342f31e8e67217c0d15d016835473 Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sat, 9 Nov 2013 16:27:11 +0100 Subject: gimp: upgrade to 2.8.8 This also fixes color management support (lcms2) --- pkgs/applications/graphics/gimp/2.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 4e12e2320815..d6b005e8e3d5 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -4,11 +4,11 @@ , python, pygtk, libart_lgpl, libexif, gettext, xlibs }: stdenv.mkDerivation rec { - name = "gimp-2.8.6"; + name = "gimp-2.8.8"; src = fetchurl { url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - md5 = "12b3fdf33d1f07ae79b412a9e38b9693"; + md5 = "ef2547c3514a1096931637bd6250635a"; }; buildInputs = -- cgit 1.4.1 From a131ce533d98eb587d76dd8e2afc6e19568cd7e1 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sat, 9 Nov 2013 17:47:43 +0100 Subject: fbreader: add meta.platforms attribute --- pkgs/applications/misc/fbreader/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index fa361308ff1a..612285c697c6 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation { --replace "/usr/share" "$out/share" ''; - meta = { + meta = with stdenv.lib; { description = "An e-book reader for Linux"; homepage = http://www.fbreader.org/; - license = "GPL"; - maintainer = [ stdenv.lib.maintainers.coroa ]; + license = licenses.gpl3; + platforms = platforms.linux; # possibly also on unix general + maintainer = [ maintainers.coroa ]; }; } -- cgit 1.4.1 From 9b6fb1ebd50422281d92b7ad538e66ebd5542ac4 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sat, 9 Nov 2013 19:03:16 +0100 Subject: tig: bump 1.1 -> 1.2.1 XML_CATALOG_FILES is needed to be able to build the asciidoc documentation/manpages in this new version. --- pkgs/applications/version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/tig/default.nix | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index af1ab52c04d7..9f7f26041ca6 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -66,7 +66,7 @@ rec { }; tig = import ./tig { - inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl; + inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl docbook_xml_dtd_45; }; hub = import ./hub { diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index bdd6e806fe3b..335c533fe448 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl }: +{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "tig-1.1"; + name = "tig-1.2.1"; src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - md5 = "adeb797a8320962eeb345a615257cbac"; + sha256 = "0i19lc6dd3vdpkdd8q07xii2c4mcpiwmg55av81jyhx0y82x425p"; }; buildInputs = [ncurses asciidoc xmlto docbook_xsl]; + preConfigure = '' + export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' + ''; installPhase = '' make install make install-doc -- cgit 1.4.1 From b8e890539e236a5a6c59a08e094aac65b741f3d0 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sat, 9 Nov 2013 19:06:55 +0100 Subject: tig: small expression cleanup * Add a bit of whitespace to make it easier on the eyes * Shorten the description (and remove package name) --- .../version-management/git-and-tools/tig/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 335c533fe448..23009efdbd54 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -2,24 +2,29 @@ stdenv.mkDerivation rec { name = "tig-1.2.1"; + src = fetchurl { url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; sha256 = "0i19lc6dd3vdpkdd8q07xii2c4mcpiwmg55av81jyhx0y82x425p"; }; - buildInputs = [ncurses asciidoc xmlto docbook_xsl]; + + buildInputs = [ ncurses asciidoc xmlto docbook_xsl ]; + preConfigure = '' export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' ''; + installPhase = '' make install make install-doc mkdir -p $out/etc/bash_completion.d/ cp contrib/tig-completion.bash $out/etc/bash_completion.d/ ''; + meta = with stdenv.lib; { homepage = "http://jonas.nitro.dk/tig/"; - description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands"; - maintainers = [ maintainers.garbas maintainers.bjornfor maintainers.iElectric ]; + description = "Text-mode interface for git"; + maintainers = with maintainers; [ garbas bjornfor iElectric ]; license = licenses.gpl2; platforms = platforms.linux; }; -- cgit 1.4.1 From 46581c6918b06fa502a587a509229e5eccc07d5e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2013 19:19:13 +0100 Subject: subversion: install bash completion --- pkgs/applications/version-management/subversion/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 8169011c325d..bdf34cdba9a4 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -67,6 +67,9 @@ stdenv.mkDerivation rec { make install cd - fi + + mkdir -p $out/share/bash-completion/completions + cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion ''; inherit perlBindings pythonBindings; -- cgit 1.4.1 From 25b822db3786ad3f59e27db679c521ce6cd29b81 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Thu, 2 May 2013 12:44:36 +0200 Subject: gnuradio: new package Add GNU Radio, the free & open-source software development toolkit that provides signal processing blocks to implement software radios. --- pkgs/applications/misc/gnuradio/default.nix | 76 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 81 insertions(+) create mode 100644 pkgs/applications/misc/gnuradio/default.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix new file mode 100644 index 000000000000..3c47e3bf8a82 --- /dev/null +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -0,0 +1,76 @@ +{ stdenv, fetchurl +# core dependencies +, cmake, pkgconfig, git, boost, cppunit, fftw +# python wrappers +, python, swig2, numpy, scipy, matplotlib +# grc - the gnu radio companion +, cheetahTemplate, pygtk +# gr-wavelet: collection of wavelet blocks +, gsl +# gr-qtgui: the Qt-based GUI +, qt4, qwt, pyqt4 #, pyqwt +# gr-wxgui: the Wx-based GUI +, wxPython, lxml +# gr-audio: audio subsystems (system/OS dependent) +, alsaLib +# uhd: the Ettus USRP Hardware Driver Interface +, uhd +# gr-video-sdl: PAL and NTSC display +, SDL +, libusb1, orc, pyopengl +, makeWrapper }: + +stdenv.mkDerivation rec { + name = "gnuradio-${version}"; + version = "3.7.1"; + + src = fetchurl { + url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz"; + sha256 = "1kfni8vpgr6v9rdiz3zsmwc07qj6zka9x22z2y0y4rak2xnzdxz9"; + }; + + buildInputs = [ + cmake pkgconfig git boost cppunit fftw python swig2 orc lxml qt4 qwt + alsaLib SDL libusb1 uhd gsl makeWrapper + ]; + + propagatedBuildInputs = [ + cheetahTemplate numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl + ]; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable" + ''; + + # - Ensure we get an interactive backend for matplotlib. If not the gr_plot_* + # programs will not display anything. Yes, $MATPLOTLIBRC must point to the + # *dirname* where matplotlibrc is located, not the file itself. + # - GNU Radio core is C++ but the user interface (GUI and API) is Python, so + # we must wrap the stuff in bin/. + postInstall = '' + printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc" + + for file in "$out"/bin/*; do + wrapProgram "$file" \ + --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") \ + --set MATPLOTLIBRC "$out/share/gnuradio" + done + ''; + + meta = with stdenv.lib; { + description = "Software Defined Radio (SDR) software"; + longDescription = '' + GNU Radio is a free & open-source software development toolkit that + provides signal processing blocks to implement software radios. It can be + used with readily-available low-cost external RF hardware to create + software-defined radios, or without hardware in a simulation-like + environment. It is widely used in hobbyist, academic and commercial + environments to support both wireless communications research and + real-world radio systems. + ''; + homepage = http://www.gnuradio.org; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efe0bff707c5..f462c62b4f20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7779,6 +7779,11 @@ let geany = callPackage ../applications/editors/geany { }; + gnuradio = callPackage ../applications/misc/gnuradio { + inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl; + fftw = fftwFloat; + }; + goldendict = callPackage ../applications/misc/goldendict { }; google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; -- cgit 1.4.1 From 2099a814871912ecbc844f2373e722ac6a8b0d2c Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Sun, 10 Nov 2013 17:46:00 +0100 Subject: xawtv: 3.95 -> 3.103 - package now builds on linux - added linux platforms - removed patches --- pkgs/applications/video/xawtv/default.nix | 32 ++++++++++++---- .../video/xawtv/xawtv-3.95-libfs.patch | 22 ----------- .../video/xawtv/xawtv-3.95-makefile.patch | 21 ----------- .../video/xawtv/xawtv-3.95-page-mask.patch | 44 ---------------------- 4 files changed, 24 insertions(+), 95 deletions(-) delete mode 100644 pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch delete mode 100644 pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch delete mode 100644 pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch (limited to 'pkgs/applications') diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 5f2e905efa09..63c1adb15e42 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,15 +1,31 @@ -{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, libXft, xproto, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}: +{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xproto, libv4l +, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}: -stdenv.mkDerivation { - name = "xawtv-3.95"; +stdenv.mkDerivation rec { + name = "xawtv-3.103"; src = fetchurl { - url = http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz; - md5 = "ad25e03f7e128b318e392cb09f52207d"; + url = "http://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; + sha256 = "0lnxr3xip80g0rz7h6n14n9d1qy0cm56h0g1hsyr982rbldskwrc"; }; + preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${linux}/lib/modules/*/build/include)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${linux}/lib/modules/${linux.modDirVersion}/build" ''; - buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS fontsproto libXaw libXpm libXext libSM libICE perl xextproto]; - patches = [./xawtv-3.95-libfs.patch ./xawtv-3.95-makefile.patch ./xawtv-3.95-page-mask.patch ]; + + configureFlags="--prefix="; + NIX_LDFLAGS="-lgcc_s"; + + makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX="; + + buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS perl alsaLib aalib + fontsproto libXaw libXpm libXext libSM libICE xextproto libv4l]; + + meta = { + description = "TV application for Linux with apps and tools such as a teletext browser"; + license = stdenv.lib.licenses.gpl2; + homePage = https://www.kraxel.org/blog/linux/xawtv/; + maintainers = with stdenv.lib.maintainers; [ iElectric ]; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch b/pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch deleted file mode 100644 index 4555f1058672..000000000000 --- a/pkgs/applications/video/xawtv/xawtv-3.95-libfs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ruN xawtv-3.95/console/fs.h xawtv-3.95.new/console/fs.h ---- xawtv-3.95/console/fs.h 2003-02-14 15:14:04.000000000 +0100 -+++ xawtv-3.95.new/console/fs.h 2006-01-03 22:16:06.000000000 +0100 -@@ -1,5 +1,5 @@ - #ifndef X_DISPLAY_MISSING --# include -+# include - - struct fs_font { - Font font; -diff -ruN xawtv-3.95/console/Subdir.mk xawtv-3.95.new/console/Subdir.mk ---- xawtv-3.95/console/Subdir.mk 2003-02-14 15:14:04.000000000 +0100 -+++ xawtv-3.95.new/console/Subdir.mk 2006-01-03 22:32:38.000000000 +0100 -@@ -74,7 +74,7 @@ - # libraries to link - console/fbtv : LDLIBS += \ - $(THREAD_LIBS) $(CURSES_LIBS) $(LIRC_LIBS) $(ALSA_LIBS) \ -- $(FS_LIBS) -ljpeg -lm -+ $(FS_LIBS) -ljpeg -lm -lFS - console/ttv : LDLIBS += $(THREAD_LIBS) $(AA_LIBS) -ljpeg -lm - console/scantv : LDLIBS += $(THREAD_LIBS) $(VBI_LIBS) -ljpeg - console/streamer : LDLIBS += $(THREAD_LIBS) -ljpeg -lm diff --git a/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch b/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch deleted file mode 100644 index 271bb4c7e5c0..000000000000 --- a/pkgs/applications/video/xawtv/xawtv-3.95-makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN xawtv-3.95/Makefile.in xawtv-3.95.new/Makefile.in ---- xawtv-3.95/Makefile.in 2004-04-22 16:52:29.000000000 +0200 -+++ xawtv-3.95.new/Makefile.in 2006-01-20 13:07:00.000000000 +0100 -@@ -3,7 +3,7 @@ - - # for package builds (buildroot install + no root privs needed) - DESTDIR= --SUID_ROOT=-m4755 -o root -+SUID_ROOT= - - # install paths - prefix := @prefix@ -@@ -12,7 +12,7 @@ - mandir := $(DESTDIR)@mandir@ - libdir := $(DESTDIR)@libdir@/xawtv - datadir := $(DESTDIR)@datadir@/xawtv --resdir := $(DESTDIR)@resdir@ -+resdir := $(out)@resdir@ - config := @x11conf@/xawtvrc - - # programs diff --git a/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch b/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch deleted file mode 100644 index 5714e8238e67..000000000000 --- a/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix problems with fbtv and kernel headers - -diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c ---- xawtv-3.95/console/fbtools.c 2003-02-14 14:14:04.000000000 +0000 -+++ xawtv-3.95/console/fbtools.c 2006-08-23 10:57:40.000000000 +0000 -@@ -21,8 +21,6 @@ - #include - #include - --#include -- - #include "fbtools.h" - - /* -------------------------------------------------------------------- */ -@@ -424,7 +422,7 @@ - goto err; - } - #endif -- fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK); -+ fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1); - fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset, - PROT_READ|PROT_WRITE,MAP_SHARED,fb,0); - if (-1L == (long)fb_mem) { -diff -urN ../tmp-orig/xawtv-3.95/console/matrox.c ./console/matrox.c ---- xawtv-3.95/console/matrox.c 2005-02-03 10:40:41.000000000 +0000 -+++ xawtv-3.95/console/matrox.c 2006-08-23 11:09:51.000000000 +0000 -@@ -9,7 +9,6 @@ - #include - #include - --#include /* PAGE_SIZE */ - #include - - #include "byteswap.h" -@@ -226,7 +225,7 @@ - return -1; - } - off = (unsigned long)fb_fix.mmio_start - -- ((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1)); -+ ((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1)); - bmmio += off; - mmio = (uint32_t*)bmmio; - return 0; - -- cgit 1.4.1 From 01fed132fc1d1a40365ed33c208bb22046ebdfae Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 10 Nov 2013 18:25:12 +0100 Subject: remmina: add meta.platforms --- pkgs/applications/networking/remote/remmina/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 0d7092280da2..24bc20af6528 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -41,10 +41,11 @@ stdenv.mkDerivation { wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11}/lib" ''; - meta = { + meta = with stdenv.lib; { license = "GPLv2"; homepage = "http://remmina.sourceforge.net/"; description = "Remmina is a remote desktop client written in GTK+"; maintainers = []; + platforms = platforms.linux; }; } -- cgit 1.4.1 From f9520337d09a5cb1d0bb22d5766adee17b982203 Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sun, 10 Nov 2013 17:44:02 +0100 Subject: gimpPlugins.ufraw: update plugin from 0.15 to 0.19.2 to build with gimp 2.8 --- pkgs/applications/graphics/gimp/plugins/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index d314d93ea4c3..8b2a4a660564 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -170,9 +170,9 @@ rec { # this is more than a gimp plugin ! # either load the raw image with gimp (and the import dialog will popup) # or use the binary - ufraw = pluginDerivation { - name = "ufraw-0.15"; - buildInputs = [pkgs.lcms gimp] ++ gimp.nativeBuildInputs; + ufraw = pluginDerivation rec { + name = "ufraw-0.19.2"; + buildInputs = [pkgs.gtkimageview pkgs.lcms gimp] ++ gimp.nativeBuildInputs; # --enable-mime - install mime files, see README for more information # --enable-extras - build extra (dcraw, nikon-curve) executables # --enable-dst-correction - enable DST correction for file timestamps. @@ -184,8 +184,8 @@ rec { configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; src = fetchurl { - url = mirror://sourceforge/ufraw/ufraw-0.15.tar.gz; - sha256 = "0cf3csksjkyl91zxhjnn74vc31l14nm6n1i02s76xdvvkk9ics8k"; + url = "mirror://sourceforge/ufraw/${name}.tar.gz"; + sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk"; }; installPhase = " installPlugins ufraw-gimp -- cgit 1.4.1 From f5e92ce8f2a3e7116b56107635a82c532a3f9a48 Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sun, 10 Nov 2013 20:00:37 +0100 Subject: gimpPlugins.texturize: fix compilation with gimp 2.8 --- pkgs/applications/graphics/gimp/plugins/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 8b2a4a660564..e8a809d11437 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -110,6 +110,9 @@ rec { url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz; sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3"; }; + patchPhase = '' + sed -i '/.*gimpimage_pdb.h.*/ d' src/*.c* + ''; installPhase = "installPlugins src/texturize"; }; -- cgit 1.4.1 From b8bbc87ab16882ba0eb98d4e6ac3c58a980fd1ca Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sun, 10 Nov 2013 20:16:37 +0100 Subject: gimpPlugins.fourier: upgrade from 0.3.3 to 0.4.1 and fix compilation --- pkgs/applications/graphics/gimp/plugins/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index e8a809d11437..ef9060d00c3e 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -68,18 +68,18 @@ rec { }; }; - fourier = pluginDerivation { + fourier = pluginDerivation rec { /* menu: Filters/Generic/FFT Forward Filters/Generic/FFT Inverse */ - name = "fourier-0.3.3"; - buildInputs = [ gimp pkgs.fftwSinglePrec pkgconfig glib] ++ gimp.nativeBuildInputs; + name = "fourier-0.4.1"; + buildInputs = [ gimp pkgs.fftw pkgconfig glib] ++ gimp.nativeBuildInputs; postInstall = "fail"; installPhase = "installPlugins fourier"; src = fetchurl { - url = http://people.via.ecp.fr/~remi/soft/gimp/fourier-0.3.3.tar.gz; - sha256 = "0xxgp0lrjxsj54sgygi31c7q41jkqzn0v18qyznrviv8r099v29p"; + url = "http://registry.gimp.org/files/${name}.tar.gz"; + sha256 = "1pr3y3zl9w8xs1circdrxpr98myz9m8wfzy022al79z4pdanwvs1"; }; }; -- cgit 1.4.1 From 01266013a5975511cf80b535ad7c650d62764185 Mon Sep 17 00:00:00 2001 From: Cillian de Róiste Date: Sun, 10 Nov 2013 23:33:45 +0100 Subject: gimpPlugins.gmic: upgrade from 1.3.2.0 to 1.5.7.4, fix compilation with gimp 2.8 Only the gimp plugin is built now, as the rest of the suite is quite large and probably deserves its own package. --- pkgs/applications/graphics/gimp/plugins/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ef9060d00c3e..234249e85626 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -143,21 +143,23 @@ rec { installPhase = "installPlugins src/gimp-lqr-plugin"; }; - # this is more than a gimp plugin ! - # it can be made to compile the gimp plugin only though.. gmic = - let imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough? - in pluginDerivation { - name = "gmic-1.3.2.0"; - buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs; + let + imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough? + fftw = pkgs.fftw.override {pthreads = true;}; + in pluginDerivation rec { + name = "gmic-1.5.7.2"; + buildInputs = [imagemagick pkgconfig fftw gimp] ++ gimp.nativeBuildInputs; src = fetchurl { - url = mirror://sourceforge/gmic/gmic_1.3.2.0.tar.gz; - sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h"; + url = mirror://sourceforge/gmic/gmic_1.5.7.2.tar.gz; + sha256 = "1cpbxb3p2c8bcv2cbr150whapzjc7w09i3jza0z9x3xj8c0vdyv1"; }; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${imagemagick}/include/ImageMagick" ''; - installPhase = "installPlugins src/gmic4gimp"; + sourceRoot = "${name}/src"; + buildPhase = "make gimp"; + installPhase = "installPlugins gmic_gimp"; meta = { description = "script language for image processing which comes with its open-source interpreter"; homepage = http://gmic.sourceforge.net/repository.shtml; -- cgit 1.4.1 From d6800031572a616962a8bc9f50e6b6616be6de21 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 01:40:17 +0000 Subject: awesome: add which to build inputs (for awesome-client) --- pkgs/applications/window-managers/awesome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 61f2145ff33c..d29aec9976f0 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua +{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil , xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau , libXdmcp, pixman, doxygen , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl -, docbook_xml_dtd_45, libxslt, coreutils}: +, docbook_xml_dtd_45, libxslt, coreutils, which }: let version = "3.4.13"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen - asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; + asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ]; # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as -- cgit 1.4.1 From d72afe2f1b66486c59bddeca88402f30076932a9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Nov 2013 14:22:51 +0100 Subject: haskell-github-backup: update to version 1.20131101 --- .../version-management/git-and-tools/github-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 557886a4deb1..0752504278be 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20131006"; - sha256 = "0yc2hszi509mc0d6245dc8cq20mjjmr8mgrd8571dy9sgda532pf"; + version = "1.20131101"; + sha256 = "07l8a3xiy65xicxa5v14li6jnj3niwhndm8gd6q4d7aw14yq8wbn"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 75ec0b31f83999bd094919e9e4588e3570038c62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 7 Nov 2013 10:30:59 +0100 Subject: haskell-git-annex: update to version 4.20131106 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 394e7580771e..2506de8d14e4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20131101"; - sha256 = "0fm7bkd8rxcagrmn28a1fq8fidda4xb1arj6wi9ds7prc50ajlgw"; + version = "4.20131106"; + sha256 = "019k3zhbc3wjg8isndw6hkgrr3h3qxrbfydv7m6zpgv2khjyhfh0"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From f685b08d0d99be4310df2a500f9128d8905810d4 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 12 Nov 2013 11:00:58 +0100 Subject: emacs offlineimap mode added --- .../editors/emacs-modes/offlineimap/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/offlineimap/default.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/emacs-modes/offlineimap/default.nix b/pkgs/applications/editors/emacs-modes/offlineimap/default.nix new file mode 100644 index 000000000000..d94da4f88d9e --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/offlineimap/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation rec { + rev = "646482203aacdf847d57d0a96263fddcfc33fb61"; + name = "emacs-offlineimap-${rev}"; + + src = fetchgit { + inherit rev; + url = "git://git.naquadah.org/offlineimap-el.git"; + sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b"; + }; + + buildInputs = [ emacs ]; + + installPhase = '' + substituteInPlace offlineimap.el --replace "Machine.MachineUI" "machineui" + emacs --batch -f batch-byte-compile offlineimap.el + install -d $out/share/emacs/site-lisp + install offlineimap.el offlineimap.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "OfflineIMAP support for Emacs"; + homepage = "http://julien.danjou.info/projects/emacs-packages#offlineimap"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d96f0f594a6c..3c6368125e78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7705,6 +7705,8 @@ let notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { }); + offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {}; + # This is usually a newer version of Org-Mode than that found in GNU Emacs, so # we want it to have higher precedence. org = hiPrio (callPackage ../applications/editors/emacs-modes/org { texinfo = texinfo5; }); -- cgit 1.4.1 From 39e9fabae0fe5476ad682a52dba42b2c6dbe1a57 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 12 Nov 2013 14:43:29 +0200 Subject: ZNC modules: expose meta properly, fix typo in license --- pkgs/applications/networking/znc/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index ba6d36a3c76c..478900bae4c9 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -10,7 +10,7 @@ let inherit buildPhase; inherit installPhase; - meta.platforms = stdenv.lib.platforms.unix; + meta = a.meta // { platforms = stdenv.lib.platforms.unix; }; passthru.module_name = module_name; }); @@ -30,7 +30,7 @@ in rec { description = "Push notification service module for ZNC"; homepage = https://github.com/jreese/znc-push; repositories.git = https://github.com/jreese/znc-push.git; - license = stdenv.lib.license.mit; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.offline ]; }; }; -- cgit 1.4.1 From 844b053cce172c9cd4cc60b640c83490aea7c47b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 12 Nov 2013 21:53:37 +0100 Subject: ImageMagick: 6.8.7-5 & fix ghostscript/freetype errors ghostscript and freetype were enabled but the configure script couldn't find them. It turns out it uses pkgconfig to search for them. Signed-off-by: Moritz Ulrich --- pkgs/applications/graphics/ImageMagick/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c2a661c82fdf..0a6aed814ae5 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,8 @@ { stdenv , fetchurl +, pkgconfig , bzip2 +, fontconfig , freetype , ghostscript ? null , libjpeg @@ -16,14 +18,14 @@ }: let - version = "6.8.6-9"; + version = "6.8.7-5"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"; + sha256 = "1cn1kg7scs6r7r00qlqirhnmqjnmyczbidab3vgqarw9qszh2ri6"; }; enableParallelBuilding = true; @@ -42,17 +44,18 @@ stdenv.mkDerivation rec { ''; propagatedBuildInputs = - [ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg + [ bzip2 fontconfig freetype libjpeg libpng libtiff libxml2 zlib librsvg libtool jasper libX11 ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript; - buildInputs = [ tetex ]; + buildInputs = [ tetex pkgconfig ]; postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; - meta = { + meta = with stdenv.lib; { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ the-kenny ]; }; } -- cgit 1.4.1 From 868fa84e3a1425be744fb757ae7fc62ac506e3ab Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 12 Nov 2013 22:11:47 +0100 Subject: Adding smartdeblur (gpl3 version, ~1.27) --- pkgs/applications/graphics/smartdeblur/default.nix | 33 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/graphics/smartdeblur/default.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix new file mode 100644 index 000000000000..83f3c7510298 --- /dev/null +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -0,0 +1,33 @@ +{ fetchurl, stdenv, cmake, qt4, fftw }: + +let + rev = "9895036d26"; +in +stdenv.mkDerivation rec { + name = "smartdeblur-git-${rev}"; + + src = fetchurl { + url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/${rev}"; + name = "${name}.tar.gz"; + sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4"; + }; + + preConfigure = '' + cd src + ''; + + enableParallelBuilding = true; + + buildInputs = [ cmake qt4 fftw ]; + + cmakeFlags = "-DUSE_SYSTEM_FFTW=ON"; + + meta = { + homepage = "https://github.com/Y-Vladimir/SmartDeblur"; + description = "Tool for restoring blurry and defocused images"; + license = "GPLv3"; + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = with stdenv.lib.platforms; linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5241ff7d43f..6d86b360b89c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8693,6 +8693,10 @@ let libpng = libpng12; }; + smartdeblur = callPackage ../applications/graphics/smartdeblur { + fftw = fftw.override {pthreads = true;}; + }; + sndBase = lowPrio (builderDefsPackage (import ../applications/audio/snd) { inherit fetchurl stdenv stringsWithDeps lib fftw; inherit pkgconfig gmp gettext; -- cgit 1.4.1 From fda66c9ff4b2ede4cb826a60e8d911b6988e8a30 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 12 Nov 2013 15:50:53 +0100 Subject: Updating tox to master --- pkgs/applications/networking/instant-messengers/toxic/default.nix | 6 +++--- pkgs/development/libraries/libtoxcore/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index c2af1274a24c..59aef8c6c43a 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -2,8 +2,8 @@ , libtoxcore, pkgconfig }: let - version = "75d356e52a"; - date = "20131011"; + version = "5570b7c98aa"; + date = "20131112"; in stdenv.mkDerivation rec { name = "toxic-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Tox/toxic/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "14wyvms8l07sl88g8y6g2jv95sq7cnhbaqf4n32xxilch8rymq47"; + sha256 = "02jfdp10qcw4w62qpra59m9yzzk7a3k2nypkbq5q7ydksbqlx8sj"; }; preConfigure = '' diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 0098ddb9d77a..a3de6f99418d 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -2,8 +2,8 @@ , libconfig, pkgconfig }: let - version = "31f5d7a8ab"; - date = "20131011"; + version = "18c98eb"; + date = "20131112"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0frz8ylvi33i7zkiz3hp28ylqg4c3ffrbc2m3ibb4zv9rwfzf77r"; + sha256 = "1g69fz9aspzsrlzlk6fpmjyyhb38v8mmp25nszlbra17n3f209yh"; }; preConfigure = '' -- cgit 1.4.1 From 829b29153b66e32e30d213ed115911c1f1a8d9a6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 13 Nov 2013 12:45:40 +0200 Subject: clean up git revision handling in several packages --- pkgs/applications/misc/dunst/default.nix | 2 +- pkgs/applications/networking/remote/freerdp/unstable.nix | 2 +- pkgs/misc/uboot/guruplug.nix | 2 +- pkgs/os-specific/linux/mcelog/default.nix | 2 +- pkgs/tools/backup/bup/default.nix | 6 ++++-- pkgs/tools/networking/cjdns/default.nix | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index cb594e494dba..1b61d75ddf2e 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d"; - name = "dunst-${rev}"; + name = "dunst-0-${stdenv.lib.strings.substring 0 7 rev}"; # 1.0.0 release doesn't include 100% CPU fix # https://github.com/knopwob/dunst/issues/98 diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index ef8ddf8b0e3b..cce3d23d1945 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -25,7 +25,7 @@ assert printerSupport -> cups != null; let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in stdenv.mkDerivation rec { - name = "freerdp-1.1pre${rev}"; + name = "freerdp-1.1pre-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = git://github.com/FreeRDP/FreeRDP.git; diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix index b1f4cab7b735..258ba999bf88 100644 --- a/pkgs/misc/uboot/guruplug.nix +++ b/pkgs/misc/uboot/guruplug.nix @@ -10,7 +10,7 @@ let rev = "f106056095049c2c748c2a2797e5353295240e04"; in stdenv.mkDerivation { - name = "uboot-guruplug-0.0pre${rev}"; + name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "git://git.denx.de/u-boot-marvell.git"; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index b60b6134fdde..5c36bb097812 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -10,7 +10,7 @@ let rev = "7fa99818367a6d17014b36d6f918ad848cbe7ce2"; - version = "1.0pre-${rev}"; + version = "1.0pre-${stdenv.lib.strings.substring 0 7 rev}"; sha256 = "15eea3acd76190c7922c71028b31963221a2eefd8afa713879e191a26bc22ae7"; in stdenv.mkDerivation { diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index e683df5a7fe1..54b089bd08e9 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -3,14 +3,16 @@ assert par2Support -> par2cmdline != null; +let rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; in + with stdenv.lib; stdenv.mkDerivation { - name = "bup-0.25-rc1-107-g96c6fa2"; + name = "bup-0.25-rc1-107-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "https://github.com/bup/bup.git"; - rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; + inherit rev; sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n"; }; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index a76e351efc49..ffe22a93d0d4 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -4,7 +4,7 @@ let rev = "f7b02ac0cc"; in stdenv.mkDerivation { - name = "cjdns-git-20130620-${rev}"; + name = "cjdns-git-20130620-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { url = "https://github.com/cjdelisle/cjdns.git"; -- cgit 1.4.1 From e597d102d8f11d892d780ea1c0109a2797c374ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 Nov 2013 15:29:52 +0100 Subject: git: Update to 1.8.4.3 --- pkgs/applications/version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index fb2e34c7aac9..050cfd1aabee 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.4"; + version = "1.8.4.3"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "156bwqqgaw65rsvbb4wih5jfg94bxyf6p16mdwf0ky3f4ln55s2i"; + sha256 = "08fbdxh2cjd4hffm0nydwysh5zh6nrssbi9x01yy0n2y8rqzly0a"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; -- cgit 1.4.1 From 6555e31fb4a13640b8df2487a906051bc94688bf Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Nov 2013 10:42:58 -0500 Subject: ImageMagick and asciidoc build on 64-bit darwin Tested by @zefhemel Signed-off-by: Shea Levy --- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- pkgs/tools/typesetting/asciidoc/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 0a6aed814ae5..aa0bdbfe56ce 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; - platforms = platforms.linux; + platforms = platforms.linux ++ [ "x86_64-darwin" ]; maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index aeeaf04e7bad..869fb99c63fe 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ [ "x86_64-darwin" ]; maintainers = [ maintainers.bjornfor ]; }; } -- cgit 1.4.1 From c0df12ccf062539cf216c392eb5721c66985b051 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 15 Nov 2013 00:17:21 +0400 Subject: mirage: fix localization --- pkgs/applications/graphics/mirage/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index dd1fbcc7e073..cd5388c1b88f 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { buildInputs = [ stdenv libX11 gettext ]; + patchPhase = '' + sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py + ''; + pythonPath = [ pygtk pil ]; meta = { -- cgit 1.4.1 From ac6bc8c990ac8298abd010ed262769bf09616185 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 14 Nov 2013 22:57:26 +0100 Subject: vlc: minor update 2.1.0 -> .1 --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3d48b296ad9d..de6ad9021505 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "1xs1zsjip6ljqyy5jlqf14ncda4pjx166bqvjqgcyskq66m7s5yj"; + sha256 = "14mrcswz5mz976dmplbrdm3mkwjrksspvkignhbnbvrrp77r571k"; }; buildInputs = -- cgit 1.4.1 From fd7bc4ebfd0bd86a86606cbc4ee22fbab44c5515 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Thu, 14 Nov 2013 21:55:10 +0100 Subject: kicad: update to latest stable The Kicad developers don't make releases, they maintain a stable branch that is "ready to be released at any moment". Update to latest stable branch version(s). The "version number" in the package name attribute is the date of the last modification to the branch. Also remove unused inputs: gtk, cups. --- .../science/electronics/kicad/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index cc53611493d0..11d2e770165d 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, fetchbzr, unzip, cmake, mesa, gtk, wxGTK, zlib, libX11, -gettext, cups } : +{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext }: stdenv.mkDerivation rec { - name = "kicad-20130325"; + name = "kicad-20131025"; - src = fetchurl { - url = "http://iut-tice.ujf-grenoble.fr/cao/kicad-sources-stable_2013-03-25_BZR4005.zip"; - sha256 = "0hg2aiis14am7mmpimcxnxvhy7c7fr5rgzlk6rjv44d9m0f9957m"; + src = fetchbzr { + url = "https://code.launchpad.net/~kicad-stable-committers/kicad/stable"; + revision = 4024; + sha256 = "1sv1l2zpbn6439ccz50p05hvqg6j551aqra551wck9h3929ghly5"; }; srcLibrary = fetchbzr { url = "http://bazaar.launchpad.net/~kicad-lib-committers/kicad/library"; - revision = 220; - sha256 = "0l2lblgnm51n2w1p4ifpwdvq04rxgq73zrfxlhqa9zdlyh4rcddb"; + revision = 293; + sha256 = "1wn9a4nhqyjzzfkq6xm7ag8n5n10xy7gkq6i7yry7wxini7pzv1i"; }; - cmakeFlags = "-DKICAD_TESTING_VERSION=ON"; + cmakeFlags = "-DKICAD_STABLE_VERSION=ON"; # They say they only support installs to /usr or /usr/local, # so we have to handle this. @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ unzip cmake mesa wxGTK zlib libX11 gettext ]; + buildInputs = [ cmake mesa wxGTK zlib libX11 gettext ]; postInstall = '' mkdir library -- cgit 1.4.1 From f13bcf6463b98d79a6d419850facc3c9187424a1 Mon Sep 17 00:00:00 2001 From: Tom Ridge Date: Sat, 16 Nov 2013 02:52:36 +0200 Subject: HOL: update to k.8 --- pkgs/applications/science/logic/hol/default.nix | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 2e1647b6c71d..52a3129fec0a 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchurl, polyml, graphviz, fontconfig, liberation_ttf, - experimentalKernel ? true}: +{stdenv, fetchurl, polyml, graphviz, experimentalKernel ? true}: let pname = "hol4"; @@ -16,18 +15,9 @@ stdenv.mkDerivation { sha256 = "5ce4c1e37301dbc38772694e98f1c7eabf69255908de204b280d8b2b1709e9d0"; }; - buildInputs = [polyml graphviz fontconfig liberation_ttf]; + buildInputs = [polyml graphviz]; buildCommand = '' - - mkdir chroot-fontconfig - cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf - sed -e 's@@@' -i chroot-fontconfig/fonts.conf - echo "${liberation_ttf}" >> chroot-fontconfig/fonts.conf - echo "" >> chroot-fontconfig/fonts.conf - - export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf - mkdir -p "$out/src" cd "$out/src" @@ -38,19 +28,16 @@ stdenv.mkDerivation { --replace "\"/bin/mv\"" "\"mv\"" \ --replace "\"/bin/cp\"" "\"cp\"" - for f in tools/buildutils.sml help/src-sml/DOT; - do - substituteInPlace $f --replace "\"/usr/bin/dot\"" "\"${graphviz}/bin/dot\"" - done + substituteInPlace tools/buildutils.sml --replace "\"/usr/bin/dot\"" "\"dot\"" #sed -ie "/compute/,999 d" tools/build-sequence # for testing poly < tools/smart-configure.sml - + bin/build ${kernelFlag} -symlink mkdir -p "$out/bin" - ln -st $out/bin "$out/src/${holsubdir}/bin/"* + ln -st $out/bin $out/src/${holsubdir}/bin/* # ln -s $out/src/hol4.${version}/bin $out/bin ''; -- cgit 1.4.1 From 6c32416a31c3cc1dd7069ec12d4bcd1f6e1159c9 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sat, 16 Nov 2013 03:43:38 +0200 Subject: Fix HOL documentation build --- pkgs/applications/science/logic/hol/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 52a3129fec0a..dc8e975ce1d1 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, polyml, graphviz, experimentalKernel ? true}: +{stdenv, fetchurl, polyml, graphviz, fontconfig, liberation_ttf, + experimentalKernel ? true}: let pname = "hol4"; @@ -15,9 +16,18 @@ stdenv.mkDerivation { sha256 = "5ce4c1e37301dbc38772694e98f1c7eabf69255908de204b280d8b2b1709e9d0"; }; - buildInputs = [polyml graphviz]; + buildInputs = [polyml graphviz fontconfig liberation_ttf]; buildCommand = '' + + mkdir chroot-fontconfig + cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf + sed -e 's@@@' -i chroot-fontconfig/fonts.conf + echo "${liberation_ttf}" >> chroot-fontconfig/fonts.conf + echo "" >> chroot-fontconfig/fonts.conf + + export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf + mkdir -p "$out/src" cd "$out/src" @@ -28,7 +38,10 @@ stdenv.mkDerivation { --replace "\"/bin/mv\"" "\"mv\"" \ --replace "\"/bin/cp\"" "\"cp\"" - substituteInPlace tools/buildutils.sml --replace "\"/usr/bin/dot\"" "\"dot\"" + for f in tools/buildutils.sml help/src-sml/DOT; + do + substituteInPlace $f --replace "\"/usr/bin/dot\"" "\"${graphviz}/bin/dot\"" + done #sed -ie "/compute/,999 d" tools/build-sequence # for testing -- cgit 1.4.1 From 359e2e3addff559f711ab62b47511cf83a725c8d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 10 Nov 2013 16:56:15 +0100 Subject: gnucash: Enable support for Finance::Quote --- pkgs/applications/office/gnucash/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index eddaf8f33e7c..b399c80ebff9 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade -, libgsf, libart_lgpl +, libgsf, libart_lgpl, perlPackages }: /* If you experience GConf errors when running GnuCash on NixOS, see @@ -21,23 +21,31 @@ stdenv.mkDerivation rec { pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl + perlPackages.DateManip perlPackages.FinanceQuote ]; configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx"; postInstall = '' - sed -i $out/bin/update-gnucash-gconf \ + # Auto-updaters don't make sense in Nix. + rm $out/bin/gnc-fq-update + + sed -i $out/bin/update-gnucash-gconf \ -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|' - for prog in "$out/bin/"* + + for prog in $(echo "$out/bin/"*) do + # Don't wrap the gnc-fq-* scripts, since gnucash calls them as + # "perl