diff options
30 files changed, 213 insertions, 96 deletions
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 95be75dbe51c..776d771f9b0b 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -19,12 +19,12 @@ rec { if stdenv.system == "x86_64-linux" then fetchurl { url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz; - md5 = "54e2ce0660b2b1b0eb4267acf70ea66d"; + sha256 = "1ndvanxw62b5ywi6ww0dyimabfmjdsw9q3xpy95zd8d5ygj2qsgq"; } else fetchurl { url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz; - md5 = "bde55a2354dc224cf5f26e5320e72dac"; + sha256 = "0y5n0cyr9lgjmmzkfmav7j5w66rc1jq3300hcw3vrfjiv1k6ng3w"; }; }; eclipse_sdk_35 = eclipse-sdk-35; # backward compatibility, added 2016-01-30 diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index d2a819c1a3c2..80391ae061e6 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = mirror://sourceforge/gqview/gqview-2.1.5.tar.gz; - md5 = "4644187d9b14b1dc11ac3bb146f262ea"; + sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; buildInputs = [pkgconfig gtk libpng]; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index ea4826ffaf8e..e351534f9e6a 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -61,7 +61,7 @@ let inherit version; src = fetchurl { url = "http://www.hackenberger.at/ktikz/ktikz_${version}.tar.gz"; - md5 = "e8f0826cba2447250bcdcd389a71a2ac"; + sha256 = "19jl49r7dw3vb3hg52man8p2lszh71pvnx7d0xawyyi0x6r8ml9i"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 7e9e6fc0099b..b5abe34581aa 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "sane-frontends-1.0.14"; src = fetchurl { - url = "ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/${name}.tar.gz"; - md5 = "c63bf7b0bb5f530cf3c08715db721cd3"; + url = "https://alioth.debian.org/frs/download.php/file/1140/${name}.tar.gz"; + sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7"; }; preConfigure = '' diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 2f7f536d5e75..5632eae944c0 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -1,20 +1,23 @@ # Functions to build elisp files to locally configure emcas buffers. # See https://github.com/shlevy/nix-buffer -{ runCommand }: +{ lib, writeText }: { - withPackages = pkgs: runCommand "dir-locals.el" { inherit pkgs; } '' - echo "(make-local-variable 'process-environment)" >> $out - echo "(setenv \"PATH\" (concat" >> $out - for pkg in $pkgs; do - echo " \"$pkg/bin:$pkg/sbin\"" >> $out - done - echo " (getenv \"PATH\")))" >> $out - echo -n "(setq-local exec-path (append '(" >> $out - for pkg in $pkgs; do - echo -en "\n \"$pkg/bin\" \"$pkg/sbin\"" >> $out - done - echo -e ")\\n exec-path))" >> $out - ''; + withPackages = pkgs: let + coqs = builtins.filter (x: (builtins.parseDrvName x.name).name == "coq") pkgs; + coq = builtins.head coqs; + pg-setup = if builtins.length coqs == 0 then "" else '' + (setq-local coq-prog-name "${coq}/bin/coqtop") + (setq-local coq-dependency-analyzer "${coq}/bin/coqdep") + (setq-local coq-compiler "${coq}/bin/coqc") + (setq-local coq-library-directory (get-coq-library-directory)) + (coq-prog-args) + ''; + in writeText "dir-locals.el" '' + (make-local-variable 'process-environment) + (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) + (setq-local exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) + ${pg-setup} + ''; } diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 6d9abdad2fa4..267a0b80a1f8 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { # See http://dejavu-fonts.org/wiki/License for details license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 9ef557654dc7..a92221050580 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,19 +1,28 @@ -{ stdenv, fetchurl, efl, automake, autoconf, libtool, pkgconfig, gst_all_1 -, makeWrapper, lib }: +{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, wrapGAppsHook }: stdenv.mkDerivation rec { name = "rage-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; - sha256 = "06fxhznwbd5x341r8ml3cpwmvwn0aq9i1akcgclk4vjdqiyff1d9"; + sha256 = "0xlxb1hmbnqcy088cqpj2i87hsd5h3da7d2f9afiavz0ssw4ll94"; }; nativeBuildInputs = [ - automake autoconf libtool pkgconfig makeWrapper + pkgconfig + wrapGAppsHook ]; + buildInputs = [ + efl + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + ]; + NIX_CFLAGS_COMPILE = [ "-I${efl}/include/ecore-con-1" "-I${efl}/include/ecore-evas-1" @@ -29,28 +38,10 @@ stdenv.mkDerivation rec { "-I${efl}/include/ethumb-client-1" ]; - buildInputs = [ - efl - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav - ]; - - configurePhase = '' - ./autogen.sh --prefix=$out - ''; - - postInstall = '' - wrapProgram $out/bin/rage \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - meta = { description = "Video + Audio player along the lines of mplayer"; homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx ]; + maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 70aa22569a32..3f16667d1553 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -64,10 +64,6 @@ stdenv.mkDerivation rec { installFlags = "-C src/ocaml-output"; postInstall = '' - # Workaround for FStarLang/FStar#456 - mv $out/lib/fstar/* $out/lib/ - rmdir $out/lib/fstar - wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" ''; diff --git a/pkgs/development/libraries/icu/54.1.nix b/pkgs/development/libraries/icu/54.1.nix index 4d780341b3aa..cd4398b3cc03 100644 --- a/pkgs/development/libraries/icu/54.1.nix +++ b/pkgs/development/libraries/icu/54.1.nix @@ -6,7 +6,7 @@ in stdenv.lib.overrideDerivation icu (attrs: { src = fetchurl { url = "http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz"; - md5 = "e844caed8f2ca24c088505b0d6271bc0"; + sha256 = "1cwapgjmvrcv1n2wjspj3vahidg596gjfp4jn1gcb4baralcjayl"; }; }) diff --git a/pkgs/development/libraries/java/javasvn/default.nix b/pkgs/development/libraries/java/javasvn/default.nix index b698de6d5a7f..2ad9a33879ca 100644 --- a/pkgs/development/libraries/java/javasvn/default.nix +++ b/pkgs/development/libraries/java/javasvn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://tmate.org/svn/org.tmatesoft.svn_1.0.6.standalone.zip; - md5 = "459cae849eceef04cd65fd6fb54affcc"; + sha256 = "0l2s3jqi5clzj5jz962i7gmy8ims51ma60mm5iflsl00dwbmgrqf"; }; inherit unzip; diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index c02e345346d0..09c5444a6446 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.draios.com/dependencies/libb64-1.2.src.zip"; - md5 = "a609809408327117e2c643bed91b76c5"; + sha256 = "1lxzi6v10qsl2r6633dx0zwqyvy0j19nmwclfd0d7qybqmhqsg9l"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index aca2d056f8f9..5ae17fe78f05 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libcdaudio-0.99.12"; src = fetchurl { url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12.tar.gz ; - md5 = "63b49cf14d53eed31e7a87cca17a3963" ; + sha256 = "1g3ba1n12g8h7pps0vlxx8di6cmf108mbcvbl6hj8x71ndkglygb" ; }; meta = { diff --git a/pkgs/development/libraries/libjpeg/62.nix b/pkgs/development/libraries/libjpeg/62.nix index 40e2ae62de7f..3ae8cfac39c0 100644 --- a/pkgs/development/libraries/libjpeg/62.nix +++ b/pkgs/development/libraries/libjpeg/62.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz; - md5 = "dbd5f3b47ed13132f04c685d608a7547"; + sha256 = "0pg34z6rbkk5kvdz6wirf7g4mdqn5z8x97iaw17m15lr3qjfrhvm"; }; inherit libtool; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 0f9b5b5155b5..fd9fd168db73 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,11 +9,11 @@ # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "0sriasjc573c519yqw1hcfb3qqjcsm9hm8vayw0anwkl6di9ay8s"; + sha256 = "168ng4k5sik2jiylrlpmqdj3g8hnmsmvh84y8nvfgc7fdbbah5g3"; }; patches = [ ./build-on-bsd.patch ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix new file mode 100644 index 000000000000..cd9bf94b904a --- /dev/null +++ b/pkgs/development/tools/minizinc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, flex, bison }: +let + version = "2.0.14"; +in +stdenv.mkDerivation { + name = "minizinc-${version}"; + + buildInputs = [ cmake flex bison ]; + + src = fetchFromGitHub { + rev = "${version}"; + owner = "MiniZinc"; + repo = "libminizinc"; + sha256 = "02wy91nv79lrvvhhimcxp7sqz5wd457n1n68zl7qcsm5vfn1hm4q"; + }; + + # meta is all the information about the package.. + meta = with stdenv.lib; { + homepage = "http://www.minizinc.org/"; + description = "MiniZinc is a medium-level constraint modelling language."; + + longDescription = '' + MiniZinc is a medium-level constraint modelling + language. It is high-level enough to express most + constraint problems easily, but low-level enough + that it can be mapped onto existing solvers easily and consistently. + It is a subset of the higher-level language Zinc. + ''; + + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = [ maintainers.sheenobu ]; + }; +} + diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix new file mode 100644 index 000000000000..0fd9f143ce9a --- /dev/null +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, groff, ed }: + +stdenv.mkDerivation rec { + name = "bsdbuild-${version}"; + version = "3.1"; + + src = fetchurl { + url = "http://stable.hypertriton.com/bsdbuild/${name}.tar.gz"; + sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl"; + }; + + buildInputs = [ perl groff ed ]; + nativeBuildInputs = [ pkgconfig libtool gettext ]; + + prePatch = '' + #ignore unfamiliar flags + substituteInPlace configure \ + --replace '--sbindir=*' '--sbindir=* | --includedir=* | --oldincludedir=*' + #same for packages using bsdbuild + substituteInPlace mkconfigure.pl \ + --replace '--sbindir=*' '--sbindir=* | --includedir=* | --oldincludedir=*' + #insert header for missing NULL macro + for f in db4.pm sdl_ttf.pm mysql.pm uim.pm strlcpy.pm getpwuid.pm \ + getaddrinfo.pm strtoll.pm free_null.pm getpwnam_r.pm \ + gettimeofday.pm gethostbyname.pm xinerama.pm strsep.pm \ + fontconfig.pm gettext.pm pthreads.pm strlcat.pm kqueue.pm wgl.pm \ + alsa.pm crypt.pm cracklib.pm freesg-rg.pm edacious.pm mmap.pm \ + agar.pm x11.pm x11.pm execvp.pm agar-core.pm dyld.pm getopt.pm \ + strtold.pm sdl_image.pm shl_load.pm glx.pm percgi.pm timerfd.pm \ + glob.pm dlopen.pm freesg.pm csidl.pm perl.pm select.pm \ + portaudio.pm etubestore.pm; + do +ed -s -v BSDBuild/$f << EOF +/#include +i +#include <stddef.h> +. +w +EOF + done + ''; + + configureFlags = [ + "--with-libtool=${libtool}/bin/libtool" + "--enable-nls=yes" + "--with-gettext=${gettext}" + "--with-manpages=yes" + ]; + + meta = { + homepage = http://bsdbuild.hypertriton.com; + description = "A cross-platform build system."; + + longDescription = '' + BSDBuild is a cross-platform build system. Derived from the + traditional 4.4BSD make libraries, BSDBuild allows BSD-style + Makefiles (without BSD make extensions), and works natively + under most operating systems and make flavors. Since BSDBuild + is implemented as a library (as opposed to a macro package), + Makefiles are edited directly, as opposed to being compiled + (however, if the build directory is separate from the source + directory, BSDBuild will produce the required Makefiles in place). + ''; + + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/misc/drivers/dell-530cdn/default.nix b/pkgs/misc/drivers/dell-530cdn/default.nix index 9b2f8bd47b34..9cabd8fa3396 100644 --- a/pkgs/misc/drivers/dell-530cdn/default.nix +++ b/pkgs/misc/drivers/dell-530cdn/default.nix @@ -3,7 +3,7 @@ src = fetchurl { url = "http://downloads.dell.com/printer/Dell-5130cdn-Color-Laser-${version}.noarch.rpm"; - md5 = "7fb7122e67e40b99deb9665d88df62d1"; + sha256 = "0pj32sj6jcdnpa5v75af0hnvx4z0ky0m1k2522cfdx4cb1r2lna9"; }; in runCommand "Dell-5130cdn-Color-Laser-1.3-1" {} '' mkdir -p usr/share/cups/model diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index b58beab94b36..885aec52dc79 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gpsd, libcap }: +{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2016.2"; + ver = "2016.3"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "19025arn926lhn54ss4gmmdss9z4a3yxk4ja5kyv17mi5i4yg7j6"; + sha256 = "0a92n570hrsh58ivr29c0lkjs7y6zxi1hk0l5mvaqs7k3w7z691l"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gpsd libcap ]; + buildInputs = [ gpsd libcap libnl ]; preBuild = '' makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 5dafc3d2668b..279261745fbf 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2016.2"; + ver = "2016.3"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0bf5zlpwxvq4blcgpwjgh8ms4lfapwjpjl4sczwf3i1rv7f4p05q"; + sha256 = "0ckh11dw9l6kljwa953384y295jd36x4kwzcw5wpplnx7rkg42cj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 65fcd07a6e08..3170569d5634 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -2,14 +2,14 @@ #assert stdenv.lib.versionOlder kernel.version "3.17"; -let base = "batman-adv-2016.2"; in +let base = "batman-adv-2016.3"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0pj6jans75pxw9arp1747kmmk72zbc2vgkf2a0w565pj98x1nlk1"; + sha256 = "0rzhgj0g2hwlrzr8l9ymj6s60vk2zpk1a8x1lm4lhnhsqs9qj4kf"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/http/tomcat/5.0.nix b/pkgs/servers/http/tomcat/5.0.nix deleted file mode 100644 index c15604cb0ae0..000000000000 --- a/pkgs/servers/http/tomcat/5.0.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, jdk}: - -stdenv.mkDerivation { - - name = "jakarta-tomcat-5.0.27"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://apache.essentkabel.com/jakarta/tomcat-5/v5.0.27/bin/jakarta-tomcat-5.0.27.tar.gz; - md5 = "b802ee042677e284bcf65738c7bdc3b6"; - }; - - inherit jdk; -} - - diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix new file mode 100644 index 000000000000..804826941f21 --- /dev/null +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "kapacitor-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/influxdata/kapacitor"; + + src = fetchFromGitHub { + owner = "influxdata"; + repo = "kapacitor"; + rev = "v${version}"; + sha256 = "14l9bhj6qdif79s4dyqqbnjgj3m4iarvw0ckld1wdhpdgvl8w9qh"; + }; + + meta = with lib; { + description = "Open source framework for processing, monitoring, and alerting on time series data"; + license = licenses.mit; + homepage = https://influxdata.com/time-series-platform/kapacitor/; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 1e5cc8465133..1a84eaddda64 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -7,11 +7,11 @@ let inherit (pythonPackages) python cython buildPythonApplication; in buildPythonApplication rec { - name = "xpra-0.17.4"; + name = "xpra-0.17.5"; namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "0v9xiy1d1izjnpy4d4l5zwfhb6z7x35nn8nzzn7a5mnsim5qb9wj"; + sha256 = "01k5iax42820pblfadig8rqfa1wlcgpakmjp142gx3fg59fnav3i"; }; buildInputs = [ diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 54551b5af39e..ba1154ab72d5 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -31,11 +31,12 @@ stdenv.mkDerivation rec { python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withGTK [ gtk2 pango ] - ++ lib.optionals (withGTK && stdenv.isDarwin) [ Carbon Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; configureFlags = lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] - ++ lib.optional withGTK "--enable-gtk2-use"; + ++ lib.optional withGTK "--enable-gtk2-use" + ++ lib.optional (!withGTK) "--without-x"; preConfigure = '' cp -r "${gnulib}" ./gnulib diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 21ce52894861..9724278b6087 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpipeline db groff ]; + troff="${groff}/bin/groff"; configureFlags = [ "--disable-setuid" diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 20c1170a8055..6ff08e4ac3fa 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -14,7 +14,17 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubico-piv-tool/; - description = ""; + description = '' + Used for interacting with the Privilege and Identification Card (PIV) + application on a YubiKey + ''; + longDescription = '' + The Yubico PIV tool is used for interacting with the Privilege and + Identification Card (PIV) application on a YubiKey. + With it you may generate keys on the device, importing keys and + certificates, and create certificate requests, and other operations. + A shared library and a command-line tool is included. + ''; maintainers = with maintainers; [ wkennington ]; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 1e00157c4874..ed67909db675 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "strongswan-${version}"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "12dy7dfwblihrc2zs0fdvyimvgi2g5mvgh0ksjkxi73axam8ya7q"; + sha256 = "0m449i5s51ikqh36s1sp4rvw60wqyv0j12kyd31yl9b7mjc3jijq"; }; dontPatchELF = true; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index 5aca54ad9182..566d9e168ec9 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -7,7 +7,7 @@ let honcho = buildPythonApplication rec { src = fetchzip { url = "https://github.com/nickstenning/honcho/archive/v${version}.tar.gz"; - md5 = "f5e6a7f6c1d0c167d410d7f601b4407e"; + sha256 = "1ishyzvq19hdln2nn3bjlk0kwfqsbddpypp28n88jp3px6832w02"; }; buildInputs = with pythonPackages; [ nose mock jinja2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36519102a5ff..62b068793416 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -285,7 +285,7 @@ in inherit kernel rootModules allowMissing; }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) runCommand; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; @@ -847,6 +847,8 @@ in interlock = callPackage ../servers/interlock {}; + kapacitor = callPackage ../servers/monitoring/kapacitor { }; + long-shebang = callPackage ../misc/long-shebang {}; mathics = pythonPackages.mathics; @@ -966,6 +968,8 @@ in bogofilter = callPackage ../tools/misc/bogofilter { }; + bsdbuild = callPackage ../development/tools/misc/bsdbuild { }; + bsdiff = callPackage ../tools/compression/bsdiff { }; btar = callPackage ../tools/backup/btar { @@ -1621,7 +1625,9 @@ in flvtool2 = callPackage ../tools/video/flvtool2 { }; - fontforge = lowPrio (callPackage ../tools/misc/fontforge { }); + fontforge = lowPrio (callPackage ../tools/misc/fontforge { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }); fontforge-gtk = callPackage ../tools/misc/fontforge { withGTK = true; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; @@ -6563,6 +6569,8 @@ in minify = callPackage ../development/web/minify { }; + minizinc = callPackage ../development/tools/minizinc { }; + mk = callPackage ../development/tools/build-managers/mk { }; msitools = callPackage ../development/tools/misc/msitools { }; @@ -10721,8 +10729,6 @@ in slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); - tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; - tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { }; tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4ac1b8afa96..34302b1f5225 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26969,13 +26969,13 @@ in modules // { }; libvirt = let - version = "2.1.0"; + version = "2.2.0"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "1jxsxnhy303l3wpxzkyip39yq65zwc0pxni6ww0jgnv0pshpz23l"; + sha256 = "0xpamw9gjmahvrbfkxjlplgdbhjr35vpp3a942bmw9qqy2rjwsxs"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; |