From 40fb61392cee9a4086494b229a879281664c1ef3 Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 16:13:10 -0600 Subject: [PATCH 001/113] tpm-quote-tools: 1.0.2 -> 1.0.3 tpm-quote-tools: Fixed library issue --- .../security/tpm-quote-tools/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index b294c1c9feb..7ffe8e51eac 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -1,16 +1,23 @@ { stdenv, fetchurl, trousers, openssl }: -stdenv.mkDerivation { - name = "tpm-quote-tools-1.0.2"; +stdenv.mkDerivation rec { + name = "tpm-quote-tools-${version}"; + version = "1.0.3"; - src = fetchurl { - url = "mirror://sourceforge/project/tpmquotetools/1.0.2/tpm-quote-tools-1.0.2.tar.gz"; - sha256 = "17bf9d1hiiaybx6rgl0sqcb0prjz6d2mv8fwp4bj1c0rsfw5dbk8"; + src = fetchurl { + url = "mirror://sourceforge/project/tpmquotetools/${version}/${name}.tar.gz"; + sha256 = "1d6ry2c78sgv0z4phfrwrbvgag83xnnfri2cdzrd86w4yfgnfwdf"; }; buildInputs = [ trousers openssl ]; - meta = with stdenv.lib; { + postFixup = '' + patchelf \ + --set-rpath "${stdenv.lib.makeLibraryPath [ openssl ]}:$(patchelf --print-rpath $out/bin/tpm_mkaik)" \ + $out/bin/tpm_mkaik + ''; + + meta = with stdenv.lib; { description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism"; longDescription = '' The TPM Quote Tools is a collection of programs that provide support @@ -19,7 +26,7 @@ stdenv.mkDerivation { ''; homepage = http://tpmquotetools.sourceforge.net/; license = licenses.bsd3; - maintainers = [ maintainers.ak ]; + maintainers = with maintainers; [ ak ndowens ]; platforms = platforms.linux; }; } From eff9b09fb737bf7e619cd3fed65566857ed663e0 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 5 Sep 2016 18:37:03 +0000 Subject: [PATCH 002/113] qemu: separate usbredirSupport option out of spiceSupport option --- pkgs/applications/virtualization/qemu/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b201e229931..a8f11de96bc 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -9,7 +9,8 @@ , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL , vncSupport ? true, libjpeg, libpng -, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir +, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol +, usbredirSupport ? spiceSupport, usbredir , x86Only ? false , nixosTestRunner ? false }: @@ -44,7 +45,8 @@ stdenv.mkDerivation rec { ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice usbredir ] + ++ optionals spiceSupport [ spice_protocol spice ] + ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]; enableParallelBuilding = true; @@ -95,6 +97,7 @@ stdenv.mkDerivation rec { ++ optional numaSupport "--enable-numa" ++ optional seccompSupport "--enable-seccomp" ++ optional spiceSupport "--enable-spice" + ++ optional usbredirSupport "--enable-usb-redir" ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" ++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isLinux "--enable-linux-aio"; From 1c8940a2b817ed3cb559e7d0fb96e25783b3dbfe Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 2 Nov 2016 16:06:48 +0000 Subject: [PATCH 003/113] qemu: add xen support --- pkgs/applications/virtualization/qemu/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a8f11de96bc..8d462395ce0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -11,6 +11,7 @@ , vncSupport ? true, libjpeg, libpng , spiceSupport ? !stdenv.isDarwin, spice, spice_protocol , usbredirSupport ? spiceSupport, usbredir +, xenSupport ? false, xen , x86Only ? false , nixosTestRunner ? false }: @@ -25,6 +26,7 @@ in stdenv.mkDerivation rec { name = "qemu-" + + stdenv.lib.optionalString xenSupport "xen-" + stdenv.lib.optionalString x86Only "x86-only-" + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-" + version; @@ -47,7 +49,8 @@ stdenv.mkDerivation rec { ++ optionals vncSupport [ libjpeg libpng ] ++ optionals spiceSupport [ spice_protocol spice ] ++ optionals usbredirSupport [ usbredir ] - ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]; + ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] + ++ optionals xenSupport [ xen ]; enableParallelBuilding = true; @@ -100,7 +103,8 @@ stdenv.mkDerivation rec { ++ optional usbredirSupport "--enable-usb-redir" ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" ++ optional stdenv.isDarwin "--enable-cocoa" - ++ optional stdenv.isLinux "--enable-linux-aio"; + ++ optional stdenv.isLinux "--enable-linux-aio" + ++ optional xenSupport "--enable-xen"; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3a660dc710..87c575d5555 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11892,6 +11892,8 @@ with pkgs; watch = callPackage ../os-specific/linux/procps/watch.nix { }; qemu_kvm = lowPrio (qemu.override { x86Only = true; }); + qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; }); + qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; }); firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; From 916fa0a6102a75325dbc3ffca5e88ec435aeffa4 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 1 Sep 2016 01:51:09 +0000 Subject: [PATCH 004/113] xen: rewrite build expression to be more modular, support upstream qemu and seabios Also: * provides a bunch of build options * documents build options config in longDescription * provides a bunch of predefined packages and documents them some more * sources' hashes stay the same --- .../xen/0000-fix-install-python.patch | 16 + .../xen/0000-fix-ipxe-src.patch | 27 ++ pkgs/applications/virtualization/xen/4.5.nix | 375 +++++++++++------- .../virtualization/xen/generic.nix | 335 +++++++++------- .../virtualization/xen/packages.nix | 64 +++ pkgs/top-level/all-packages.nix | 14 +- 6 files changed, 530 insertions(+), 301 deletions(-) create mode 100644 pkgs/applications/virtualization/xen/0000-fix-install-python.patch create mode 100644 pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch create mode 100644 pkgs/applications/virtualization/xen/packages.nix diff --git a/pkgs/applications/virtualization/xen/0000-fix-install-python.patch b/pkgs/applications/virtualization/xen/0000-fix-install-python.patch new file mode 100644 index 00000000000..53821c0d9c5 --- /dev/null +++ b/pkgs/applications/virtualization/xen/0000-fix-install-python.patch @@ -0,0 +1,16 @@ +tools/python/install-wrap script brakes shebangs patching, disable + +diff --git a/tools/Rules.mk b/tools/Rules.mk +index 87a56dc..a7da869 100644 +--- a/tools/Rules.mk ++++ b/tools/Rules.mk +@@ -90,8 +90,7 @@ CFLAGS += $(CFLAGS-y) + + CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS) + +-INSTALL_PYTHON_PROG = \ +- $(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG) ++INSTALL_PYTHON_PROG = $(INSTALL_PROG) + + %.opic: %.c + $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS_$*.opic) -fPIC -c -o $@ $< $(APPEND_CFLAGS) diff --git a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch b/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch new file mode 100644 index 00000000000..072338b87ab --- /dev/null +++ b/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch @@ -0,0 +1,27 @@ +hack to make etherboot use prefetched ipxe + +diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile +index a0578d2..64428a0 100644 +--- a/tools/firmware/etherboot/Makefile ++++ b/tools/firmware/etherboot/Makefile +@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz + + D=ipxe + T=ipxe.tar.gz ++G=ipxe.git + + ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) + +@@ -36,9 +37,9 @@ $T: + fi + mv _$T $T + +-$D/src/arch/i386/Makefile: $T Config +- rm -rf $D +- gzip -dc $T | tar xf - ++$D/src/arch/i386/Makefile: $G Config ++ mkdir $D ++ cp -a $G/* $D + for i in $$(cat patches/series) ; do \ + patch -d $D -p1 --quiet !withSeabios; +assert withInternalOVMF -> !withOVMF; + +with stdenv.lib; + +# Patching XEN? Check the XSAs at +# https://xenbits.xen.org/xsa/ +# and try applying all the ones we don't have yet. let - # Xen 4.5.5 - # - # Patching XEN? Check the XSAs and try applying all the ones we - # don't have yet. - # - # XSAs at: https://xenbits.xen.org/xsa/ - xenConfig = rec { - version = "4.5.5"; + xsaPatch = { name , sha256 }: (fetchpatch { + url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; + inherit sha256; + }); - xsaPatch = { name , sha256 }: (fetchpatch { - url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; - inherit sha256; - }); + qemuDeps = [ + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + alsaLib + ]; +in - name = "xen-${version}"; +callPackage (import ./generic.nix (rec { + version = "4.5.5"; - src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz"; - sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2"; - }; - - # Sources needed to build the xen tools and tools/firmware. - firmwareGits = - [ - { git = { name = "seabios"; - url = https://xenbits.xen.org/git-http/seabios.git; - rev = "rel-1.7.5"; - sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb"; - }; - patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; - } - ]; - - toolsGits = - [ - { git = { name = "qemu-xen"; - url = https://xenbits.xen.org/git-http/qemu-xen.git; - rev = "refs/tags/qemu-xen-${version}"; - sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2"; - }; - patches = [ - (xsaPatch { - name = "197-4.5-qemuu"; - sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5myx"; - }) - (xsaPatch { - name = "208-qemuu-4.7"; - sha256 = "0z9b1whr8rp2riwq7wndzcnd7vw1ckwx0vbk098k2pcflrzppgrb"; - }) - (xsaPatch { - name = "209-qemuu"; - sha256 = "05df4165by6pzxrnizkw86n2f77k9i1g4fqqpws81ycb9ng4jzin"; - }) - ]; - } - { git = { name = "qemu-xen-traditional"; - url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; - # rev = "28c21388c2a32259cff37fc578684f994dca8c9f"; - rev = "refs/tags/xen-${version}"; - sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r"; - }; - patches = [ - (xsaPatch { - name = "197-4.5-qemut"; - sha256 = "17l7npw00gyhqzzaqamwm9cawfvzm90zh6jjyy95dmqbh7smvy79"; - }) - (xsaPatch { - name = "199-trad"; - sha256 = "0dfw6ciycw9a9s97sbnilnzhipnzmdm9f7xcfngdjfic8cqdcv42"; - }) - (xsaPatch { - name = "208-qemut"; - sha256 = "0960vhchixp60j9h2lawgbgzf6mpcdk440kblk25a37bd6172l54"; - }) - (xsaPatch { - name = "209-qemut"; - sha256 = "1hq8ghfzw6c47pb5vf9ngxwgs8slhbbw6cq7gk0nam44rwvz743r"; - }) - ]; - } - { git = { name = "xen-libhvm"; - url = https://github.com/ts468/xen-libhvm; - rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63"; - sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8"; - }; - description = '' - Helper library for reading ACPI and SMBIOS firmware values - from the host system for use with the HVM guest firmware - pass-through feature in Xen. - ''; - #license = licenses.bsd2; - } - ]; - - xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch - ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch - ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch - (xsaPatch { - name = "190-4.5"; - sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm"; - }) - (xsaPatch { - name = "191-4.6"; - sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg"; - }) - (xsaPatch { - name = "192-4.5"; - sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm"; - }) - (xsaPatch { - name = "193-4.5"; - sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; - }) - (xsaPatch { - name = "195"; - sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7"; - }) - (xsaPatch { - name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject"; - sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; - }) - (xsaPatch { - name = "196-0002-x86-svm-Fix-injection-of-software-interrupts"; - sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; - }) - (xsaPatch { - name = "198"; - sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9"; - }) - (xsaPatch { - name = "200-4.6"; - sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7"; - }) - (xsaPatch { - name = "202-4.6"; - sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; - }) - (xsaPatch { - name = "204-4.5"; - sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; - }) - (xsaPatch { - name = "207"; - sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; - }) - ]; + src = fetchurl { + url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; + sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2"; }; -in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) + # Sources needed to build tools and firmwares. + xenfiles = optionalAttrs withInternalQemu { + "qemu-xen" = { + src = fetchgit { + url = https://xenbits.xen.org/git-http/qemu-xen.git; + rev = "refs/tags/qemu-xen-${version}"; + sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2"; + }; + buildInputs = qemuDeps; + patches = [ + (xsaPatch { + name = "197-4.5-qemuu"; + sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5myx"; + }) + (xsaPatch { + name = "208-qemuu-4.7"; + sha256 = "0z9b1whr8rp2riwq7wndzcnd7vw1ckwx0vbk098k2pcflrzppgrb"; + }) + (xsaPatch { + name = "209-qemuu/0001-display-cirrus-ignore-source-pitch-value-as-needed-i"; + sha256 = "1xvxzsrsq05fj6szjlpbgg4ia3cw54dn5g7xzq1n1dymbhv606m0"; + }) + (xsaPatch { + name = "209-qemuu/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput"; + sha256 = "0avxqs9922qjfsxxlk7bh10432a526j2yyykhags8dk1bzxkpxwv"; + }) + ]; + meta.description = "Xen's fork of upstream Qemu"; + }; + } // optionalAttrs withInternalTraditionalQemu { + "qemu-xen-traditional" = { + src = fetchgit { + url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; + rev = "refs/tags/xen-${version}"; + sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r"; + }; + buildInputs = qemuDeps; + patches = [ + (xsaPatch { + name = "197-4.5-qemut"; + sha256 = "17l7npw00gyhqzzaqamwm9cawfvzm90zh6jjyy95dmqbh7smvy79"; + }) + (xsaPatch { + name = "199-trad"; + sha256 = "0dfw6ciycw9a9s97sbnilnzhipnzmdm9f7xcfngdjfic8cqdcv42"; + }) + (xsaPatch { + name = "208-qemut"; + sha256 = "0960vhchixp60j9h2lawgbgzf6mpcdk440kblk25a37bd6172l54"; + }) + (xsaPatch { + name = "209-qemut"; + sha256 = "1hq8ghfzw6c47pb5vf9ngxwgs8slhbbw6cq7gk0nam44rwvz743r"; + }) + ]; + postPatch = '' + substituteInPlace xen-hooks.mak \ + --replace /usr/include/pci ${pciutils}/include/pci + ''; + meta.description = "Xen's fork of upstream Qemu that uses old device model"; + }; + } // optionalAttrs withInternalSeabios { + "firmware/seabios-dir-remote" = { + src = fetchgit { + url = https://xenbits.xen.org/git-http/seabios.git; + rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2"; + #rev = "rel-1.7.5"; + sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb"; + }; + patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; + meta.description = "Xen's fork of Seabios"; + }; + } // optionalAttrs withInternalOVMF { + "firmware/ovmf-dir-remote" = { + src = fetchgit { + url = https://xenbits.xen.org/git-http/ovmf.git; + rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"; + sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcq"; + }; + meta.description = "Xen's fork of OVMF"; + }; + } // { + # TODO: patch Xen to make this optional? + "firmware/etherboot/ipxe.git" = { + src = fetchgit { + url = https://git.ipxe.org/ipxe.git; + rev = "9a93db3f0947484e30e753bbd61a10b17336e20e"; + sha256 = "1ga3h1b34q0cl9azj7j9nswn7mfcs3cgfjdihrm5zkp2xw2hpvr6"; + }; + meta.description = "Xen's fork of iPXE"; + }; + } // optionalAttrs withLibHVM { + "xen-libhvm-dir-remote" = { + src = fetchgit { + name = "xen-libhvm"; + url = https://github.com/ts468/xen-libhvm; + rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63"; + sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8"; + }; + buildPhase = '' + make + cd biospt + cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm + ''; + installPhase = '' + make install + cp biospt/biospt $out/bin/ + ''; + meta = { + description = '' + Helper library for reading ACPI and SMBIOS firmware values + from the host system for use with the HVM guest firmware + pass-through feature in Xen''; + license = licenses.bsd2; + }; + }; + }; + + configureFlags = [] + ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH + ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional" + ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional" + + ++ optional (withSeabios) "--with-system-seabios=${seabios}" + ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" + + ++ optional (withOVMF) "--with-system-ovmf=${OVMF}" + ++ optional (withInternalOVMF) "--enable-ovmf"; + + patches = + [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch + ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch + ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch + (xsaPatch { + name = "190-4.5"; + sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm"; + }) + (xsaPatch { + name = "191-4.6"; + sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg"; + }) + (xsaPatch { + name = "192-4.5"; + sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm"; + }) + (xsaPatch { + name = "193-4.5"; + sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; + }) + (xsaPatch { + name = "195"; + sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7"; + }) + (xsaPatch { + name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject"; + sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; + }) + (xsaPatch { + name = "196-0002-x86-svm-Fix-injection-of-software-interrupts"; + sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; + }) + (xsaPatch { + name = "198"; + sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9"; + }) + (xsaPatch { + name = "200-4.6"; + sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7"; + }) + (xsaPatch { + name = "202-4.6"; + sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; + }) + (xsaPatch { + name = "204-4.5"; + sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; + }) + (xsaPatch { + name = "207"; + sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; + }) + ]; + + # Fix build on Glibc 2.24. + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + + postPatch = '' + # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. + sed 1i'#include ' \ + -i tools/blktap2/control/tap-ctl-allocate.c \ + -i tools/libxl/libxl_device.c + ''; + +})) args diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 9943d70fa8c..953368b7e3b 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -1,188 +1,219 @@ -{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl -, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2 -, lvm2, utillinux, procps, texinfo, perl, python2Packages -, glib, bridge-utils, xorg, pixman, iproute, udev, bison -, flex, cmake, ocamlPackages, figlet, libaio, yajl -, checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice -, spice_protocol, usbredir, alsaLib, quilt +config: +{ stdenv, cmake, pkgconfig, which + +# Xen +, bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib +, iasl, libaio, libiconv, libuuid, ncurses, openssl, perl +, python2Packages +# python2Packages.python +, xz, yajl, zlib + +# Xen Optional +, ocamlPackages + +# Scripts , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools -, inetutils, iptables, openvswitch, nbd, drbd, xenConfig -, xenserverPatched ? false, ... }: +, iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd +, lvm2, utillinux, procps + +# Documentation +# python2Packages.markdown +, transfig, ghostscript, texinfo, pandoc + +, ...} @ args: with stdenv.lib; let + #TODO: fix paths instead + scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [ + which perl + coreutils gawk gnused gnugrep diffutils utillinux multipath-tools + iproute inetutils iptables bridge-utils openvswitch nbd drbd + ]; - libDir = if stdenv.is64bit then "lib64" else "lib"; + withXenfiles = f: concatStringsSep "\n" (mapAttrsToList f config.xenfiles); - # Sources needed to build the tools - # These sources are already rather old and probably do not change frequently - xenExtfiles = [ - { url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz; - sha256 = "0p206zaxlhda60ci33h9gipi5gm46fvvsm6k5c0w7b6cjg0yhb33"; - } - ]; - - scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin") - [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath-tools - iproute inetutils iptables bridge-utils openvswitch nbd drbd ])); + withTools = a: f: withXenfiles (name: x: optionalString (hasAttr a x) '' + echo "processing ${name}" + __do() { + cd "tools/${name}" + ${f name x} + } + ( __do ) + ''); in +stdenv.mkDerivation (rec { + inherit (config) version; - -stdenv.mkDerivation { - inherit (xenConfig) name version src; + name = "xen-${version}"; dontUseCmakeConfigure = true; - buildInputs = - [ which zlib pkgconfig SDL openssl libuuid gettext ncurses - dev86 iasl pciutils bzip2 xz texinfo perl yajl - python2Packages.python python2Packages.wrapPython - glib bridge-utils pixman iproute udev bison xorg.libX11 - flex ocamlPackages.ocaml ocamlPackages.findlib figlet libaio - checkpolicy python2Packages.markdown transfig - glusterfs acl cmake spice spice_protocol usbredir - alsaLib quilt - ]; - hardeningDisable = [ "stackprotector" "fortify" "pic" ]; - patches = stdenv.lib.optionals ((xenserverPatched == false) && (builtins.hasAttr "xenPatches" xenConfig)) xenConfig.xenPatches; + buildInputs = [ + cmake pkgconfig which + + # Xen + bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio + libiconv libuuid ncurses openssl perl python2Packages.python xz yajl zlib + + # oxenstored + ocamlPackages.findlib ocamlPackages.ocaml + + # Python fixes + python2Packages.wrapPython + + # Documentation + python2Packages.markdown transfig ghostscript texinfo pandoc + + # Others + ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles)) + ++ (config.buildInputs or []); + + prePatch = '' + ### Generic fixes + + # Xen's stubdoms, tools and firmwares need various sources that + # are usually fetched at build time using wget and git. We can't + # have that, so we prefetch them in nix-expression and setup + # fake wget and git for debugging purposes. + + mkdir fake-bin + + # Fake git: just print what it wants and die + cat > fake-bin/wget << EOF + #!/bin/sh -e + echo ===== FAKE WGET: Not fetching \$* + [ -e \$3 ] + EOF + + # Fake git: just print what it wants and die + cat > fake-bin/git << EOF + #!/bin/sh + echo ===== FAKE GIT: Not cloning \$* + [ -e \$3 ] + EOF + + chmod +x fake-bin/* + export PATH=$PATH:$PWD/fake-bin + + # Remove in-tree qemu stuff in case we build from a tar-ball + rm -rf tools/qemu-xen tools/qemu-xen-traditional + + # Fix shebangs, mainly for build-scipts + # We want to do this before getting prefetched stuff to speed things up + # (prefetched stuff has lots of files) + find . -type f | xargs sed -i 's@/usr/bin/\(python\|perl\)@/usr/bin/env \1@g' + find . -type f | xargs sed -i 's@/bin/bash@/bin/sh@g' + + # Get prefetched stuff + ${withXenfiles (name: x: '' + echo "${x.src} -> tools/${name}" + cp -r ${x.src} tools/${name} + chmod -R +w tools/${name} + '')} + ''; + + patches = [ ./0000-fix-ipxe-src.patch + ./0000-fix-install-python.patch ] + ++ (config.patches or []); postPatch = '' - ${stdenv.lib.optionalString ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches} + ### Hacks - # Xen's tools and firmares need various git repositories that it - # usually checks out at time using git. We can't have that. - ${flip concatMapStrings xenConfig.toolsGits (x: let src = fetchgit x.git; in '' - cp -r ${src} tools/${src.name}-dir-remote - chmod -R +w tools/${src.name}-dir-remote - '' + stdenv.lib.optionalString (builtins.hasAttr "patches" x) '' - ( cd tools/${src.name}-dir-remote; ${concatStringsSep "; " (map (p: "patch -p1 < ${p}") x.patches)} ) - '')} - ${flip concatMapStrings xenConfig.firmwareGits (x: let src = fetchgit x.git; in '' - cp -r ${src} tools/firmware/${src.name}-dir-remote - chmod -R +w tools/firmware/${src.name}-dir-remote - '' + stdenv.lib.optionalString (builtins.hasAttr "patches" x) '' - ( cd tools/firmware/${src.name}-dir-remote; ${concatStringsSep "; " (map (p: "patch -p1 < ${p}") x.patches)} ) - '')} + # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't + # print the GCC version number properly. + substituteInPlace xen/Makefile \ + --replace '$(CC) $(CFLAGS) -v' '$(CC) -v' - # Xen's stubdoms and firmwares need various sources that are usually fetched - # at build time using wget. We can't have that, so we prefetch Xen's ext_files. - mkdir xen_ext_files - ${flip concatMapStrings xenExtfiles (x: let src = fetchurl x; in '' - cp ${src} xen_ext_files/${src.name} - '')} + # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. + mkdir -p tools/include/gnu + touch tools/include/gnu/stubs-32.h - # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. - sed 1i'#include ' \ - -i tools/blktap2/control/tap-ctl-allocate.c \ - -i tools/libxl/libxl_device.c + ### Fixing everything else + + substituteInPlace tools/libfsimage/common/fsimage_plugin.c \ + --replace /usr $out + + substituteInPlace tools/blktap2/lvm/lvm-util.c \ + --replace /usr/sbin/vgs ${lvm2}/bin/vgs \ + --replace /usr/sbin/lvs ${lvm2}/bin/lvs + + substituteInPlace tools/misc/xenpvnetboot \ + --replace /usr/sbin/mount ${utillinux}/bin/mount \ + --replace /usr/sbin/umount ${utillinux}/bin/umount + + substituteInPlace tools/xenmon/xenmon.py \ + --replace /usr/bin/pkill ${procps}/bin/pkill + + substituteInPlace tools/xenstat/Makefile \ + --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h + + # TODO: use this as a template and support our own if-up scripts instead? + substituteInPlace tools/hotplug/Linux/xen-backend.rules.in \ + --replace "@XEN_SCRIPT_DIR@" $out/etc/xen/scripts + + # blktap is not provided by xen, but by xapi + sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules.in + + ${withTools "patches" (name: x: '' + ${concatMapStringsSep "\n" (p: '' + echo "# Patching with ${p}" + patch -p1 < ${p} + '') x.patches} + '')} + + ${withTools "postPatch" (name: x: x.postPatch)} + + ${config.postPatch or ""} ''; - preConfigure = '' - # Fake wget: copy prefetched downloads instead - mkdir wget - echo "#!/bin/sh" > wget/wget - echo "echo ===== Not fetching \$*, copy pre-fetched file instead" >> wget/wget - echo "cp \$4 \$3" >> wget/wget - chmod +x wget/wget - export PATH=$PATH:$PWD/wget - export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio" - ''; - - # https://github.com/NixOS/nixpkgs/issues/13590 - configureFlags = ["--disable-stubdom"]; - - postConfigure = - '' - substituteInPlace tools/libfsimage/common/fsimage_plugin.c \ - --replace /usr $out - - substituteInPlace tools/blktap2/lvm/lvm-util.c \ - --replace /usr/sbin/vgs ${lvm2}/sbin/vgs \ - --replace /usr/sbin/lvs ${lvm2}/sbin/lvs - - substituteInPlace tools/xenmon/xenmon.py \ - --replace /usr/bin/pkill ${procps}/bin/pkill - - substituteInPlace tools/xenstat/Makefile \ - --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h - - substituteInPlace tools/qemu-xen-traditional/xen-hooks.mak \ - --replace /usr/include/pci ${pciutils}/include/pci - - substituteInPlace tools/qemu-xen-traditional-dir-remote/xen-hooks.mak \ - --replace /usr/include/pci ${pciutils}/include/pci - - substituteInPlace tools/hotplug/Linux/xen-backend.rules \ - --replace /etc/xen/scripts $out/etc/xen/scripts - - # blktap is not provided by xen, but by xapi - sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules - - # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't - # print the GCC version number properly. - substituteInPlace xen/Makefile \ - --replace '$(CC) $(CFLAGS) -v' '$(CC) -v' - - # Allow the location of the xendomains config file to be - # overriden at runtime. - substituteInPlace tools/hotplug/Linux/init.d/xendomains \ - --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \ - --replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \ - --replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \ - --replace /bin/ls ls - - substituteInPlace tools/hotplug/Linux/xendomains \ - --replace /bin/ls ls - - # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. - mkdir -p tools/include/gnu - touch tools/include/gnu/stubs-32.h - ''; - - # Fix build on Glibc 2.24. - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - # TODO: Flask needs more testing before enabling it by default. #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; - makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; + makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ] + ++ (config.makeFlags or []); buildFlags = "xen tools"; - postBuild = - '' - make -C docs man-pages + postBuild = '' + make -C docs man-pages - (cd tools/xen-libhvm-dir-remote; make) - (cd tools/xen-libhvm-dir-remote/biospt; cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm) - ''; + ${withTools "buildPhase" (name: x: x.buildPhase)} + ''; - installPhase = - '' - mkdir -p $out $out/share - cp -prvd dist/install/nix/store/*/* $out/ - cp -prvd dist/install/boot $out/boot - cp -prvd dist/install/etc $out - cp -dR docs/man1 docs/man5 $out/share/man/ - wrapPythonPrograms - substituteInPlace $out/etc/xen/scripts/hotplugpath.sh --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\" + installPhase = '' + mkdir -p $out $out/share + cp -prvd dist/install/nix/store/*/* $out/ + cp -prvd dist/install/boot $out/boot + cp -prvd dist/install/etc $out + cp -dR docs/man1 docs/man5 $out/share/man/ - shopt -s extglob - for i in $out/etc/xen/scripts/!(*.sh); do - sed -i "2s@^@export PATH=$out/bin:${scriptEnvPath}\n@" $i - done + ${withTools "installPhase" (name: x: x.installPhase)} - (cd tools/xen-libhvm-dir-remote; make install) - cp tools/xen-libhvm-dir-remote/biospt/biospt $out/bin/. - ''; + # Hack + substituteInPlace $out/etc/xen/scripts/hotplugpath.sh \ + --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\" + + wrapPythonPrograms + + shopt -s extglob + for i in $out/etc/xen/scripts/!(*.sh); do + sed -i "2s@^@export PATH=$out/bin:${scriptEnvPath}\n@" $i + done + ''; meta = { homepage = http://www.xen.org/; - description = "Xen hypervisor and management tools for Dom0"; + description = "Xen hypervisor and related components" + + optionalString (args ? meta && args.meta ? description) + " (${args.meta.description})"; + longDescription = (args.meta.longDescription or "") + + "\nIncludes:\n" + + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.''); platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ eelco tstrobel ]; + maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ]; }; -} +} // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix new file mode 100644 index 00000000000..633ec4f3d12 --- /dev/null +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -0,0 +1,64 @@ +{ callPackage +, stdenv, overrideCC, gcc49 +}: + +# TODO on new Xen version: generalize this to generate [vanilla slim +# light] for each ./.nix. + +rec { + + xen_4_5-vanilla = callPackage ./4.5.nix { + # At the very least included seabios and etherboot need gcc49, + # so we have to build all of it with gcc49. + stdenv = overrideCC stdenv gcc49; + + meta = { + description = "vanilla"; + longDescription = '' + Vanilla version of Xen. Uses forks of Qemu and Seabios bundled + with Xen. This gives vanilla experince, but wastes space and + build time: typical NixOS setup that runs lots of VMs will + build three different versions of Qemu when using this (two + forks and upstream). + ''; + }; + }; + + xen_4_5-slim = xen_4_5-vanilla.override { + withInternalQemu = false; + withInternalTraditionalQemu = true; + withInternalSeabios = false; + withSeabios = true; + + meta = { + description = "slim"; + longDescription = '' + Slimmed-down version of Xen that reuses nixpkgs packages as + much as possible. Different parts may get out of sync, but + this builds faster and uses less space than vanilla. Use with + `qemu_xen` from nixpkgs. + ''; + }; + }; + + xen_4_5-light = xen_4_5-vanilla.override { + withInternalQemu = false; + withInternalTraditionalQemu = false; + withInternalSeabios = false; + withSeabios = true; + + meta = { + description = "light"; + longDescription = '' + Slimmed-down version of Xen without `qemu-traditional` (you + don't need it if you don't know what it is). Use with + `qemu_xen-light` from nixpkgs. + ''; + }; + }; + + xen-vanilla = xen_4_5-vanilla; + xen-slim = xen_4_5-slim; + xen-light = xen_4_5-light; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87c575d5555..e1e4e70c399 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11892,7 +11892,11 @@ with pkgs; watch = callPackage ../os-specific/linux/procps/watch.nix { }; qemu_kvm = lowPrio (qemu.override { x86Only = true; }); - qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; }); + + # See `xenPackages` source for explanations. + # Building with `xen` instead of `xen-slim` is possible, but makes no sense. + qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-slim; }); + qemu_xen-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-light; }); qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; }); @@ -15997,9 +16001,11 @@ with pkgs; xdotool = callPackage ../tools/X11/xdotool { }; - xen_4_5 = callPackage ../applications/virtualization/xen/4.5.nix { stdenv = overrideCC stdenv gcc49; }; - xen_xenServer = callPackage ../applications/virtualization/xen/4.5.nix { xenserverPatched = true; stdenv = overrideCC stdenv gcc49; }; - xen = xen_4_5; + xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); + + xen = xenPackages.xen_4_5-vanilla; + xen-slim = xenPackages.xen_4_5-slim; + xen-light = xenPackages.xen_4_5-light; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; From 442b8d49d0e973d2f78bd424efab55d33f6ae98c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 3 Mar 2017 17:46:57 +0000 Subject: [PATCH 005/113] nixos: xen: make packages configurable --- nixos/modules/virtualisation/xen-dom0.nix | 66 ++++++++++++++++------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 67eef0ec1e4..a80b2e1f3b0 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -27,6 +27,36 @@ in ''; }; + virtualisation.xen.package = mkOption { + type = types.package; + default = pkgs.xen; + defaultText = "pkgs.xen"; + example = literalExample "pkgs.xen-light"; + description = '' + The package used for Xen binary. + ''; + }; + + virtualisation.xen.qemu = mkOption { + type = types.path; + default = "${pkgs.xen}/lib/xen/bin/qemu-system-i386"; + defaultText = "''${pkgs.xen}/lib/xen/bin/qemu-system-i386"; + example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386"; + description = '' + The qemu binary to use for Dom-0 backend. + ''; + }; + + virtualisation.xen.qemu-package = mkOption { + type = types.package; + default = pkgs.xen; + defaultText = "pkgs.xen"; + example = literalExample "pkgs.qemu_xen-light"; + description = '' + The package with qemu binaries for xendomains. + ''; + }; + virtualisation.xen.bootParams = mkOption { default = ""; @@ -106,9 +136,9 @@ in message = "Xen currently does not support EFI boot"; } ]; - virtualisation.xen.stored = mkDefault "${pkgs.xen}/bin/oxenstored"; + virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored"; - environment.systemPackages = [ pkgs.xen ]; + environment.systemPackages = [ cfg.package ]; # Make sure Domain 0 gets the required configuration #boot.kernelPackages = pkgs.boot.kernelPackages.override { features={xen_dom0=true;}; }; @@ -144,7 +174,7 @@ in system.extraSystemBuilderCmds = '' - ln -s ${pkgs.xen}/boot/xen.gz $out/xen.gz + ln -s ${cfg.package}/boot/xen.gz $out/xen.gz echo "${toString cfg.bootParams}" > $out/xen-params ''; @@ -180,19 +210,19 @@ in environment.etc = - [ { source = "${pkgs.xen}/etc/xen/xl.conf"; + [ { source = "${cfg.package}/etc/xen/xl.conf"; target = "xen/xl.conf"; } - { source = "${pkgs.xen}/etc/xen/scripts"; + { source = "${cfg.package}/etc/xen/scripts"; target = "xen/scripts"; } - { source = "${pkgs.xen}/etc/default/xendomains"; + { source = "${cfg.package}/etc/default/xendomains"; target = "default/xendomains"; } ]; # Xen provides udev rules. - services.udev.packages = [ pkgs.xen ]; + services.udev.packages = [ cfg.package ]; services.udev.path = [ pkgs.bridge-utils pkgs.iproute ]; @@ -217,7 +247,7 @@ in time=0 timeout=30 # Wait for xenstored to actually come up, timing out after 30 seconds - while [ $time -lt $timeout ] && ! `${pkgs.xen}/bin/xenstore-read -s / >/dev/null 2>&1` ; do + while [ $time -lt $timeout ] && ! `${cfg.package}/bin/xenstore-read -s / >/dev/null 2>&1` ; do time=$(($time+1)) sleep 1 done @@ -228,8 +258,8 @@ in exit 1 fi - ${pkgs.xen}/bin/xenstore-write "/local/domain/0/name" "Domain-0" - ${pkgs.xen}/bin/xenstore-write "/local/domain/0/domid" 0 + ${cfg.package}/bin/xenstore-write "/local/domain/0/name" "Domain-0" + ${cfg.package}/bin/xenstore-write "/local/domain/0/domid" 0 ''; }; @@ -256,7 +286,7 @@ in ''; serviceConfig = { ExecStart = '' - ${pkgs.xen}/bin/xenconsoled${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"} + ${cfg.package}/bin/xenconsoled${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"} ''; }; }; @@ -267,8 +297,8 @@ in wantedBy = [ "multi-user.target" ]; after = [ "xen-console.service" ]; serviceConfig.ExecStart = '' - ${pkgs.xen}/lib/xen/bin/qemu-system-i386 -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv \ - -monitor /dev/null -serial /dev/null -parallel /dev/null + ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \ + -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null ''; }; @@ -277,7 +307,7 @@ in description = "Xen Watchdog Daemon"; wantedBy = [ "multi-user.target" ]; after = [ "xen-qemu.service" ]; - serviceConfig.ExecStart = "${pkgs.xen}/bin/xenwatchdogd 30 15"; + serviceConfig.ExecStart = "${cfg.package}/bin/xenwatchdogd 30 15"; serviceConfig.Type = "forking"; serviceConfig.RestartSec = "1"; serviceConfig.Restart = "on-failure"; @@ -366,11 +396,11 @@ in before = [ "dhcpd.service" ]; restartIfChanged = false; serviceConfig.RemainAfterExit = "yes"; - path = [ pkgs.xen ]; - environment.XENDOM_CONFIG = "${pkgs.xen}/etc/sysconfig/xendomains"; + path = [ cfg.package cfg.qemu-package ]; + environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains"; preStart = "mkdir -p /var/lock/subsys -m 755"; - serviceConfig.ExecStart = "${pkgs.xen}/etc/init.d/xendomains start"; - serviceConfig.ExecStop = "${pkgs.xen}/etc/init.d/xendomains stop"; + serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start"; + serviceConfig.ExecStop = "${cfg.package}/etc/init.d/xendomains stop"; }; }; From 0aa29fa4d8a8bf0e96e83993a624f61fab73c59f Mon Sep 17 00:00:00 2001 From: NWDD Date: Sun, 5 Mar 2017 16:38:55 +0100 Subject: [PATCH 006/113] gitkraken: init at 2.1.0 --- .../version-management/gitkraken/default.nix | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/applications/version-management/gitkraken/default.nix diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix new file mode 100644 index 00000000000..70ca7a74b23 --- /dev/null +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -0,0 +1,74 @@ +{stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib + ,libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig + ,libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst + ,nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus +}: + +stdenv.mkDerivation rec { + name = "gitkraken-${version}"; + version = "2.1.0"; + + src = fetchurl { + url = "https://release.gitkraken.com/linux/v${version}.tar.gz"; + sha256 = "56b5657f5c13fa1d8f6b7b9331194cbc8c48c0b913e5f0fb561d0e9af82f7999"; + }; + + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib + curl + udev + libX11 + libXext + libXcursor + libXi + glib + libXScrnSaver + libxkbfile + libXtst + nss + nspr + cups + alsaLib + expat + gdk_pixbuf + dbus + libXdamage + libXrandr + atk + pango + cairo + freetype + fontconfig + libXcomposite + libXfixes + libXrender + gtk2 + gnome2.GConf + libgnome_keyring + ]; + + phases = [ "unpackPhase" "installPhase" ]; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p "$out/opt/gitkraken" + cp -r ./* "$out/opt/gitkraken" + fixupPhase + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken" + wrapProgram $out/opt/gitkraken/gitkraken \ + --prefix LD_PRELOAD : "${stdenv.lib.makeLibraryPath [ curl ]}/libcurl.so.4" \ + --prefix LD_PRELOAD : "${stdenv.lib.makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0" + mkdir "$out/bin" + ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken" + ''; + + meta = with stdenv.lib; { + homepage = https://www.gitkraken.com/; + description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43743b5c83b..5457886d530 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1918,6 +1918,8 @@ with pkgs; gitinspector = callPackage ../applications/version-management/gitinspector { }; + gitkraken = callPackage ../applications/version-management/gitkraken { }; + gitlab = callPackage ../applications/version-management/gitlab { }; gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; From db23fe1581dc99253113fe06444c65b262284f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 7 Mar 2017 18:13:59 +0100 Subject: [PATCH 007/113] haskell: add justStaticExecutables combinator --- pkgs/development/haskell-modules/lib.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index ab817b7b2a1..2093ec2b218 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -76,6 +76,14 @@ rec { fixupPhase = ":"; }); + # link executables statically against haskell libs to reduce closure size + justStaticExecutables = drv: overrideCabal drv (drv: { + enableSharedExecutables = false; + isLibrary = false; + doHaddock = false; + postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; + }); + buildFromSdist = pkg: pkgs.lib.overrideDerivation pkg (drv: { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' echo "Source tarball is at ${src}/${tarname}.tar.gz" From f67a89e2484bd0c58d3860276264adb65939aaa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 7 Mar 2017 18:15:07 +0100 Subject: [PATCH 008/113] haskell: use new justStaticExecutables and add purescript --- pkgs/top-level/all-packages.nix | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2641e4e39d..54ad012ed9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3287,14 +3287,9 @@ with pkgs; pal = callPackage ../tools/misc/pal { }; - pandoc = haskell.lib.overrideCabal haskellPackages.pandoc (drv: { + pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildTools = drv.buildTools or [] ++ [haskellPackages.hsb2hs]; - enableSharedExecutables = false; - enableSharedLibraries = false; - isLibrary = false; - doHaddock = false; - postFixup = "rm -rf $out/lib $out/nix-support $out/share"; }); panomatic = callPackage ../tools/graphics/panomatic { }; @@ -5132,15 +5127,12 @@ with pkgs; cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install; - stack = haskell.lib.overrideCabal haskellPackages.stack (drv: { - enableSharedExecutables = false; - isLibrary = false; - doHaddock = false; - postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - }); + stack = haskell.lib.justStaticExecutables haskellPackages.stack; all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { }; + purescript = haskell.lib.justStaticExecutables haskellPackages.purescript; + inherit (ocamlPackages) haxe; hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; @@ -6756,12 +6748,7 @@ with pkgs; shards = callPackage ../development/tools/build-managers/shards { }; - shellcheck = haskell.lib.overrideCabal haskellPackages.ShellCheck (drv: { - isLibrary = false; - enableSharedExecutables = false; - doHaddock = false; - postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; - }); + shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; shncpd = callPackage ../tools/networking/shncpd { }; @@ -13020,13 +13007,8 @@ with pkgs; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - darcs = haskell.lib.overrideCabal haskellPackages.darcs (drv: { + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; - enableSharedExecutables = false; - enableSharedLibraries = false; - isLibrary = false; - doHaddock = false; - postFixup = "rm -rf $out/lib $out/nix-support $out/share"; }); darktable = callPackage ../applications/graphics/darktable { From 032de64e0fd10650b0d432cbc2921486755576fc Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Mon, 6 Mar 2017 02:46:42 +0100 Subject: [PATCH 009/113] haskell: ghc710x packages: remove superflous configuration for lens --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 54cd16957ed..ee62cf64fec 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -202,7 +202,7 @@ self: super: { hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; }); hslogger = addBuildDepend super.hslogger self.HUnit; intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); - lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); + lens = addBuildDepend super.lens self.generic-deriving; optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); From 0f72dee0002ff94e1f1620b5cd56c8cb985b0dff Mon Sep 17 00:00:00 2001 From: NWDD Date: Tue, 7 Mar 2017 18:08:43 +0100 Subject: [PATCH 010/113] add xnwdd as a maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ef64a9b53c6..0ffca05180f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -354,6 +354,7 @@ np = "Nicolas Pouillard "; nslqqq = "Nikita Mikhailov "; nthorne = "Niklas Thörne "; + xnwdd = "Guillermo NWDD "; obadz = "obadz "; ocharles = "Oliver Charles "; odi = "Oliver Dunkl "; From d95f21f6a18b77ae503902325af84256369ea3d1 Mon Sep 17 00:00:00 2001 From: Henry Till Date: Tue, 7 Mar 2017 15:08:02 -0500 Subject: [PATCH 011/113] racket: add readline support --- pkgs/development/interpreters/racket/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 6f3df4e866d..72217a860b4 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeFontsConf, makeWrapper , cairo, coreutils, fontconfig, freefont_ttf -, glib, gmp, gtk2, libffi, libjpeg, libpng -, libtool, mpfr, openssl, pango, poppler +, glib, gmp, gtk2, libedit, libffi, libjpeg +, libpng, libtool, mpfr, openssl, pango, poppler , readline, sqlite , disableDocs ? true }: @@ -18,6 +18,7 @@ let glib gmp gtk2 + libedit libjpeg libpng mpfr From e965d8aa1c7be58f6a07ba9d9f3c0370dcce6f94 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 7 Mar 2017 21:54:13 +0100 Subject: [PATCH 012/113] cassandra: remove old branches 1.2 and 2.0 These are no longer supported upstream. --- pkgs/servers/nosql/cassandra/1.2.nix | 6 ------ pkgs/servers/nosql/cassandra/2.0.nix | 6 ------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 14 deletions(-) delete mode 100644 pkgs/servers/nosql/cassandra/1.2.nix delete mode 100644 pkgs/servers/nosql/cassandra/2.0.nix diff --git a/pkgs/servers/nosql/cassandra/1.2.nix b/pkgs/servers/nosql/cassandra/1.2.nix deleted file mode 100644 index 87cb4a11f9a..00000000000 --- a/pkgs/servers/nosql/cassandra/1.2.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.2.19"; - sha256 = "0zkq3ggpk8ra2siar43vmrn6lmvn902p1g2lrgb46ak1vii6w30w"; -}) diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix deleted file mode 100644 index 68bee0c124b..00000000000 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "2.0.16"; - sha256 = "1fpvgmakmxy1lnygccpc32q53pa36bwy0lqdvb6hsifkxymdw8y5"; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34c48c59213..34027760b46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10402,8 +10402,6 @@ with pkgs; cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra_1_2 = callPackage ../servers/nosql/cassandra/1.2.nix { }; - cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { }; cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { }; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { }; From 0bd211d84f66975380c35386b7b19a69d1beff44 Mon Sep 17 00:00:00 2001 From: Daniel Ehlers Date: Mon, 6 Mar 2017 16:41:02 +0100 Subject: [PATCH 013/113] ddclient: Make verbose logging deactivatable. --- .../modules/services/networking/ddclient.nix | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 5928203368d..28c96a9baef 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -7,7 +7,7 @@ let stateDir = "/var/spool/ddclient"; ddclientUser = "ddclient"; - ddclientFlags = "-foreground -verbose -noquiet -file ${config.services.ddclient.configFile}"; + ddclientFlags = "-foreground -file ${config.services.ddclient.configFile}"; ddclientPIDFile = "${stateDir}/ddclient.pid"; in @@ -102,6 +102,22 @@ in Method to determine the IP address to send to the dynamic DNS provider. ''; }; + + verbose = mkOption { + default = true; + type = bool; + description = '' + Print verbose information. + ''; + }; + + quiet = mkOption { + default = false; + type = bool; + description = '' + Print no messages for unnecessary updates. + ''; + }; }; }; @@ -136,6 +152,8 @@ in lib.optionalString (server != "") "server=${server}"} ssl=${if config.services.ddclient.ssl then "yes" else "no"} wildcard=YES + quiet=${if config.services.ddclient.quiet then "yes" else "no"} + verbose=${if config.services.ddclient.verbose then "yes" else "no"} ${config.services.ddclient.domain} ${config.services.ddclient.extraConfig} ''; From e206d5ab63b64b377c22488ac0b33481bef9bf21 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 7 Mar 2017 22:15:13 +0100 Subject: [PATCH 014/113] dogecoin: fix sha256 --- pkgs/applications/altcoins/dogecoin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index fc70302ab3c..d8df6dd8349 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "dogecoin"; repo = "dogecoin"; rev = "v${version}"; - sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvyt chec"; + sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvy"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 22c265182f9e0d543de0fe46a809180ff2021b85 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 6 Mar 2017 13:23:45 +0100 Subject: [PATCH 015/113] networking/bonds: fix examples After the change of the bonding options, the examples were not quite correct. The diff is over-the top because the new `let` needs everything indented. Also add a small docstring to the `networkd` attr in the networking test. --- nixos/modules/tasks/network-interfaces.nix | 181 +++++++++++---------- nixos/tests/networking.nix | 4 +- 2 files changed, 94 insertions(+), 91 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 42a1a5a2332..6467259766e 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -560,101 +560,102 @@ in }; - networking.bonds = mkOption { - default = { }; - example = literalExample { - bond0 = { - interfaces = [ "eth0" "wlan0" ]; - miimon = 100; + networking.bonds = + let + driverOptionsExample = { + miimon = "100"; mode = "active-backup"; }; - fatpipe.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ]; - }; - description = '' - This option allows you to define bond devices that aggregate multiple, - underlying networking interfaces together. The value of this option is - an attribute set. Each attribute specifies a bond, with the attribute - name specifying the name of the bond's network interface - ''; - - type = with types; attrsOf (submodule { - - options = { - - interfaces = mkOption { - example = [ "enp4s0f0" "enp4s0f1" "wlan0" ]; - type = types.listOf types.str; - description = "The interfaces to bond together"; + in mkOption { + default = { }; + example = literalExample { + bond0 = { + interfaces = [ "eth0" "wlan0" ]; + driverOptions = driverOptionsExample; }; - - driverOptions = mkOption { - type = types.attrsOf types.str; - default = {}; - example = literalExample { - interfaces = [ "eth0" "wlan0" ]; - miimon = 100; - mode = "active-backup"; - }; - description = '' - Options for the bonding driver. - Documentation can be found in - - ''; - - }; - - lacp_rate = mkOption { - default = null; - example = "fast"; - type = types.nullOr types.str; - description = '' - DEPRECATED, use `driverOptions`. - Option specifying the rate in which we'll ask our link partner - to transmit LACPDU packets in 802.3ad mode. - ''; - }; - - miimon = mkOption { - default = null; - example = 100; - type = types.nullOr types.int; - description = '' - DEPRECATED, use `driverOptions`. - Miimon is the number of millisecond in between each round of polling - by the device driver for failed links. By default polling is not - enabled and the driver is trusted to properly detect and handle - failure scenarios. - ''; - }; - - mode = mkOption { - default = null; - example = "active-backup"; - type = types.nullOr types.str; - description = '' - DEPRECATED, use `driverOptions`. - The mode which the bond will be running. The default mode for - the bonding driver is balance-rr, optimizing for throughput. - More information about valid modes can be found at - https://www.kernel.org/doc/Documentation/networking/bonding.txt - ''; - }; - - xmit_hash_policy = mkOption { - default = null; - example = "layer2+3"; - type = types.nullOr types.str; - description = '' - DEPRECATED, use `driverOptions`. - Selects the transmit hash policy to use for slave selection in - balance-xor, 802.3ad, and tlb modes. - ''; - }; - + anotherBond.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ]; }; + description = '' + This option allows you to define bond devices that aggregate multiple, + underlying networking interfaces together. The value of this option is + an attribute set. Each attribute specifies a bond, with the attribute + name specifying the name of the bond's network interface + ''; - }); - }; + type = with types; attrsOf (submodule { + + options = { + + interfaces = mkOption { + example = [ "enp4s0f0" "enp4s0f1" "wlan0" ]; + type = types.listOf types.str; + description = "The interfaces to bond together"; + }; + + driverOptions = mkOption { + type = types.attrsOf types.str; + default = {}; + example = literalExample driverOptionsExample; + description = '' + Options for the bonding driver. + Documentation can be found in + + ''; + + }; + + lacp_rate = mkOption { + default = null; + example = "fast"; + type = types.nullOr types.str; + description = '' + DEPRECATED, use `driverOptions`. + Option specifying the rate in which we'll ask our link partner + to transmit LACPDU packets in 802.3ad mode. + ''; + }; + + miimon = mkOption { + default = null; + example = 100; + type = types.nullOr types.int; + description = '' + DEPRECATED, use `driverOptions`. + Miimon is the number of millisecond in between each round of polling + by the device driver for failed links. By default polling is not + enabled and the driver is trusted to properly detect and handle + failure scenarios. + ''; + }; + + mode = mkOption { + default = null; + example = "active-backup"; + type = types.nullOr types.str; + description = '' + DEPRECATED, use `driverOptions`. + The mode which the bond will be running. The default mode for + the bonding driver is balance-rr, optimizing for throughput. + More information about valid modes can be found at + https://www.kernel.org/doc/Documentation/networking/bonding.txt + ''; + }; + + xmit_hash_policy = mkOption { + default = null; + example = "layer2+3"; + type = types.nullOr types.str; + description = '' + DEPRECATED, use `driverOptions`. + Selects the transmit hash policy to use for slave selection in + balance-xor, 802.3ad, and tlb modes. + ''; + }; + + }; + + }); + }; networking.macvlans = mkOption { default = { }; diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 17b04c8db15..6a7e628d8ef 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -1,4 +1,6 @@ -{ system ? builtins.currentSystem, networkd }: +{ system ? builtins.currentSystem +# bool: whether to use networkd in the tests +, networkd }: with import ../lib/testing.nix { inherit system; }; with pkgs.lib; From 90c5c9d8c941254f2d8af6685d99ff277e864087 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 7 Mar 2017 23:02:26 -0600 Subject: [PATCH 016/113] lilypond-with-fonts: fix typos In development, I experimented with file globs, for loops and making the supplementary fonts optional. As such, the original PR ended up with a dysfunctional combination. This commit fully adopts the for loop approach, which I prefer, since failing matches, e.g. missing supplementary-fonts/, won't cause a failure. --- pkgs/misc/lilypond/fonts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index 6ad4f06328d..bb3487cd0a8 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -24,11 +24,11 @@ let installPhase = '' for f in {otf,supplementary-fonts}/**.{o,t}tf; do - install -Dt $out/otf -m755 otf/* + install -Dt $out/otf -m755 $f done for f in svg/**.{svg,woff}; do - install -Dt $out/svg -m755 svg/* + install -Dt $out/svg -m755 $f done ''; From 6f68eb7c7ec8f17e33a93330c4a387e8bc8048c6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 8 Mar 2017 15:35:33 +0800 Subject: [PATCH 017/113] msmtp: use netcat-gnu to unbreak darwin --- pkgs/applications/networking/msmtp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 1eab140e1d7..156ea589388 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, autoreconfHook, pkgconfig -, openssl, netcat, gnutls, gsasl, libidn, Security, systemd }: +, openssl, netcat-gnu, gnutls, gsasl, libidn, Security +, systemd ? null }: let tester = "n"; # {x| |p|P|n|s} @@ -28,7 +29,7 @@ in stdenv.mkDerivation rec { postInstall = '' substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \ --replace @msmtp@ $out/bin/msmtp \ - --replace @nc@ ${netcat}/bin/nc \ + --replace @nc@ ${netcat-gnu}/bin/nc \ --replace @journal@ ${journal} \ ${lib.optionalString (journal == "y") "--replace @systemdcat@ ${systemd}/bin/systemd-cat" } \ --replace @test@ ${tester} From 060f7cb94d236c8f1b60ab05670c5448b5be3e67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 8 Mar 2017 09:31:18 +0100 Subject: [PATCH 018/113] haskell-generic-builder: remove unused nodePackages argument --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index e47375e71c7..f580de51a35 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused -, jailbreak-cabal, hscolour, cpphs, nodePackages +, jailbreak-cabal, hscolour, cpphs }: let isCross = (ghc.cross or null) != null; in { pname From 2c99575c664312449fb0844e68f9ad5eac376dc0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 8 Mar 2017 17:34:54 +0800 Subject: [PATCH 019/113] neovim-qt: 0.2.4 -> 0.2.5 --- pkgs/applications/editors/neovim/qt.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 66c538a1976..1c5d227a0ba 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, cmake, doxygen -, libmsgpack, makeWrapper, neovim, pythonPackages, qtbase }: +, libmsgpack, makeQtWrapper, neovim, pythonPackages, qtbase }: stdenv.mkDerivation rec { name = "neovim-qt-${version}"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "0yf9wwkl0lbbj3vyf8hxnlsk7jhk5ggivszyqxply69dbar9ww59"; + sha256 = "1q706k400j5v9kans71yjz9p36ran2lpz29m4vjzj920llksln3d"; }; cmakeFlags = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { jinja2 msgpack python ]); - nativeBuildInputs = [ cmake doxygen makeWrapper ]; + nativeBuildInputs = [ cmake doxygen makeQtWrapper ]; enableParallelBuilding = true; @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { preConfigure = "echo \"\" > third-party/CMakeLists.txt"; postInstall = '' - wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin" + wrapQtProgram "$out/bin/nvim-qt" \ + --prefix PATH : "${neovim}/bin" ''; meta = with stdenv.lib; { From 2c02c84cdceea6aebba06502cc740ab69e69bd5f Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 8 Mar 2017 11:33:01 +0100 Subject: [PATCH 020/113] verilator: fix Perl shebangs --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 3c01f8f3749..ed4a430198a 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ perl flex_2_6_1 bison ]; + postInstall = '' + sed -i -e '3a\#!/usr/bin/env perl' -e '1,3d' $out/bin/{verilator,verilator_coverage,verilator_profcfunc} + ''; + meta = { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "http://www.veripool.org/wiki/verilator"; From e17d3d4ef1c777b9b4ea9724d4dcc1631832bdc1 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sat, 4 Mar 2017 10:29:16 -0300 Subject: [PATCH 021/113] gplates: use boost 160 update 161 changed reference parameters for optional https://hydra.nixos.org/build/49707856/nixlog/1 http://www.boost.org/doc/libs/1_61_0/libs/optional/doc/html/boost_ooptional/relnotes.html --- pkgs/applications/science/misc/gplates/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 7fa0c3f6865..05e0091108a 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal -, proj, boost159, cmake, python2, doxygen, graphviz, gmp }: +, proj, boost, cmake, python2, doxygen, graphviz, gmp }: stdenv.mkDerivation rec { name = "gplates-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost159 cmake python2 + qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b01b111f23..12504c5099e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17466,7 +17466,10 @@ with pkgs; fityk = callPackage ../applications/science/misc/fityk { }; - gplates = callPackage ../applications/science/misc/gplates { }; + gplates = callPackage ../applications/science/misc/gplates { + boost = boost160; + cgal = cgal.override { boost = boost160; }; + }; gravit = callPackage ../applications/science/astronomy/gravit { }; From cb670556c52f134e6d042ea3be4f607b8ece508a Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Wed, 8 Mar 2017 13:27:16 +0200 Subject: [PATCH 022/113] nss: 3.28.1 -> 3.28.3 This should fix firefox build, which fails due to nss being too old. --- pkgs/development/libraries/nss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 8621d60ca96..294371dde7a 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.28.1"; + version = "3.28.3"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_28_1_RTM/src/${name}.tar.gz"; - sha256 = "58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad"; + url = "mirror://mozilla/security/nss/releases/NSS_3_28_3_RTM/src/${name}.tar.gz"; + sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x"; }; buildInputs = [ nspr perl zlib sqlite ]; From d4bb1c786fd35d359b2eb8364863b4320cac1627 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Wed, 8 Mar 2017 13:39:40 +0200 Subject: [PATCH 023/113] sqlite: 3.16.2 -> 3.17.0 Firefox requires the latest sqlite to build: ``` checking for sqlite3 >= 3.17.0... Requested 'sqlite3 >= 3.17.0' but version of SQLite is 3.16.2 configure: error: Library requirements (sqlite3 >= 3.17.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them. ``` --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 6e86780446c..a8031716230 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.16.2"; + name = "sqlite-3.17.0"; src = fetchurl { - url = "http://sqlite.org/2017/sqlite-autoconf-3160200.tar.gz"; - sha256 = "059n4s9qd35qpbd4g29y9ay99a6f68ad7k65g430rxb6jcz0rk35"; + url = "http://sqlite.org/2017/sqlite-autoconf-3170000.tar.gz"; + sha256 = "0k472gq0p706jq4529p60znvw02hdf172qxgbdv59q0n7anqbr54"; }; outputs = [ "bin" "dev" "out" ]; From 28598c01e7e09c606b5988306ce84534a717b94a Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Wed, 8 Mar 2017 14:01:39 +0200 Subject: [PATCH 024/113] icu: 57.1 -> 58.2 Firefox requires new version of the icu to build: ``` checking for icu-i18n >= 58.1... Requested 'icu-i18n >= 58.1' but version of icu-i18n is 57.1 configure: error: Library requirements (icu-i18n >= 58.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them. ``` --- pkgs/development/libraries/icu/default.nix | 24 ++-------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index d4a4c2a500c..1508f05db8b 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -2,7 +2,7 @@ let pname = "icu4c"; - version = "57.1"; + version = "58.2"; in stdenv.mkDerivation ({ name = pname + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z"; + sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; }; outputs = [ "out" "dev" ]; @@ -35,26 +35,6 @@ stdenv.mkDerivation ({ ''; patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch"; - sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch"; - sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch"; - sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch"; - sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch"; - sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r"; - }) ]; preConfigure = '' From a9e990b818b3922f0994178bd12970df60abaa22 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 8 Mar 2017 20:07:40 +0800 Subject: [PATCH 025/113] neovim: 0.2.5 -> 0.2.6 --- pkgs/applications/editors/neovim/qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 1c5d227a0ba..b2eef4305f2 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "neovim-qt-${version}"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "1q706k400j5v9kans71yjz9p36ran2lpz29m4vjzj920llksln3d"; + sha256 = "1wsxhy8fdayy4dsr2dxgh5k4jysybjlyzj134vk325v6cqz9bsgm"; }; cmakeFlags = [ From 26625c928be8ce503b23f5302222bdcb380a4445 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 8 Mar 2017 20:26:18 +0800 Subject: [PATCH 026/113] neovim-qt: run tests --- pkgs/applications/editors/neovim/qt.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index b2eef4305f2..26f2a3b6941 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so" ]; - doCheck = false; # 5 out of 7 fail + doCheck = true; buildInputs = with pythonPackages; [ - qtbase libmsgpack + neovim qtbase libmsgpack ] ++ (with pythonPackages; [ jinja2 msgpack python ]); @@ -29,8 +29,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # avoid cmake trying to download libmsgpack - preConfigure = "echo \"\" > third-party/CMakeLists.txt"; + preConfigure = '' + # avoid cmake trying to download libmsgpack + echo "" > third-party/CMakeLists.txt + # we rip out the gui test as spawning a GUI fails in our build environment + sed -i '/^add_xtest_gui/d' test/CMakeLists.txt + ''; postInstall = '' wrapQtProgram "$out/bin/nvim-qt" \ From 01bb228b2a1a2b2893bd5845b241a3ca0317a219 Mon Sep 17 00:00:00 2001 From: Jeff Simpson Date: Wed, 8 Mar 2017 05:52:40 -0700 Subject: [PATCH 027/113] Add curl dependency to Slack for calls --- .../networking/instant-messengers/slack/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index fa0c72f0ca0..59ce03cc0f4 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, glib, gnome2 +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2 , libnotify, nspr, nss, systemd, xorg }: let @@ -11,6 +11,7 @@ let atk cairo cups + curl dbus expat fontconfig From c8402dde1547dd3faaadba5d08015cd07c5c98a4 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 8 Mar 2017 15:31:34 +0200 Subject: [PATCH 028/113] libp11: Fetch src from GitHub --- pkgs/development/libraries/libp11/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 4f1bd7de3d9..91195229d87 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -1,17 +1,17 @@ -{stdenv, fetchurl, libtool, openssl, pkgconfig}: +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, pkgconfig }: stdenv.mkDerivation rec { name = "libp11-0.2.7"; - - src = fetchurl { - urls = [ - "http://www.opensc-project.org/files/libp11/${name}.tar.gz" - "http://www.openadk.org/distfiles/${name}.tar.gz" - ]; - sha256 = "0kaz5qafaxm0ycywmajl166c29fh9cz89b8i043jqsbxlpzf4hdp"; + + src = fetchFromGitHub { + owner = "OpenSC"; + repo = "libp11"; + rev = name; + sha256 = "0llw69kcb6nvz7zzkb9nyfyhc2s972q68sqciabqxwxljr09c411"; }; - - buildInputs = [ libtool openssl pkgconfig ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + buildInputs = [ openssl ]; meta = { homepage = http://www.opensc-project.org/libp11/; From bb4c6a78008bcf3841a7d4b2ebaa71ae99ecd5dc Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 8 Mar 2017 09:08:31 -0500 Subject: [PATCH 029/113] nixpkgs: build aarch64-linux --- pkgs/top-level/release.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c301ceb1530..9c24855dc50 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -12,7 +12,7 @@ { nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. - supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] + supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true }: @@ -41,18 +41,23 @@ let jobs.lib-tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux + jobs.stdenv.aarch64-linux jobs.stdenv.x86_64-darwin jobs.linux.x86_64-linux jobs.linux.i686-linux + jobs.linux.aarch64-linux jobs.python.x86_64-linux jobs.python.i686-linux + jobs.python.aarch4-linux jobs.python.x86_64-darwin jobs.python3.x86_64-linux jobs.python3.i686-linux + jobs.python3.aarchh64-linux jobs.python3.x86_64-darwin # Many developers use nix-repl jobs.nix-repl.x86_64-linux jobs.nix-repl.i686-linux + jobs.nix-repl.aarch64-linux jobs.nix-repl.x86_64-darwin # Needed by travis-ci to test PRs jobs.nox.i686-linux @@ -61,6 +66,7 @@ let # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux jobs.thunderbird.i686-linux + jobs.thunderbird.aarch64-linux # Ensure that basic stuff works on darwin jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin @@ -73,6 +79,9 @@ let }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" supportedSystems) { stdenvBootstrapTools.x86_64-linux = { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; }; + }) // (lib.optionalAttrs (builtins.elem "aarch64-linux" supportedSystems) { + stdenvBootstrapTools.aarch64-linux = + { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "aarch64-linux"; }) dist test; }; }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" supportedSystems) { stdenvBootstrapTools.x86_64-darwin = let From 413bc03986801af2dcad2e3672b4c42d03390ac2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 8 Mar 2017 16:13:49 +0200 Subject: [PATCH 030/113] mess: Mark broken Even fixing the source urls doesn't make it build. --- pkgs/misc/emulators/mess/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index 8f232a6023c..98bd8bae3e0 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -6,12 +6,12 @@ let version = "139"; mameSrc = fetchurl { - url = "http://www.aarongiles.com/mirror/releases/mame0${version}s.zip"; + url = "https://github.com/mamedev/mame/releases/download/mame0139/mame0${version}s.zip"; sha256 = "1mpkwxfz38cgxzvlni2y3fxas3b8qmnzj2ik2zzbd8mr622jdp79"; }; - + messSrc = fetchurl { - url = "http://mess.redump.net/_media/downloads:mess0${version}s.zip"; + url = "http://www.progettosnaps.net/MESS/src/mess0${version}s.zip"; name = "mess0139s.zip"; sha256 = "1v892cg6wn8cdwc8pf1gcqqdb1v1v295r6jw2hf58svwx3h27xyy"; }; @@ -39,10 +39,11 @@ stdenv.mkDerivation { mkdir -p $out/bin cp mess* $out/bin/mess ''; - + meta = { homepage = http://www.mess.org/; license = "non-commercial"; description = "Multi Emulator Super System, an emulator of many game consoles and computer systems"; + broken = true; }; } From 9d9cc7ba5f87108b01305bc43d7b97e25453170c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Mar 2017 14:41:55 +0100 Subject: [PATCH 031/113] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/e5e1058cdef630c7377086dd752665ffd48b182f. --- .../haskell-modules/hackage-packages.nix | 442 ++++++++++++++++-- 1 file changed, 410 insertions(+), 32 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d9ebdb70b82..c50f9a12731 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2873,6 +2873,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Compactable" = callPackage + ({ mkDerivation, base, containers, transformers, vector }: + mkDerivation { + pname = "Compactable"; + version = "0.1.0.2"; + sha256 = "402a4d9c2fd28c9d780f094d112858f38600cf73bbdddf9baaac580912cd3f3e"; + libraryHaskellDepends = [ base containers transformers vector ]; + description = "A generalization for containers that can be stripped of Nothing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Concurrent-Cache" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -20896,8 +20907,8 @@ self: { }: mkDerivation { pname = "affection"; - version = "0.0.0.4"; - sha256 = "31d82e66df577e34b0b96a70111d61918db70db93b3b0a66ce4e27c661688a58"; + version = "0.0.0.5"; + sha256 = "4d5f2d6257d6dcb6fe7b1658bead8e0c48451414d434d44e5492709b81ac43e7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33658,6 +33669,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "boltzmann-samplers" = callPackage + ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754 + , MonadRandom, mtl, QuickCheck, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "boltzmann-samplers"; + version = "0.1.0.0"; + sha256 = "5707065a83cb30223ffedbd740ac07d3d879bb0895ba7666d23d659e3b69883f"; + revision = "1"; + editedCabalFile = "203beaed2fdb6bbbd42cfa264f9fe1ef2ba4a69f4c92a85864317ffdd43a6a03"; + libraryHaskellDepends = [ + ad base containers hashable hmatrix ieee754 MonadRandom mtl + QuickCheck transformers unordered-containers vector + ]; + homepage = "https://github.com/Lysxia/boltzmann-samplers#readme"; + description = "Uniform random generators"; + license = stdenv.lib.licenses.mit; + }) {}; + "bond" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring , cmdargs, derive, Diff, directory, filepath, HUnit, monad-loops @@ -34511,8 +34542,8 @@ self: { ({ mkDerivation, base, bson, template-haskell, text, th-lift }: mkDerivation { pname = "bson-mapping"; - version = "0.1.5.0"; - sha256 = "ba8ec4df8362c67e3da032399e92ddc94a6ddbd80232e2566648de0b5d53085a"; + version = "0.1.5.1"; + sha256 = "3f8eeb235b75a265bbc32b0fd808319144096d306f9bf1ed4434a28dd24facde"; libraryHaskellDepends = [ base bson template-haskell text th-lift ]; @@ -41194,20 +41225,20 @@ self: { "clit" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base - , bytestring, data-default, http-client, http-client-tls + , bytestring, data-default, directory, http-client, http-client-tls , http-types, lens, megaparsec, MissingH, optparse-applicative , split, text }: mkDerivation { pname = "clit"; - version = "0.3.0.3"; - sha256 = "963a5a636ded2f1f7ac7a6b4b4af8a38403ecda4913e12b36719ee57c1a27925"; + version = "0.3.1.0"; + sha256 = "1e8f6dfb1c868b979722ec855b8b75165a61bf41a210a2c29a408573c9bc8085"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring - data-default http-client http-client-tls http-types lens megaparsec - MissingH optparse-applicative split text + data-default directory http-client http-client-tls http-types lens + megaparsec MissingH optparse-applicative split text ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; @@ -58120,8 +58151,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "effin"; - version = "0.3.0.1"; - sha256 = "2e6a4a183d3626ab2509e7e80461efaeeb7327fa41fe3883f7e4163e9bec9365"; + version = "0.3.0.2"; + sha256 = "dd09e453c57987990865d8ff3b5e8ff26035a6087a31b5ecb4d1c3dfd785f014"; libraryHaskellDepends = [ base mtl ]; homepage = "https://github.com/YellPika/effin"; description = "A Typeable-free implementation of extensible effects"; @@ -60658,6 +60689,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eve" = callPackage + ({ mkDerivation, base, containers, data-default, free, hspec + , hspec-core, lens, mtl, pipes, pipes-concurrency, pipes-parse + }: + mkDerivation { + pname = "eve"; + version = "0.1.0"; + sha256 = "18cc10498a3c663fed847eaa5caf910f613cca4c817e05a3e884b077b2122ed9"; + libraryHaskellDepends = [ + base containers data-default free lens mtl pipes pipes-concurrency + pipes-parse + ]; + testHaskellDepends = [ + base data-default hspec hspec-core lens mtl + ]; + homepage = "https://github.com/ChrisPenner/eve#readme"; + description = "An extensible event framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "event" = callPackage ({ mkDerivation, base, containers, semigroups, transformers }: mkDerivation { @@ -64053,8 +64104,8 @@ self: { }: mkDerivation { pname = "fix-imports"; - version = "1.0.4"; - sha256 = "46da19d982e3470bd28e55f895c3fc6e6e80a6b98f1014f32755b8601cc61e49"; + version = "1.0.5"; + sha256 = "0b072eec7895d3514276c2a25d6d56665dbabb46b13c22aeb5f560459216de05"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -64957,8 +65008,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.1.2"; - sha256 = "30a8f7229bb16ccd72bdefddf67d4ef23e9c87e200207dfdf944b737dd49a71d"; + version = "0.5.1.3"; + sha256 = "391f97abb8acac97b82d3b8a3ee3d62e2f76b566c01be2dff8835932fd85ae29"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -66560,6 +66611,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "freer-effects" = callPackage + ({ mkDerivation, base, criterion, free, hlint, mtl, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "freer-effects"; + version = "0.3.0.0"; + sha256 = "06b67cabe8141468a0bc55d6f39918fd0a037992e760411d116a36a22586d57f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hlint QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion free mtl ]; + homepage = "https://github.com/IxpertaSolutions/freer-effects"; + description = "Implementation of effect system for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel , pretty, random, syb @@ -68242,8 +68314,8 @@ self: { }: mkDerivation { pname = "general-games"; - version = "1.0.1"; - sha256 = "ce6805d308b6aed79de4c55ea6b4d1edd7ce0a536df9131d1aef2f1f7e1221a6"; + version = "1.0.2"; + sha256 = "1415c6cb8a2d37322e7568ae53ffca5d658aed6e47bbbefa5c59ed88c09b384e"; libraryHaskellDepends = [ base monad-loops MonadRandom random random-shuffle ]; @@ -68475,6 +68547,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-random_0_4_1_0" = callPackage + ({ mkDerivation, base, boltzmann-samplers, QuickCheck }: + mkDerivation { + pname = "generic-random"; + version = "0.4.1.0"; + sha256 = "cad16f88436384b5157b1ba09d7931f2d31a60c46bab4669659bff7936032ee2"; + libraryHaskellDepends = [ base boltzmann-samplers QuickCheck ]; + homepage = "http://github.com/lysxia/generic-random"; + description = "Generic random generators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-records" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -70291,14 +70376,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghcjs-hplay_0_4_1" = callPackage + "ghcjs-hplay_0_4_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory , ghcjs-perch, mtl, transformers, transient, transient-universe }: mkDerivation { pname = "ghcjs-hplay"; - version = "0.4.1"; - sha256 = "0589b76f6411abcf05a61a3f2b9d2d25064d5c1140dabf14b4a5d6aca0162b2b"; + version = "0.4.2"; + sha256 = "abab4f37c8168fca3c9c82b3349ac817c0771b6b09cc09a1eb6cce46bd0bdc2d"; libraryHaskellDepends = [ base bytestring containers directory ghcjs-perch mtl transformers transient transient-universe @@ -76091,10 +76176,8 @@ self: { }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.1.0.0"; - sha256 = "375204744bebde75f9d249dc535d6b3199b342c6e68e452b7af4a3ac55521ef5"; - revision = "1"; - editedCabalFile = "293782aef4b6465cfe154b1601db24c5720a444c802f5a454fa06f04f0549614"; + version = "0.1.0.1"; + sha256 = "58cd8efd50ebeaf4a5630f4548065c1e05ce6a39367d9ccaa0e1ccc67be3f531"; libraryHaskellDepends = [ aeson base http-client servant servant-client text ]; @@ -102520,8 +102603,8 @@ self: { pname = "imperative-edsl"; version = "0.7"; sha256 = "1a207736fb6b84e5316bbbe95593b464fe7f155db65e89fbac78b59d0e05f5f7"; - revision = "1"; - editedCabalFile = "c7ce36becbcecf66151a8b850abb7a19752aa0dfd68922198dd53ed95470b57c"; + revision = "2"; + editedCabalFile = "c0d206bbb494b14bb4f2bbcbab994dc65fde03edb3f898d3ede7492578774f97"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -106293,6 +106376,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "javascript-extras" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "javascript-extras"; + version = "0.1.0.0"; + sha256 = "cf74b6c2be87ee5bc96b5ff47335a8eb2d879d7ec83bf6c83be609293f40f4be"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/louispan/javascript-extras#readme"; + description = "Extra javascript functions when using GHCJS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "javasf" = callPackage ({ mkDerivation, base, binary, bytestring, directory, doctest , filepath, language-java-classfile, QuickCheck @@ -110783,6 +110878,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c-quote_0_11_7_2" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , exception-mtl, exception-transformers, filepath, happy + , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb + , symbol, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "language-c-quote"; + version = "0.11.7.2"; + sha256 = "5654187eaa82afe2b7ad959436b35c561fa5bc5b68af5624ab204e9db3591508"; + libraryHaskellDepends = [ + array base bytestring containers exception-mtl + exception-transformers filepath haskell-src-meta mainland-pretty + mtl srcloc syb symbol template-haskell + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring HUnit mainland-pretty srcloc symbol test-framework + test-framework-hunit + ]; + homepage = "http://www.drexel.edu/~mainland/"; + description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-cil" = callPackage ({ mkDerivation, base, bool-extras }: mkDerivation { @@ -118345,6 +118466,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mainland-pretty_0_5_0_0" = callPackage + ({ mkDerivation, base, containers, srcloc, text }: + mkDerivation { + pname = "mainland-pretty"; + version = "0.5.0.0"; + sha256 = "0666eb8e8005d42c00b49177eeb07518f578d2cb0f891aa7be6c44bd88428d43"; + libraryHaskellDepends = [ base containers srcloc text ]; + homepage = "https://github.com/mainland/mainland-pretty"; + description = "Pretty printing designed for printing source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "majordomo" = callPackage ({ mkDerivation, base, bytestring, cmdargs, monad-loops, old-locale , threads, time, unix, zeromq-haskell @@ -119321,8 +119455,8 @@ self: { }: mkDerivation { pname = "marvin"; - version = "0.2.2"; - sha256 = "87c5aa6059c7dbf6c8d20d31d3a242bc68aa888313453448ca520f726272dbbb"; + version = "0.2.3"; + sha256 = "79f439662bd8acd8ab528f29fad7ec73517edcf198fc29dc693c35100110553d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119587,6 +119721,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {eng = null; mat = null; mx = null;}; + "matplotlib" = callPackage + ({ mkDerivation, aeson, base, bytestring, process, tasty + , tasty-hunit, temporary + }: + mkDerivation { + pname = "matplotlib"; + version = "0.1.0.0"; + sha256 = "8001811170e201741eca52a0926c78810f451b104cc1ef055779b1b7351dee0d"; + libraryHaskellDepends = [ + aeson base bytestring process temporary + ]; + testHaskellDepends = [ base tasty tasty-hunit temporary ]; + homepage = "https://github.com/abarbu/matplotlib-haskell"; + description = "Bindings to Matplotlib; a Python plotting library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "matrices" = callPackage ({ mkDerivation, base, criterion, deepseq, primitive, tasty , tasty-hunit, tasty-quickcheck, vector @@ -136351,6 +136502,41 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent_2_6_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, blaze-markup, bytestring, conduit, containers + , exceptions, fast-logger, hspec, http-api-data, lifted-base + , monad-control, monad-logger, mtl, old-locale, path-pieces + , resource-pool, resourcet, scientific, silently, tagged + , template-haskell, text, time, transformers, transformers-base + , unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.6.1"; + sha256 = "c79e0f6e7b727dcae0c7c541f1d47eb8fb0b9e9c55d2478a476a4aca8e405f7e"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html blaze-markup + bytestring conduit containers exceptions fast-logger http-api-data + lifted-base monad-control monad-logger mtl old-locale path-pieces + resource-pool resourcet scientific silently tagged template-haskell + text time transformers transformers-base unordered-containers + vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data lifted-base + monad-control monad-logger mtl old-locale path-pieces resource-pool + resourcet scientific tagged template-haskell text time transformers + unordered-containers vector + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, multi-backend data serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -136532,6 +136718,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql_2_6_0_1" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-control, monad-logger, mysql, mysql-simple + , persistent, resource-pool, resourcet, text, transformers + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.6.0.1"; + sha256 = "6c7b1805517c084ed971bcb78f12e7ebc87339389660ac470473a2ed49894cbe"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers + monad-control monad-logger mysql mysql-simple persistent + resource-pool resourcet text transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -136588,6 +136794,28 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-postgresql_2_6_1" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-control, monad-logger, persistent + , postgresql-libpq, postgresql-simple, resource-pool, resourcet + , text, time, transformers + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.6.1"; + sha256 = "0cdfb492faa3a69ec69f06bb3c17ee6c36399f406e02a2ff16086f45bed6f870"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers + monad-control monad-logger persistent postgresql-libpq + postgresql-simple resource-pool resourcet text time transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -136708,6 +136936,34 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-sqlite_2_6_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , hspec, microlens-th, monad-control, monad-logger, old-locale + , persistent, persistent-template, resource-pool, resourcet + , temporary, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.6.2"; + sha256 = "6136c471fc81869cf0fde2049defb9c82698e3c0048d1321c3eda01046b985bf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-control + monad-logger old-locale persistent resource-pool resourcet text + time transformers unordered-containers + ]; + testHaskellDepends = [ + base hspec persistent persistent-template temporary text time + transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -136734,6 +136990,31 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template_2_5_2" = callPackage + ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers + , ghc-prim, hspec, http-api-data, monad-control, monad-logger + , path-pieces, persistent, QuickCheck, tagged, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.5.2"; + sha256 = "de695b008158f9ae66d103fc33f89c098ebcf59337367063d9f4f816a58b4011"; + libraryHaskellDepends = [ + aeson aeson-compat base bytestring containers ghc-prim + http-api-data monad-control monad-logger path-pieces persistent + tagged template-haskell text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-vector" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck , test-framework, test-framework-quickcheck2 @@ -141984,6 +142265,8 @@ self: { pname = "primitive"; version = "0.6.2.0"; sha256 = "b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1"; + revision = "1"; + editedCabalFile = "a67c9da25c0d15971f8dc06c119cae4a0180a7216c0a3a3d6e52357d2f7ac134"; libraryHaskellDepends = [ base ghc-prim transformers ]; testHaskellDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell/primitive"; @@ -149006,8 +149289,8 @@ self: { }: mkDerivation { pname = "regex"; - version = "0.3.0.0"; - sha256 = "f0f8c9722a601edfc2fb7963956f331f3dd1e1655fafb07758aad6defea579de"; + version = "0.5.0.0"; + sha256 = "422392384ce3986d1c5627b30c8dc9dfb05fe41044820739d11da51ff1a8c27f"; libraryHaskellDepends = [ array base base-compat bytestring containers hashable heredoc regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text @@ -149165,8 +149448,8 @@ self: { }: mkDerivation { pname = "regex-examples"; - version = "0.3.0.0"; - sha256 = "c274ffacf3eeecb9e9530d07fd44dd0539c8225923ae0cb82b5d48ad6333903b"; + version = "0.5.0.0"; + sha256 = "bfc94f67d1723fd833247512549aa2e0a9d18070aaf9409feaef87388a48a1bb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159666,6 +159949,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shell-conduit_4_6_0" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , control-monad-loop, directory, filepath, hspec + , hspec-expectations, monad-control, monads-tf, process, resourcet + , semigroups, split, template-haskell, text, transformers + , transformers-base, unix + }: + mkDerivation { + pname = "shell-conduit"; + version = "4.6.0"; + sha256 = "9ce6230efb78589b5b28dd82396d73afbc832bbb8213f51c28ab6c946a9a12a1"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra control-monad-loop + directory filepath monad-control monads-tf process resourcet + semigroups split template-haskell text transformers + transformers-base unix + ]; + testHaskellDepends = [ + base hspec hspec-expectations template-haskell + ]; + homepage = "https://github.com/psibi/shell-conduit"; + description = "Write shell scripts with Conduit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shell-escape" = callPackage ({ mkDerivation, base, binary, bytestring, containers, vector }: mkDerivation { @@ -166267,6 +166576,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_0_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, directory, exceptions, file-embed, filepath, hspec + , hspec-megaparsec, megaparsec, mtl, template-haskell, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "0.2.1"; + sha256 = "f25c0a913cca7ae0056d8030e5351da809bdff53afef80d863c1ecaa0dbbd00f"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory exceptions + filepath megaparsec mtl template-haskell text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec text yaml + ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq megaparsec text + ]; + homepage = "https://github.com/stackbuilders/stache"; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async , attoparsec, base, base-compat, base16-bytestring @@ -178733,6 +179070,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "transient-universe-tls" = callPackage + ({ mkDerivation, base, bytestring, certificate, cprng-aes + , data-default, network, tls, transient, transient-universe + , x509-store + }: + mkDerivation { + pname = "transient-universe-tls"; + version = "0.1.0.0"; + sha256 = "9f4b345602de7a3652fdcebb787c66017697ef6e0f16a47e59cda3c42cbd8467"; + libraryHaskellDepends = [ + base bytestring certificate cprng-aes data-default network tls + transient transient-universe x509-store + ]; + homepage = "http://github.com/transient-haskell/transient-universe-tls"; + description = "transient with secure communications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "translatable-intset" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -188859,6 +189214,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets-rpc" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , mtl, QuickCheck, quickcheck-instances, stm, tasty + , tasty-quickcheck, text, unordered-containers, wai-transformers + , websockets + }: + mkDerivation { + pname = "websockets-rpc"; + version = "0.0.0"; + sha256 = "e8a97330230f178fede76701fd2335fe18f48a124bd020c4be8120fa75ddf5bb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions mtl QuickCheck stm text + unordered-containers wai-transformers websockets + ]; + testHaskellDepends = [ + aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck + ]; + description = "Simple streaming RPC mechanism using WebSockets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "websockets-snap" = callPackage ({ mkDerivation, base, bytestring, bytestring-builder, io-streams , mtl, snap-core, snap-server, websockets From c71d1e72b28367471e281eea0d7439de3128e554 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Mar 2017 14:42:06 +0100 Subject: [PATCH 032/113] LTS Haskell 8.4 --- .../configuration-hackage2nix.yaml | 68 ++++++++++--------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 76c460786c1..cab70ea6f6d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: default-package-overrides: - store < 0.4.1 # https://github.com/fpco/store/issues/104 - # LTS Haskell 8.3 + # LTS Haskell 8.4 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -171,7 +171,7 @@ default-package-overrides: - arrow-list ==0.7 - ascii-progress ==0.3.3.0 - asciidiagram ==1.3.3 - - asn1-encoding ==0.9.4 + - asn1-encoding ==0.9.5 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 - async ==2.1.1 @@ -207,7 +207,7 @@ default-package-overrides: - base58string ==0.10.0 - base64-bytestring ==1.0.0.1 - base64-string ==0.2 - - basic-prelude ==0.6.1 + - basic-prelude ==0.6.1.1 - bcrypt ==0.0.10 - benchpress ==0.2.2.9 - bencode ==0.6.0.0 @@ -326,7 +326,7 @@ default-package-overrides: - cheapskate ==0.1.0.5 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - - check-email ==1.0 + - check-email ==1.0.2 - checkers ==0.4.6 - chell ==0.4.0.1 - choice ==0.2.0 @@ -345,7 +345,7 @@ default-package-overrides: - clash-systemverilog ==0.7 - clash-verilog ==0.7 - clash-vhdl ==0.7 - - classy-prelude ==1.2.0 + - classy-prelude ==1.2.0.1 - classy-prelude-conduit ==1.2.0 - classy-prelude-yesod ==1.2.0 - clay ==0.12.1 @@ -407,7 +407,7 @@ default-package-overrides: - cookie ==0.4.2.1 - countable ==1.0 - courier ==0.1.1.4 - - cpphs ==1.20.3 + - cpphs ==1.20.4 - cprng-aes ==0.6.1 - cpu ==0.1.2 - cpuinfo ==0.1.0.1 @@ -612,8 +612,8 @@ default-package-overrides: - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.4 - - fgl ==5.5.3.0 - - fgl-arbitrary ==0.2.0.2 + - fgl ==5.5.3.1 + - fgl-arbitrary ==0.2.0.3 - file-embed ==0.0.10 - file-modules ==0.1.2.4 - filecache ==0.2.9 @@ -860,6 +860,7 @@ default-package-overrides: - happstack-server-tls ==7.1.6.2 - happy ==1.19.5 - harp ==0.4.2 + - hasbolt ==0.1.1.1 - hashable ==1.2.5.0 - hashable-time ==0.2 - hashmap ==1.3.2 @@ -1089,7 +1090,7 @@ default-package-overrides: - interpolatedstring-perl6 ==1.0.0 - IntervalMap ==0.5.2.0 - intervals ==0.7.2 - - intro ==0.1.0.8 + - intro ==0.1.0.10 - invariant ==0.4 - invertible ==0.2.0.2 - io-choice ==0.0.6 @@ -1105,7 +1106,7 @@ default-package-overrides: - IPv6Addr ==0.6.3 - irc ==0.6.1.0 - irc-client ==0.4.4.1 - - irc-conduit ==0.2.2.0 + - irc-conduit ==0.2.2.1 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.0 - islink ==0.1.0.0 @@ -1164,7 +1165,7 @@ default-package-overrides: - language-javascript ==0.6.0.9 - language-lua2 ==0.1.0.5 - language-nix ==2.1.0.1 - - language-puppet ==1.3.5.1 + - language-puppet ==1.3.6 - language-python ==0.5.4 - language-thrift ==0.10.0.0 - large-hashable ==0.1.0.3 @@ -1223,7 +1224,7 @@ default-package-overrides: - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.1 - - lucid ==2.9.7 + - lucid ==2.9.8.1 - lucid-svg ==0.7.0.0 - lzma-conduit ==1.1.3.1 - machines ==0.6.1 @@ -1259,6 +1260,7 @@ default-package-overrides: - metrics ==0.4.0.1 - MFlow ==0.4.6.0 - mfsolve ==0.3.2.0 + - microbench ==0.1 - microformats2-parser ==1.0.1.6 - microlens ==0.4.7.0 - microlens-aeson ==2.2.0 @@ -1293,10 +1295,10 @@ default-package-overrides: - monad-par ==0.3.4.8 - monad-par-extras ==0.3.3 - monad-parallel ==0.7.2.2 - - monad-peel ==0.2.1.1 + - monad-peel ==0.2.1.2 - monad-primitive ==0.1 - monad-products ==4.0.1 - - monad-skeleton ==0.1.2.2 + - monad-skeleton ==0.1.3 - monad-time ==0.2 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.0 @@ -1309,7 +1311,7 @@ default-package-overrides: - MonadRandom ==0.5.1 - monads-tf ==0.1.0.3 - mongoDB ==2.1.1.1 - - mono-traversable ==1.0.1.3 + - mono-traversable ==1.0.2 - mono-traversable-instances ==0.1.0.0 - monoid-extras ==0.4.2 - monoid-subclasses ==0.4.3.1 @@ -1646,7 +1648,7 @@ default-package-overrides: - rest-types ==1.14.1.1 - rest-wai ==0.2.0.1 - result ==0.2.6.0 - - rethinkdb ==2.2.0.8 + - rethinkdb ==2.2.0.9 - rethinkdb-client-driver ==0.0.23 - retry ==0.7.4.2 - rev-state ==0.1.2 @@ -1703,7 +1705,7 @@ default-package-overrides: - servant-docs ==0.9.1.1 - servant-elm ==0.4.0.1 - servant-foreign ==0.9.1.1 - - servant-js ==0.9.2 + - servant-js ==0.9.3 - servant-JuicyPixels ==0.3.0.2 - servant-lucid ==0.7.1 - servant-mock ==0.8.1.1 @@ -1813,7 +1815,7 @@ default-package-overrides: - storable-endian ==0.2.6 - storable-record ==0.0.3.1 - Strafunski-StrategyLib ==5.0.0.10 - - stratosphere ==0.4.0 + - stratosphere ==0.4.1 - streaming ==0.1.4.5 - streaming-bytestring ==0.1.4.6 - streaming-commons ==0.1.17 @@ -1831,6 +1833,10 @@ default-package-overrides: - stringable ==0.1.3 - stringbuilder ==0.5.0 - stringsearch ==0.3.6.6 + - stripe-core ==2.2.1 + - stripe-haskell ==2.2.1 + - stripe-http-streams ==2.2.1 + - stripe-tests ==2.2.1 - strive ==3.0.2 - stylish-haskell ==0.7.1.0 - success ==0.2.6 @@ -1863,7 +1869,7 @@ default-package-overrides: - tar-conduit ==0.1.0 - tardis ==0.4.1.0 - tasty ==0.11.2 - - tasty-ant-xml ==1.0.4 + - tasty-ant-xml ==1.0.5 - tasty-auto ==0.1.0.2 - tasty-dejafu ==0.3.0.2 - tasty-discover ==1.1.0 @@ -2017,7 +2023,7 @@ default-package-overrides: - Unixutils ==1.54.1 - unlit ==0.4.0.0 - unordered-containers ==0.2.7.2 - - uri-bytestring ==0.2.3.0 + - uri-bytestring ==0.2.3.1 - uri-encode ==1.5.0.5 - uri-templater ==0.2.1.0 - url ==2.1.3 @@ -2172,27 +2178,27 @@ default-package-overrides: - Yampa ==0.10.5 - YampaSynth ==0.2 - yes-precure5-command ==5.5.3 - - yesod ==1.4.4 - - yesod-auth ==1.4.16 + - yesod ==1.4.5 + - yesod-auth ==1.4.17 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - yesod-auth-hashdb ==1.6.0.1 - - yesod-bin ==1.5.1 - - yesod-core ==1.4.31 - - yesod-eventsource ==1.4.0.1 + - yesod-bin ==1.5.2 + - yesod-core ==1.4.32 + - yesod-eventsource ==1.4.1 - yesod-fay ==0.8.0 - - yesod-form ==1.4.10 + - yesod-form ==1.4.11 - yesod-form-richtext ==0.1.0.0 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 - yesod-newsfeed ==1.6 - - yesod-persistent ==1.4.1.1 + - yesod-persistent ==1.4.2 - yesod-sitemap ==1.4.0.1 - - yesod-static ==1.5.1.1 + - yesod-static ==1.5.2 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - - yesod-test ==1.5.4.1 - - yesod-websockets ==0.2.5 + - yesod-test ==1.5.5 + - yesod-websockets ==0.2.6 - yi-core ==0.13.5 - yi-frontend-vty ==0.13.5 - yi-fuzzy-open ==0.13.5 @@ -2209,7 +2215,7 @@ default-package-overrides: - yjtools ==0.9.18 - zero ==0.1.4 - zeromq4-haskell ==0.6.5 - - zip ==0.1.8 + - zip ==0.1.9 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - zlib ==0.6.1.2 From d7496b560edc773d89fad211a8f446d286fff984 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 7 Mar 2017 08:20:29 -0500 Subject: [PATCH 033/113] gi-webkit2: fix gi-javascriptcore dependency This actually depends on the specially-versioned gi-javascriptcore package. --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c62d2702b44..3ec5ffc3d96 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -424,6 +424,9 @@ self: super: builtins.intersectAttrs super { gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; }; gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; }; + # Requires gi-javascriptcore API version 4 + gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_11; }; + # requires valid, writeable $HOME hatex-guide = overrideCabal super.hatex-guide (drv: { preConfigure = '' From 763e21e982370f67c126f92a1113ea949db3b6e0 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 7 Mar 2017 08:24:22 -0500 Subject: [PATCH 034/113] haskell-gi-base: propagate gobjectIntrospection dependency So the thinking is: anything that needs `haskell-gi-base` is going to need `gobjectIntrospection` in order to work correctly; by adding this one `buildDepends` (which therefore gets propagated), we put ourselves in a position to simplify away a bunch of code in `cabal2nix`. --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3ec5ffc3d96..85421ba960e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -420,6 +420,9 @@ self: super: builtins.intersectAttrs super { # tests require git hapistrano = addBuildTool super.hapistrano pkgs.git; + # This propagates this to everything depending on haskell-gi-base + haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection; + # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version) gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; }; gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; }; From 3bc5a68a63605c86f8a3822476a947a4f40ce5d6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 6 Mar 2017 08:33:16 -0600 Subject: [PATCH 035/113] llvm4: enable tests --- pkgs/development/compilers/llvm/4/llvm.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 2d36f7cd0fb..c346f536158 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -50,12 +50,19 @@ in stdenv.mkDerivation rec { # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + stdenv.lib.optionalString (enableSharedLibraries) '' substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib patch -p1 < ./llvm-outputs.patch + '' + # Remove broken tests: (https://bugs.llvm.org//show_bug.cgi?id=31610) + + '' + rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll + rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll + rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll + rm test/CodeGen/AMDGPU/runtime-metadata.ll ''; # hacky fix: created binaries need to be run before installation @@ -85,6 +92,14 @@ in stdenv.mkDerivation rec { rm -fR $out paxmark m bin/{lli,llvm-rtdyld} + paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests + paxmark m unittests/ExecutionEngine/Orc/OrcJITTests + paxmark m unittests/Support/SupportTests + paxmark m bin/lli-child-target + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ''; postInstall = "" @@ -103,6 +118,10 @@ in stdenv.mkDerivation rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; + doCheck = stdenv.isLinux; + + checkTarget = "check-all"; + enableParallelBuilding = true; passthru.src = src; From 8d10f1dc5b05a29bd5d64ce698543be4be09b472 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 8 Mar 2017 09:57:41 -0600 Subject: [PATCH 036/113] llvm4: rc3 -> rc4 --- pkgs/development/compilers/llvm/4/clang/default.nix | 2 +- pkgs/development/compilers/llvm/4/default.nix | 6 +++--- pkgs/development/compilers/llvm/4/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/4/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/4/lld.nix | 2 +- pkgs/development/compilers/llvm/4/lldb.nix | 2 +- pkgs/development/compilers/llvm/4/llvm.nix | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 5be8ffd91cf..c0a33f03e0f 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -6,7 +6,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "1lsdyrz82vyrsc7k0ah1zmzzan61s5kakxrkxgfbmklp3pclfkwp"} + unpackFile ${fetch "cfe" "062n17mfsn85dx3qy1qvq8rfxi7hcbr2nj70v2dah3xmy28i3yaq"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index cbb3852057d..aed77b7513a 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -3,7 +3,7 @@ let callPackage = newScope (self // { inherit stdenv isl release_version version fetch; }); release_version = "4.0.0"; - rc = "rc3"; + rc = "rc4"; version = "${release_version}${rc}"; fetch = name: sha256: fetchurl { @@ -13,8 +13,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "0jfqhz95cp15c5688c6l9mr12s0qp86milpcrjlc93dc2jy08ba5"; - clang-tools-extra_src = fetch "clang-tools-extra" "1c9c507w3f5vm153rdd0kmzvv2ski6z439izk01zf5snfwkqxkq8"; + compiler-rt_src = fetch "compiler-rt" "1bxz2z9mxbx7211xfgsn5inwvpz53d1cqg76h8166dsli27xwkjm"; + clang-tools-extra_src = fetch "clang-tools-extra" "0zkgnnv3srqxf44q4a5n3wpizf71mlq8w5rnwfwhdx777k94s5nx"; self = { llvm = callPackage ./llvm.nix { diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 57e064fb79a..753aded54ff 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "15l6bcmwczspbqcq4m2lmzb23g11axr9m8dayn25iys26nn00q43"; + src = fetch "libcxx" "052fc91y8084830ajfm8nkc0vghafhnfl7l89b68qsyz3ra93i3l"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index fc1a6d84caa..23269f605f0 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "1frj1wz780xcwq77icfclnw6q4c8bkkdzkqsrmfjv9963kjylsy5"; + src = fetch "libcxxabi" "02z8d0q42wfmnnd0rd1yg2x4y50rfrv1k9rq00a86b6803dc7p45"; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index 7fe08cb0262..e62e50b2d31 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "0kmyp7iyf4f76wgy87jczkyhvzhlwfydvxgggl74z0x89xgry745"; + src = fetch "lld" "00wy4qczh4s6g49sbfmyk21845zx5qc2qpm39bznqz8ynpnh4phc"; buildInputs = [ cmake llvm ]; diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 23667e6afcd..4fec3ad1a89 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "1qr0ky7llwgjgx1pzkp3pnz32nb6f7lvg8qg6rp5axhgpkx54hz7"; + src = fetch "lldb" "14dy1j48nw10w8brkpmla2vjjwfr1mrsl9wfabjfx1j85ywp3h69"; patchPhase = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index c346f536158..1470e7d510f 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -21,7 +21,7 @@ }: let - src = fetch "llvm" "0ic3y9gaissi6ixyj9x1c0pq69wfbl2svhprp33av0b58f7wj9v7"; + src = fetch "llvm" "1ljb5y5wgypk3sy8zcd5qdgsm5hw8vl7cy6874mbf4gnk9k809b1"; shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib From e3b84d71a674836fc1c65fcc6c030e63a65a0daf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 8 Mar 2017 17:12:03 +0100 Subject: [PATCH 037/113] nixpkgs: add aarch64-linux to release-lib cc #23638 --- pkgs/top-level/release-lib.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 5fe87711c01..a6e574a7d11 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -25,6 +25,7 @@ rec { pkgsFor = system: if system == "x86_64-linux" then pkgs_x86_64_linux else if system == "i686-linux" then pkgs_i686_linux + else if system == "aarch64-linux" then pkgs_aarch64_linux else if system == "x86_64-darwin" then pkgs_x86_64_darwin else if system == "x86_64-freebsd" then pkgs_x86_64_freebsd else if system == "i686-freebsd" then pkgs_i686_freebsd @@ -34,6 +35,7 @@ rec { pkgs_x86_64_linux = allPackages { system = "x86_64-linux"; }; pkgs_i686_linux = allPackages { system = "i686-linux"; }; + pkgs_aarch64_linux = allPackages { system = "aarch64-linux"; }; pkgs_x86_64_darwin = allPackages { system = "x86_64-darwin"; }; pkgs_x86_64_freebsd = allPackages { system = "x86_64-freebsd"; }; pkgs_i686_freebsd = allPackages { system = "i686-freebsd"; }; From fb5369dbe9697ee191cdf099cd9cc737a2d48f15 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 8 Mar 2017 17:18:18 +0100 Subject: [PATCH 038/113] haskellPackages.streaming-eversion: dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6163e177a89..f37d8b4c9c7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -875,4 +875,6 @@ self: super: { # https://github.com/cartazio/arithmoi/issues/49 arithmoi = overrideCabal super.arithmoi (drv: { doCheck = !pkgs.stdenv.isi686; }); + # https://github.com/danidiaz/streaming-eversion/issues/1 + streaming-eversion = dontCheck super.streaming-eversion; } From 49b20e5569c584f2f2db6475ab6ab63ee7d62116 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 8 Mar 2017 10:55:16 -0500 Subject: [PATCH 039/113] buildbot: assorted cleanups Some changes to be more idiomatic and use stdenv building blocks more. I also added a `buildbot.withPlugins` instead of the current plugins mechanism, which forces an unnecessary rebuild of the package and reruns all the tests. This should be equivalent and more pleasant to use in practice. --- .../tools/build-managers/buildbot/default.nix | 151 +++++++++--------- .../tools/build-managers/buildbot/worker.nix | 8 +- pkgs/top-level/all-packages.nix | 8 +- 3 files changed, 85 insertions(+), 82 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index b9b8dc71927..ad37aee5bb9 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,76 +1,83 @@ -{ stdenv, lib, fetchurl, coreutils, openssh, buildbot-worker, makeWrapper, - pythonPackages, gnused, plugins ? [] }: +{ stdenv, lib, openssh, buildbot-worker, pythonPackages, runCommand, makeWrapper }: -pythonPackages.buildPythonApplication (rec { - name = "${pname}-${version}"; - pname = "buildbot"; - version = "0.9.4"; - src = fetchurl { - url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086"; - }; - - buildInputs = with pythonPackages; [ - lz4 - txrequests - pyjade - boto3 - moto - txgithub - mock - setuptoolsTrial - isort - pylint - astroid - pyflakes - openssh - buildbot-worker - makeWrapper - treq - ]; - - propagatedBuildInputs = with pythonPackages; [ - - # core - twisted - jinja2 - zope_interface - sqlalchemy - sqlalchemy_migrate - future - dateutil - txaio - autobahn - pyjwt - - # tls - pyopenssl - service-identity - idna - - # docs - sphinx - sphinxcontrib-blockdiag - sphinxcontrib-spelling - pyenchant - docutils - ramlfications - sphinx-jinja - - ] ++ plugins; - - postPatch = '' - ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py +let + withPlugins = plugins: runCommand "wrapped-${package.name}" { + buildInputs = [ makeWrapper ]; + passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins); + } '' + makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ + --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" pythonPackages.python.sitePackages plugins} ''; - postFixup = '' - makeWrapper $out/bin/.buildbot-wrapped $out/bin/buildbot --set PYTHONPATH "$PYTHONPATH" - ''; + package = pythonPackages.buildPythonApplication (rec { + name = "${pname}-${version}"; + pname = "buildbot"; + version = "0.9.4"; - meta = with stdenv.lib; { - homepage = http://buildbot.net/; - description = "Continuous integration system that automates the build/test cycle"; - maintainers = with maintainers; [ nand0p ryansydnor ]; - license = licenses.gpl2; - }; -}) + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086"; + }; + + buildInputs = with pythonPackages; [ + lz4 + txrequests + pyjade + boto3 + moto + txgithub + mock + setuptoolsTrial + isort + pylint + astroid + pyflakes + openssh + buildbot-worker + treq + ]; + + propagatedBuildInputs = with pythonPackages; [ + + # core + twisted + jinja2 + zope_interface + sqlalchemy + sqlalchemy_migrate + future + dateutil + txaio + autobahn + pyjwt + + # tls + pyopenssl + service-identity + idna + + # docs + sphinx + sphinxcontrib-blockdiag + sphinxcontrib-spelling + pyenchant + docutils + ramlfications + sphinx-jinja + + ]; + + postPatch = '' + substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" + ''; + + passthru = { inherit withPlugins; }; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + description = "Continuous integration system that automates the build/test cycle"; + maintainers = with maintainers; [ nand0p ryansydnor ]; + license = licenses.gpl2; + }; + }); +in package diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 3023555d22c..b9b4b86aa44 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, gnused, coreutils, pythonPackages }: +{ stdenv, pythonPackages }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; version = "0.9.4"; - src = fetchurl { - url = "mirror://pypi/b/${pname}/${name}.tar.gz"; + src = pythonPackages.fetchPypi { + inherit pname version; sha256 = "0rdrr8x7sn2nxl51p6h9ad42s3c28lb6sys84zrg0d7fm4zhv7hj"; }; @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication (rec { propagatedBuildInputs = with pythonPackages; [ twisted future ]; postPatch = '' - ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot_worker/scripts/logwatcher.py + substituteInPlace buildbot_worker/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e9b4213a8..d480b617e0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6220,12 +6220,8 @@ with pkgs; buildbot-plugins = callPackage ../development/tools/build-managers/buildbot/plugins.nix { pythonPackages = python2Packages; }; - buildbot-ui = self.buildbot.override { - plugins = with self.buildbot-plugins; [ www ]; - }; - buildbot-full = self.buildbot.override { - plugins = with self.buildbot-plugins; [ www console-view waterfall-view ]; - }; + buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]); + buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view ]); buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; From ca5a1d927f13c4c36e2112c68b3512eda5f76e0c Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 8 Mar 2017 12:39:44 -0500 Subject: [PATCH 040/113] buildbot: fix .withPlugins to propagate inputs Before I was just grabbing the immediate dependencies. I _think_ this will do the right thing by using the pre-existing setup hook to avoid having to compute the transitive closure myself. --- pkgs/development/tools/build-managers/buildbot/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index ad37aee5bb9..ed24e917a1c 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -2,11 +2,10 @@ let withPlugins = plugins: runCommand "wrapped-${package.name}" { - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ] ++ plugins; passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins); } '' - makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ - --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" pythonPackages.python.sitePackages plugins} + makeWrapper ${package}/bin/buildbot $out/bin/buildbot --prefix PYTHONPATH : $PYTHONPATH ''; package = pythonPackages.buildPythonApplication (rec { From adf044e1fbb723e65942da887486a873c022e3ac Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 7 Mar 2017 23:40:31 +0100 Subject: [PATCH 041/113] nixos/dnscrypt-proxy: refactoring Use mkMerge to make the code a little more ergonomic and easier to follow (to my eyes, anyway ...). Also take the opportunity to do some minor cleanups & tweaks, but no functional changes. --- .../services/networking/dnscrypt-proxy.nix | 114 ++++++++++-------- 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 462039803f8..60ce0bc2aa2 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -155,15 +155,59 @@ in }; }; - config = mkIf cfg.enable { - + config = mkIf cfg.enable (mkMerge [{ assertions = [ { assertion = (cfg.customResolver != null) || (cfg.resolverName != null); message = "please configure upstream DNSCrypt resolver"; } ]; - security.apparmor.profiles = optional apparmorEnabled (pkgs.writeText "apparmor-dnscrypt-proxy" '' + users.users.dnscrypt-proxy = { + description = "dnscrypt-proxy daemon user"; + isSystemUser = true; + group = "dnscrypt-proxy"; + }; + users.groups.dnscrypt-proxy = {}; + + systemd.sockets.dnscrypt-proxy = { + description = "dnscrypt-proxy listening socket"; + documentation = [ "man:dnscrypt-proxy(8)" ]; + + wantedBy = [ "sockets.target" ]; + + socketConfig = { + ListenStream = localAddress; + ListenDatagram = localAddress; + }; + }; + + systemd.services.dnscrypt-proxy = { + description = "dnscrypt-proxy daemon"; + documentation = [ "man:dnscrypt-proxy(8)" ]; + + before = [ "nss-lookup.target" ]; + + after = [ "network.target" ] + ++ optional apparmorEnabled "apparmor.service"; + + requires = [ "dnscrypt-proxy.socket "] + ++ optional apparmorEnabled "apparmor.service"; + + serviceConfig = { + NonBlocking = "true"; + ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}"; + + User = "dnscrypt-proxy"; + + PrivateTmp = true; + PrivateDevices = true; + ProtectHome = true; + }; + }; + } + + (mkIf apparmorEnabled { + security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" '' ${dnscrypt-proxy}/bin/dnscrypt-proxy { /dev/null rw, /dev/urandom r, @@ -188,35 +232,35 @@ in ${getLib pkgs.libgpgerror}/lib/libgpg-error.so.* mr, ${getLib pkgs.libcap}/lib/libcap.so.* mr, ${getLib pkgs.lz4}/lib/liblz4.so.* mr, - ${getLib pkgs.attr}/lib/libattr.so.* mr, + ${getLib pkgs.attr}/lib/libattr.so.* mr, # */ ${resolverList} r, } ''); + }) - users.users.dnscrypt-proxy = { - description = "dnscrypt-proxy daemon user"; - isSystemUser = true; - group = "dnscrypt-proxy"; - }; - users.groups.dnscrypt-proxy = {}; - - systemd.services.init-dnscrypt-proxy-statedir = optionalAttrs useUpstreamResolverList { + (mkIf useUpstreamResolverList { + systemd.services.init-dnscrypt-proxy-statedir = { description = "Initialize dnscrypt-proxy state directory"; + + wantedBy = [ "dnscrypt-proxy.service" ]; + before = [ "dnscrypt-proxy.service" ]; + script = '' mkdir -pv ${stateDirectory} chown -c dnscrypt-proxy:dnscrypt-proxy ${stateDirectory} - cp --preserve=timestamps -uv \ + cp -uv \ ${pkgs.dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv \ ${stateDirectory} ''; + serviceConfig = { Type = "oneshot"; RemainAfterExit = true; }; }; - systemd.services.update-dnscrypt-resolvers = optionalAttrs useUpstreamResolverList { + systemd.services.update-dnscrypt-resolvers = { description = "Update list of DNSCrypt resolvers"; requires = [ "init-dnscrypt-proxy-statedir.service" ]; @@ -243,47 +287,13 @@ in }; }; - systemd.timers.update-dnscrypt-resolvers = optionalAttrs useUpstreamResolverList { + systemd.timers.update-dnscrypt-resolvers = { + wantedBy = [ "timers.target" ]; timerConfig = { OnBootSec = "5min"; OnUnitActiveSec = "6h"; }; - wantedBy = [ "timers.target" ]; }; - - systemd.sockets.dnscrypt-proxy = { - description = "dnscrypt-proxy listening socket"; - socketConfig = { - ListenStream = localAddress; - ListenDatagram = localAddress; - }; - wantedBy = [ "sockets.target" ]; - }; - - systemd.services.dnscrypt-proxy = { - description = "dnscrypt-proxy daemon"; - - before = [ "nss-lookup.target" ]; - - after = [ "network.target" ] - ++ optional apparmorEnabled "apparmor.service" - ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service"; - - requires = [ "dnscrypt-proxy.socket "] - ++ optional apparmorEnabled "apparmor.service" - ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service"; - - serviceConfig = { - Type = "simple"; - NonBlocking = "true"; - ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}"; - - User = "dnscrypt-proxy"; - - PrivateTmp = true; - PrivateDevices = true; - ProtectHome = true; - }; - }; - }; + }) + ]); } From e72aaa73eacb15b82270fe702517be97d1beba37 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 7 Mar 2017 23:17:01 +0100 Subject: [PATCH 042/113] nixos/dnscrypt-proxy: support updating before nss is up Resolve download.dnscrypt.org using hostip with a bootstrap resolver (hard-coded to Google Public DNS for now), to ensure that we can get an up-to-date resolver list without working name service lookups. This makes us more robust to the upstream resolver list getting out of date and other DNS configuration problems. We use the curl --resolver switch to allow https cert validation (we'd need to do --insecure if using just the ip addr). Note that we don't rely on https for security but it's nice to have it ... --- nixos/modules/services/networking/dnscrypt-proxy.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 60ce0bc2aa2..636caf25a55 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -266,13 +266,15 @@ in requires = [ "init-dnscrypt-proxy-statedir.service" ]; after = [ "init-dnscrypt-proxy-statedir.service" ]; - path = with pkgs; [ curl minisign ]; + path = with pkgs; [ curl dnscrypt-proxy minisign ]; script = '' cd ${stateDirectory} - curl -fSsL -o dnscrypt-resolvers.csv.tmp \ - https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv - curl -fSsL -o dnscrypt-resolvers.csv.minisig.tmp \ - https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig + domain=download.dnscrypt.org + get="curl -fSs --resolve $domain:443:$(hostip -r 8.8.8.8 $domain | head -1)" + $get -o dnscrypt-resolvers.csv.tmp \ + https://$domain/dnscrypt-proxy/dnscrypt-resolvers.csv + $get -o dnscrypt-resolvers.csv.minisig.tmp \ + https://$domain/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig mv dnscrypt-resolvers.csv.minisig{.tmp,} minisign -q -V -p ${upstreamResolverListPubKey} \ -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig From 5f27abec233604ebe543e4fc833f282a7c835b3f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 8 Mar 2017 00:42:20 +0100 Subject: [PATCH 043/113] nixos/dnscrypt-proxy: more fs isolation for the updater It'd be better to do the update as an unprivileged user; for now, we do our best to minimize the surface available. We filter mount syscalls to prevent the process from undoing the fs isolation. --- nixos/modules/services/networking/dnscrypt-proxy.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 636caf25a55..ad1559e21df 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -285,7 +285,9 @@ in PrivateTmp = true; PrivateDevices = true; ProtectHome = true; - ProtectSystem = true; + ProtectSystem = "strict"; + ReadWritePaths = "${dirOf stateDirectory} ${stateDirectory}"; + SystemCallFilter = "~@mount"; }; }; From 06520c7fb785b872e17112bf8be0b6ae1d7d0ec0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 8 Mar 2017 03:09:22 +0100 Subject: [PATCH 044/113] nixos/dnscrypt-proxy: indicate update status Make it easier for the user to tell when the list is updated and, at their option, see what changed. --- nixos/modules/services/networking/dnscrypt-proxy.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index ad1559e21df..8e9747b2966 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -266,7 +266,7 @@ in requires = [ "init-dnscrypt-proxy-statedir.service" ]; after = [ "init-dnscrypt-proxy-statedir.service" ]; - path = with pkgs; [ curl dnscrypt-proxy minisign ]; + path = with pkgs; [ curl diffutils dnscrypt-proxy minisign ]; script = '' cd ${stateDirectory} domain=download.dnscrypt.org @@ -278,7 +278,13 @@ in mv dnscrypt-resolvers.csv.minisig{.tmp,} minisign -q -V -p ${upstreamResolverListPubKey} \ -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig + [[ -f dnscrypt-resolvers.csv ]] && mv dnscrypt-resolvers.csv{,.old} mv dnscrypt-resolvers.csv{.tmp,} + if cmp dnscrypt-resolvers.csv{,.old} ; then + echo "no change" + else + echo "resolver list updated" + fi ''; serviceConfig = { From a3a21a72453299ea0423762ffad2a438d63b4dce Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 8 Mar 2017 20:09:38 +0200 Subject: [PATCH 045/113] delve: Disable on i686 --- pkgs/development/tools/delve/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index fc8488ee104..9fe9c46816a 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -19,5 +19,6 @@ buildGoPackage rec { homepage = "https://github.com/derekparker/delve"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; + platforms = [ "x86_64-linux" ]; }; } From 8dce538640973c590ac51388a4e2338c4ba9cf4e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 8 Mar 2017 20:15:36 +0200 Subject: [PATCH 046/113] gtkglextmm: Mark as broken No release since 2010. Build broken. Sounds like a library, but no users. GNOME 2 stuff. http://hydra.nixos.org/build/49554500/nixlog/3 --- pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index 97bad111ca7..152c1d98b8c 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -28,9 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for GtkGLExt"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.linux; + broken = true; }; } From 74f8e0fd7aeac19a47cd83197e5ff03d54fe6e03 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 8 Mar 2017 19:42:15 +0100 Subject: [PATCH 047/113] torbrowser: 6.5 -> 6.5.1 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index fc77628a3c6..80a92b4a932 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.5"; + version = "6.5.1"; src = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "0q0rdwjiqjjh9awiyp0a55nkhyri5y6zhkyq3n3x6w4afihl0wf4" else - "1y1sx2gp7c66l7a4smfibl8mv54byvawhhkikpa5l2vic75vyhk9"; + "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i" else + "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr"; }; preferLocalBuild = true; From 4ae5f4d3ccbe2bea5b53ebd6600218504f632051 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 8 Mar 2017 14:14:27 -0500 Subject: [PATCH 048/113] pythonPackages.cryptography: fix test on macOS 10.12 Hydra didn't notice because it's running 10.11. --- pkgs/top-level/python-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63fc33ed17e..e5f9e191304 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4526,6 +4526,14 @@ in { propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules pytz ] ++ optional (pythonOlder "3.4") self.enum34; + # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary + # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't + # use it. This boils down to them checking compatibility with `getentropy` in two different places, + # so let's neuter the second test. + patchPhase = '' + substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"' + ''; + # IOKit's dependencies are inconsistent between OSX versions, so this is the best we # can do until nix 1.11's release __impureHostDeps = [ "/usr/lib" ]; From 5f5b87107f89ae0de0b1e39890a7906f162d4f00 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 3 Mar 2017 21:16:31 +0200 Subject: [PATCH 049/113] raspberrypifw, linux_rpi: 1.20161020 -> 1.20170303 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-rpi.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 03281d2ee3a..50ffe7d25e6 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20161020"; + version = "1.20170303"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "073cry7xqrbkn8p1qzl4f3z6jvcbks4i61fz7i2pbwa60vddcp34"; + sha256 = "1s5dycgix97681vpq7ggpc27n865wgv9npzxvbr2q2bp3ia9mcim"; }; dontStrip = true; # Stripping breaks some of the binaries diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index e50a6c80232..264d4dffee1 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.4.26"; - tag = "1.20161020-1"; + modDirVersion = "4.4.50"; + tag = "1.20170303"; in stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { version = "${modDirVersion}-${tag}"; @@ -11,8 +11,8 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { src = fetchFromGitHub { owner = "raspberrypi"; repo = "linux"; - rev = "raspberrypi-kernel_${tag}"; - sha256 = "0y76xrapq7710zzf6sif94xzly72gg505y65lslfirng500ncnv5"; + rev = "raspberrypi-kernel_${tag}-1"; + sha256 = "1lvsr8zm8p1ng4b9vq0nkf2gn4gabla8dh6l60vifclqdcq2vwvx"; }; features.iwlwifi = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2cc71f0aad..f4e5375c99f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11384,7 +11384,6 @@ with pkgs; linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper - packet_fix_race_condition_CVE_2016_8655 DCCP_double_free_vulnerability_CVE-2017-6074 ]; }; From 9188f2ed8ae463398fc9800ddd3e12a7b0ee03a7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 8 Mar 2017 21:35:12 +0200 Subject: [PATCH 050/113] release.nix: Fix typo --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 9c24855dc50..889df6a00af 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -48,7 +48,7 @@ let jobs.linux.aarch64-linux jobs.python.x86_64-linux jobs.python.i686-linux - jobs.python.aarch4-linux + jobs.python.aarch64-linux jobs.python.x86_64-darwin jobs.python3.x86_64-linux jobs.python3.i686-linux From 116953ffc90ff09b00b0130defb52949e8d53392 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 8 Mar 2017 20:25:22 +0100 Subject: [PATCH 051/113] torbrowser: callPackage can fill in missing params from xorg --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4e5375c99f..3ab8684bec2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4124,9 +4124,7 @@ with pkgs; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - torbrowser = callPackage ../tools/security/tor/torbrowser.nix { - inherit (xorg) libXrender libX11 libXext libXt; - }; + torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; touchegg = callPackage ../tools/inputmethods/touchegg { }; From f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Mar 2017 23:07:15 +0300 Subject: [PATCH 052/113] primus: fix if nvidia is not used Fixes #23628 --- pkgs/tools/X11/primus/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 229e228e405..d130c9bac7c 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -20,7 +20,10 @@ let primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; }; primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; }; - ldPath = lib.makeLibraryPath ([ primus primus.glvnd ] ++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ]); + ldPath = lib.makeLibraryPath (lib.filter (x: x != null) ( + [ primus primus.glvnd ] + ++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ] + )); in writeScriptBin "primusrun" '' #!${stdenv.shell} From 6fb645037dcf8495a9ec3805f1f7322f5bdb9cec Mon Sep 17 00:00:00 2001 From: Jens Grunert Date: Wed, 8 Mar 2017 21:39:59 +0100 Subject: [PATCH 053/113] missing dconf in buildInput --- pkgs/applications/networking/corebird/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 95a2e8877c3..07d89b53fa4 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; buildInputs = [ - gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest glib_networking + gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf glib_networking ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]); meta = { From 661048c803f7c0c7aa1915162580b7c21316a4a3 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 7 Mar 2017 15:46:53 +1100 Subject: [PATCH 054/113] platypus: init at 2017-03-07 --- .../science/biology/platypus/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/science/biology/platypus/default.nix diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix new file mode 100644 index 00000000000..868540fcbc3 --- /dev/null +++ b/pkgs/applications/science/biology/platypus/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchFromGitHub, python27, htslib, zlib, makeWrapper}: + +let python = python27.withPackages (ps: with ps; [ cython ]); + +in stdenv.mkDerivation rec { + name = "platypus-unstable-${version}"; + version = "2017-03-07"; + + src = fetchFromGitHub { + owner = "andyrimmer"; + repo = "Platypus"; + rev = "cbbd914"; + sha256 = "0xgj3pl7n4c12j5pp5qyjfk4rsvb5inwzrpcbhdf3br5f3mmdsb9"; + }; + + buildInputs = [ htslib python zlib makeWrapper ]; + + buildPhase = '' + patchShebangs . + make + ''; + + installPhase = '' + mkdir -p $out/libexec/platypus + cp -r ./* $out/libexec/platypus + + mkdir -p $out/bin + makeWrapper ${python}/bin/python $out/bin/platypus --add-flags "$out/libexec/platypus/bin/Platypus.py" + ''; + + meta = with stdenv.lib; { + description = "The Platypus variant caller"; + license = licenses.gpl3; + homepage = https://github.com/andyrimmer/Platypus; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ab8684bec2..12d9b13bc78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16996,6 +16996,8 @@ with pkgs; paml = callPackage ../applications/science/biology/paml { }; + platypus = callPackage ../applications/science/biology/platypus/default.nix { }; + plink = callPackage ../applications/science/biology/plink/default.nix { }; plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { }; From 7f214e64109438fb8a9bbffd94ca41021d8b8fa7 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 7 Mar 2017 15:54:31 +1100 Subject: [PATCH 055/113] bedtools: init at 2.26.0 --- .../science/biology/bedtools/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/science/biology/bedtools/default.nix diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix new file mode 100644 index 00000000000..cd5c980b001 --- /dev/null +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchFromGitHub, zlib, python}: + +stdenv.mkDerivation rec { + name = "bedtools-${version}"; + version = "2.26.0"; + + src = fetchFromGitHub { + owner = "arq5x"; + repo = "bedtools2"; + rev = "v${version}"; + sha256 = "1j2ia68rmcw3qksjm5gvv1cb84bh76vmln59mvncr2an23f5a3ss"; + }; + + buildInputs = [ zlib python ]; + buildPhase = "make prefix=$out SHELL=${stdenv.shell} -j $NIX_BUILD_CORES"; + installPhase = "make prefix=$out SHELL=${stdenv.shell} install"; + + meta = with stdenv.lib; { + description = "A powerful toolset for genome arithmetic."; + license = licenses.gpl2; + homepage = https://bedtools.readthedocs.io/en/latest/; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12d9b13bc78..b3b78bf1827 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16970,6 +16970,8 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; + bedtools = callPackage ../applications/science/biology/bedtools/default.nix { }; + bcftools = callPackage ../applications/science/biology/bcftools { }; ecopcr = callPackage ../applications/science/biology/ecopcr { }; From 4bb50fd08cb63aefbb4b7d38092310048e62dc20 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 7 Mar 2017 16:16:03 +1100 Subject: [PATCH 056/113] picard-tools: init at 2.7.1 --- .../science/biology/picard-tools/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/science/biology/picard-tools/default.nix diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix new file mode 100644 index 00000000000..3f17825202e --- /dev/null +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, jre, makeWrapper}: + +stdenv.mkDerivation rec { + name = "picard-tools-${version}"; + version = "2.7.1"; + + src = fetchurl { + url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; + sha256 = "0rcfcvy9zacqmh7nyqlm93hzsx6gfygmcf8d2p02h5l69gvygnb9"; + }; + + buildInputs = [ jre makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/libexec/picard + cp $src $out/libexec/picard/picard.jar + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/picard --add-flags "-jar $out/libexec/picard/picard.jar" + ''; + + meta = with stdenv.lib; { + description = "Tools for high-throughput sequencing (HTS) data and formats such as SAM/BAM/CRAM and VCF."; + license = licenses.mit; + homepage = https://broadinstitute.github.io/picard/; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3b78bf1827..47e75c8632a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16998,6 +16998,8 @@ with pkgs; paml = callPackage ../applications/science/biology/paml { }; + picard-tools = callPackage ../applications/science/biology/picard-tools/default.nix { }; + platypus = callPackage ../applications/science/biology/platypus/default.nix { }; plink = callPackage ../applications/science/biology/plink/default.nix { }; From 076e513b94a4bd42c635394c393fb583f9dbadc3 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 7 Mar 2017 16:24:06 +1100 Subject: [PATCH 057/113] varscan: init at 2.4.2 --- .../science/biology/varscan/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/science/biology/varscan/default.nix diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix new file mode 100644 index 00000000000..f685031e87e --- /dev/null +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, jre, makeWrapper}: + +stdenv.mkDerivation rec { + name = "varscan-${version}"; + version = "2.4.2"; + + src = fetchurl { + url = "https://github.com/dkoboldt/varscan/releases/download/${version}/VarScan.v${version}.jar"; + sha256 = "0cfhshinyqgwc6i7zf8lhbfybyly2x5anrz824zyvdhzz5i69zrl"; + }; + + buildInputs = [ jre makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/libexec/varscan + cp $src $out/libexec/varscan/varscan.jar + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/varscan --add-flags "-jar $out/libexec/varscan/varscan.jar" + ''; + + meta = with stdenv.lib; { + description = "Variant calling and somatic mutation/CNV detection for next-generation sequencing data"; + # VarScan 2 is free for non-commercial use by academic, + # government, and non-profit/not-for-profit institutions. A + # commercial version of the software is available, and licensed + # through the Office of Technology Management at Washington + # University School of Medicine. + license = licenses.unfree; + homepage = https://github.com/dkoboldt/varscan; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e75c8632a..d5965044047 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17008,6 +17008,8 @@ with pkgs; samtools = callPackage ../applications/science/biology/samtools/default.nix { }; + varscan = callPackage ../applications/science/biology/varscan/default.nix { }; + bwa = callPackage ../applications/science/biology/bwa/default.nix { }; ### SCIENCE/MATH From 1ac797861b1e020c433ccda24b3ea74032fc7354 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 7 Mar 2017 16:33:04 +1100 Subject: [PATCH 058/113] SnpEff: init at 4.3i --- .../science/biology/snpeff/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/science/biology/snpeff/default.nix diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix new file mode 100644 index 00000000000..6c7a6b969ee --- /dev/null +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, jre, unzip, makeWrapper}: + +stdenv.mkDerivation rec { + name = "snpeff-${version}"; + version = "4.3i"; + + src = fetchurl { + url = "mirror://sourceforge/project/snpeff/snpEff_latest_core.zip"; + sha256 = "0i1slg201c8yjfr4wrg4xcgzwi0c8b9l3fb1i73fphq6q6zdblzb"; + }; + + buildInputs = [ unzip jre makeWrapper ]; + + installPhase = '' + mkdir -p $out/libexec/snpeff + cp *.jar *.config $out/libexec/snpeff + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/snpeff --add-flags "-jar $out/libexec/snpeff/snpEff.jar" + makeWrapper ${jre}/bin/java $out/bin/snpsift --add-flags "-jar $out/libexec/snpeff/SnpSift.jar" + ''; + + meta = with stdenv.lib; { + description = "Genetic variant annotation and effect prediction toolbox."; + license = licenses.lgpl3; + homepage = http://snpeff.sourceforge.net/; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5965044047..97c8741d6fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17008,6 +17008,8 @@ with pkgs; samtools = callPackage ../applications/science/biology/samtools/default.nix { }; + snpeff = callPackage ../applications/science/biology/snpeff/default.nix { }; + varscan = callPackage ../applications/science/biology/varscan/default.nix { }; bwa = callPackage ../applications/science/biology/bwa/default.nix { }; From 1fb6fc28cf9d20a6ba95b2a7e23eb4481c1636d3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 8 Mar 2017 21:54:44 +0100 Subject: [PATCH 059/113] smplayer: 17.2.0 -> 17.3.0 --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 9c2f6d04119..d7411c1128e 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmakeHook, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-17.2.0"; + name = "smplayer-17.3.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "05nqwpyh3zlyzip7chs711sz97cgijb92h44cd5aqbwbx06hihdd"; + sha256 = "0yv7725kr3dq02mcanc07sapirx6s73l4b6d13nzvq5rkwr8crmj"; }; buildInputs = [ qtscript ]; From ee4e630648e31ef998403be990fae3f453363537 Mon Sep 17 00:00:00 2001 From: Pierre Radermecker Date: Wed, 8 Mar 2017 15:45:48 +0100 Subject: [PATCH 060/113] salt-pepper: init at 0.5.0 --- pkgs/tools/admin/salt/pepper/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/admin/salt/pepper/default.nix diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix new file mode 100644 index 00000000000..781e94059ad --- /dev/null +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -0,0 +1,19 @@ +{ lib +, fetchurl +, python2Packages +}: + +python2Packages.buildPythonApplication rec { + name = "salt-pepper-${version}"; + version = "0.5.0"; + src = fetchurl { + url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz"; + sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck"; + }; + + meta = { + description = "A CLI front-end to a running salt-api system"; + homepage = https://github.com/saltstack/pepper; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12504c5099e..47edfd44698 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3314,6 +3314,8 @@ with pkgs; pell = callPackage ../applications/misc/pell { }; + pepper = callPackage ../tools/admin/salt/pepper { }; + pick = callPackage ../tools/misc/pick { }; pitivi = callPackage ../applications/video/pitivi { From f1ae64ba41958e339af2d717817ad3565908eb08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Mar 2017 10:17:43 +0100 Subject: [PATCH 061/113] cheat: 2.1.27 -> 2.2.0 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 68b77bafc0e..e1ed03c428d 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -1,14 +1,14 @@ { python3Packages, fetchurl, lib }: python3Packages.buildPythonApplication rec { - version = "2.1.28"; + version = "2.2.0"; name = "cheat-${version}"; propagatedBuildInputs = with python3Packages; [ docopt pygments ]; src = fetchurl { url = "mirror://pypi/c/cheat/${name}.tar.gz"; - sha256 = "1a5c5f3dx3dmmvv75q2w6v2xb1i6733c0f8knr6spapvlim5i0c5"; + sha256 = "16pg1bgyfjvzpm2rbi411ckf3gljg9v1vzd5qhp23g69ch6yr138"; }; # no tests available doCheck = false; From 80dbc4df36a72401b08d944a1b0a42c78eb6147b Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 9 Mar 2017 00:58:00 +0100 Subject: [PATCH 062/113] sqlitebrowser: 3.8.0 -> 3.9.1 Now uses Qt5 The file CMakeLists.txt needs patching - known issue upstream --- .../tools/database/sqlitebrowser/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 338f3323d94..c9aecd59135 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,17 +1,28 @@ -{ stdenv, fetchFromGitHub, qt4, sqlite, cmake }: +{ stdenv, fetchFromGitHub, qt5, sqlite, cmake }: stdenv.mkDerivation rec { - version = "3.8.0"; + version = "3.9.1"; name = "sqlitebrowser-${version}"; src = fetchFromGitHub { repo = "sqlitebrowser"; owner = "sqlitebrowser"; rev = "v${version}"; - sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp"; + sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150"; }; - buildInputs = [ qt4 sqlite cmake ]; + buildInputs = [ qt5.qtbase qt5.qttools sqlite cmake ]; + + enableParallelBuilding = true; + + cmakeFlags = [ "-DUSE_QT5=TRUE" ]; + + # A regression was introduced in CMakeLists.txt on v3.9.x + # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755 + patchPhase = '' + substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)' + ''; + meta = with stdenv.lib; { description = "DB Browser for SQLite"; @@ -21,4 +32,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # can only test on linux }; } - From 2ab778cc9c784eb2bbb45c6de3212d6df7138262 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 9 Mar 2017 01:26:26 +0100 Subject: [PATCH 063/113] inkscape: 0.92.0 -> 0.92.1 (#23652) --- pkgs/applications/graphics/inkscape/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 2f72d00bd15..2ab918e99b6 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,18 +5,24 @@ , libvisio, libcdr, libexif, automake114x, cmake }: -let +let python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]); in stdenv.mkDerivation rec { - name = "inkscape-0.92.0"; + name = "inkscape-0.92.1"; src = fetchurl { - url = "https://inkscape.org/gallery/item/10552/${name}.tar.bz2"; - sha256 = "0mmssxnxsvb3bpm7ck5pqvwyacrz1nkyacs571jx8j04l1cw3d5q"; + url = "https://media.inkscape.org/dl/resources/file/${name}.tar_XlpI7qT.bz2"; + sha256 = "01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15"; }; + unpackPhase = '' + cp $src ${name}.tar.bz2 + tar xvjf ${name}.tar.bz2 > /dev/null + cd ${name} + ''; + postPatch = '' patchShebangs share/extensions patchShebangs fix-roff-punct From e57e005ac80553e784758dde08f59b8cba41bfb6 Mon Sep 17 00:00:00 2001 From: Renaud Date: Tue, 7 Mar 2017 22:12:00 +0100 Subject: [PATCH 064/113] lgogdownloader: 2.28 -> 3.2 lgogdownloader: 2.28 -> 3.2 --- pkgs/games/lgogdownloader/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index 5c7cad8aa95..c857ccc47a8 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, curl, boost, liboauth, jsoncpp -, htmlcxx, rhash, tinyxml, help2man }: +, htmlcxx, rhash, tinyxml-2, help2man }: stdenv.mkDerivation rec { name = "lgogdownloader-${version}"; - version = "2.28"; + version = "3.2"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - sha256 = "1xn6pfvxz496sj5jiqyzqj6vn6vrzyks9f6xha8g4vy6hkw717ag"; + sha256 = "0p1zh2l8g4y2z02xj0fndbfhcxgcpwhf5d9izwsdi3yljvqv23np"; }; nativeBuildInputs = [ cmake pkgconfig help2man ]; - buildInputs = [ curl boost liboauth jsoncpp htmlcxx rhash tinyxml ]; + buildInputs = [ curl boost liboauth jsoncpp htmlcxx rhash tinyxml-2 ]; meta = { homepage = https://github.com/Sude-/lgogdownloader; From a69d92c4df3ae06c41d05538b1eee912b8e9cbbc Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 19:23:36 -0600 Subject: [PATCH 065/113] gvpe: 2.25 -> 3.0 --- pkgs/tools/networking/gvpe/default.nix | 4 ++-- pkgs/tools/networking/gvpe/src-for-default.nix | 9 --------- pkgs/tools/networking/gvpe/src-info-for-default.nix | 5 ----- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 pkgs/tools/networking/gvpe/src-for-default.nix delete mode 100644 pkgs/tools/networking/gvpe/src-info-for-default.nix diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index fe558103925..6a9a34da9f8 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gvpe-${version}"; - version = "2.25"; + version = "3.0"; src = fetchurl { url = "http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; - sha256 = "1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk"; + sha256 = "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf"; }; buildInputs = [ openssl gmp zlib ]; diff --git a/pkgs/tools/networking/gvpe/src-for-default.nix b/pkgs/tools/networking/gvpe/src-for-default.nix deleted file mode 100644 index 3db30de0bdd..00000000000 --- a/pkgs/tools/networking/gvpe/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="2.25"; - name="gvpe-2.25"; - hash="1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk"; - url="http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; - advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.25.tar.gz"; - - -} diff --git a/pkgs/tools/networking/gvpe/src-info-for-default.nix b/pkgs/tools/networking/gvpe/src-info-for-default.nix deleted file mode 100644 index bbd8f41da02..00000000000 --- a/pkgs/tools/networking/gvpe/src-info-for-default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - downloadPage = "http://ftp.gnu.org/gnu/gvpe/?C=M;O=D"; - baseName = "gvpe"; - sourceRegexp = "[.]tar[.]gz\$"; -} From 15089457556a99db79ad661a470333fc7cd9021a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 9 Mar 2017 03:37:14 +0200 Subject: [PATCH 066/113] treewide: Fix eval-release.nix for aarch64 --- pkgs/development/compilers/rust/bootstrap.nix | 4 ++-- pkgs/development/compilers/rust/nightlyBin.nix | 4 ++-- pkgs/development/tools/misc/kibana/default.nix | 2 +- pkgs/tools/misc/bandwidth/default.nix | 2 +- pkgs/tools/misc/grub4dos/default.nix | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index b582b21dcc4..91660dcc5b3 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -12,7 +12,7 @@ let then "i686-apple-darwin" else if stdenv.system == "x86_64-darwin" then "x86_64-apple-darwin" - else abort "missing boostrap url for platform ${stdenv.system}"; + else throw "missing bootstrap url for platform ${stdenv.system}"; # fetch hashes by running `print-hashes.sh 1.14.0` bootstrapHash = @@ -24,7 +24,7 @@ let then "fe1b3d67329a22d67e3b8db8858a43022e2e746dde60ef4a2db3f2cac16ea9bd" else if stdenv.system == "x86_64-darwin" then "3381341524b0184da5ed2cdcddc2a25e2e335e87f1cf676f64d98ee5e6479f20" - else throw "missing boostrap hash for platform ${stdenv.system}"; + else throw "missing bootstrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix index 5f92e5c6d92..9916e4555c5 100644 --- a/pkgs/development/compilers/rust/nightlyBin.nix +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -5,12 +5,12 @@ let platform = if stdenv.system == "x86_64-linux" then "x86_64-unknown-linux-gnu" - else abort "missing boostrap url for platform ${stdenv.system}"; + else throw "missing bootstrap url for platform ${stdenv.system}"; bootstrapHash = if stdenv.system == "x86_64-linux" then "1v7jvwigb29m15wilzcrk5jmlpaccpzbkhlzf7z5qw08320gvc91" - else throw "missing boostrap hash for platform ${stdenv.system}"; + else throw "missing bootstrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index 677ffa49c99..bd85f614028 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz"; - sha256 = shas."${stdenv.system}"; + sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 05fbe9b5632..8b0e1719196 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -7,7 +7,7 @@ let else if stdenv.system == "x86_64-darwin" then "bandwidth-mac64" else if stdenv.system == "i686-darwin" then "bandwidth-mac32" else if stdenv.system == "i686-cygwin" then "bandwidth-win32" - else null; + else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "bandwidth-${version}"; diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index d9e4ae3a638..054c7d39405 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -3,7 +3,7 @@ let arch = if stdenv.isi686 then "i386" else if stdenv.isx86_64 then "x86_64" - else abort "Unknown architecture"; + else throw "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; version = "0.4.6a-2016-12-24"; From dc94d1a2b5162ca8bd0241d8bff6bfb991a35384 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 9 Mar 2017 03:37:40 +0200 Subject: [PATCH 067/113] release.nix: Fix another typo --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 889df6a00af..3a9a304a72d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -52,7 +52,7 @@ let jobs.python.x86_64-darwin jobs.python3.x86_64-linux jobs.python3.i686-linux - jobs.python3.aarchh64-linux + jobs.python3.aarch64-linux jobs.python3.x86_64-darwin # Many developers use nix-repl jobs.nix-repl.x86_64-linux From 23bbeec420d46f36b1c4609800fd8367aa3ce6ae Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Thu, 9 Mar 2017 10:35:52 +0800 Subject: [PATCH 068/113] emem: 0.2.31 -> 0.2.32 --- pkgs/applications/misc/emem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index cc4e289b7d1..82c224e7db1 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.31"; + version = "0.2.32"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "11kciq73y76c78rpd87bmlnvv4llrf81g3d28y02llnngrbczp7v"; + sha256 = "1ril6ljbm7mczcfgbjnswcxpxpnp0kv949bhv1f6q42pxxj1wj75"; }; buildInputs = [ ]; From ccf7640a4b39a11f8c7f8000536588c48f377ab8 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 8 Mar 2017 23:28:45 -0500 Subject: [PATCH 069/113] openjdk: stop defaulting Darwin to version 7 Let's just be consistent with 8. At some point we'll get a proper build of it from source but until then we might as well standardize on 8, which has been out for years now and seems to work fine on Darwin. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97c8741d6fa..f4e5dad15b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5230,7 +5230,7 @@ with pkgs; inherit (gnome2) GConf gnome_vfs; }; - openjdk = if stdenv.isDarwin then openjdk7 else openjdk8; + openjdk = openjdk8; jdk7 = openjdk7 // { outputs = [ "out" ]; }; jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" @@ -5247,9 +5247,9 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk = if stdenv.isDarwin then jdk7 else jdk8; - jre = if stdenv.isDarwin then jre7 else jre8; - jre_headless = if stdenv.isDarwin then jre7 else jre8_headless; + jdk = jdk8; + jre = jre8; + jre_headless = jre8_headless; openshot-qt = callPackage ../applications/video/openshot-qt { }; From 7c3699b0f61bb5cb1f6a0d8f0b9c69035abd68b2 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 8 Mar 2017 23:39:56 -0500 Subject: [PATCH 070/113] fsharp: enable on Darwin Seems to work just fine based on my simple tests --- pkgs/development/compilers/fsharp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index c00cea0029e..2971fd8a98b 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "http://fsharp.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } From 02549a20a5ca1742b692be6327d1d98ae8e39099 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 9 Mar 2017 08:45:40 +0800 Subject: [PATCH 071/113] syncthing: 0.14.23 -> 0.14.24 --- pkgs/applications/networking/syncthing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 864acacaa9f..95ab09542a0 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -6,14 +6,14 @@ let ''; in stdenv.mkDerivation rec { - version = "0.14.23"; + version = "0.14.24"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1himf8yhfpjsv5m068y2f6f696d7ip0jq7jmg69kn7035zlxicis"; + sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1"; }; buildInputs = [ go ]; From 83fa5738d5249466a8c14fc206563bcde5cd4fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Mar 2017 08:05:13 +0100 Subject: [PATCH 072/113] pepper: disable tests --- pkgs/tools/admin/salt/pepper/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index 781e94059ad..3959946b322 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -10,6 +10,8 @@ python2Packages.buildPythonApplication rec { url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz"; sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck"; }; + + doCheck = false; # no tests available meta = { description = "A CLI front-end to a running salt-api system"; From f2480bdb0a4804c4325d44f2a5da62187513d5ef Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Wed, 8 Mar 2017 19:27:13 +0000 Subject: [PATCH 073/113] rackspace-novaclient: init at 2.1 Note that I package a number of dependencies that make no sense outside of rackspace-novaclient. I don't want to pollute the main namespace with those packages. --- .../python-modules/rackspace-novaclient.nix | 151 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 152 insertions(+) create mode 100644 pkgs/development/python-modules/rackspace-novaclient.nix diff --git a/pkgs/development/python-modules/rackspace-novaclient.nix b/pkgs/development/python-modules/rackspace-novaclient.nix new file mode 100644 index 00000000000..0eaed7e36fd --- /dev/null +++ b/pkgs/development/python-modules/rackspace-novaclient.nix @@ -0,0 +1,151 @@ +{ buildPythonPackage, fetchurl, isPy3k, requests2, novaclient, six, lib }: +let +os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec { + name = "os_virtual_interfacesv2_python_novaclient_ext-0.20"; + + src = fetchurl { + url = "mirror://pypi/o/os-virtual-interfacesv2-python-novaclient-ext/${name}.tar.gz"; + sha256 = "17a4r8psxmfikgmzh709absbn5jsh1005whibmwhysj9fi0zyfbd"; + }; + + propagatedBuildInputs = [ six novaclient ]; + + meta = { + homepage = https://github.com/rackerlabs/os_virtual_interfacesv2_ext; + license = lib.licenses.asl20; + description = "Adds Virtual Interfaces support to python-novaclient"; + }; +}; + +ip-associations-python-novaclient-ext = buildPythonPackage rec { + name = "ip_associations_python_novaclient_ext-0.2"; + + src = fetchurl { + url = "mirror://pypi/i/ip_associations_python_novaclient_ext/${name}.tar.gz"; + sha256 = "0dxfkfjhzskafmb01y8hzbcpvc4cd6fas1s50dzcmg29w4z6qmz4"; + }; + + propagatedBuildInputs = [ six novaclient ]; + + meta = { + homepage = https://github.com/rackerlabs/ip_associations_python_novaclient_ext; + license = lib.licenses.asl20; + description = "Adds Rackspace ip_associations support to python-novaclient"; + }; +}; + + +rackspace-auth-openstack = buildPythonPackage rec { + name = "rackspace-auth-openstack-1.3"; + + src = fetchurl { + url = "mirror://pypi/r/rackspace-auth-openstack/${name}.tar.gz"; + sha256 = "1kaiyvgwmavw2mh0s32yjk70xsziynjdhi01qn9a8kljn7p6kh64"; + }; + + propagatedBuildInputs = [ six novaclient ]; + + meta = { + homepage = https://pypi.python.org/pypi/rackspace-auth-openstack; + license = lib.licenses.asl20; + description = "Rackspace Auth Plugin for OpenStack Clients."; + }; +}; +rax-default-network-flags-python-novaclient-ext = buildPythonPackage rec { + name = "rax_default_network_flags_python_novaclient_ext-0.4.0"; + + src = fetchurl { + url = "mirror://pypi/r/rax_default_network_flags_python_novaclient_ext/${name}.tar.gz"; + sha256 = "00b0csb58k6rr1is68bkkw358mms8mmb898bm8bbr8g7j2fz8aw5"; + }; + + propagatedBuildInputs = [ six novaclient ]; + + meta = { + homepage = https://pypi.python.org/simple/rax-default-network-flags-python-novaclient-ext; + license = lib.licenses.asl20; + description = "Novaclient Extension for Instance Default Network Flags"; + }; +}; +os-networksv2-python-novaclient-ext = buildPythonPackage rec { + name = "os_networksv2_python_novaclient_ext-0.26"; + + src = fetchurl { + url = "mirror://pypi/o/os_networksv2_python_novaclient_ext/${name}.tar.gz"; + sha256 = "06dzqmyrwlq7hla6dk699z18c8v27qr1gxqknimwxlwqdlhpafk1"; + }; + + propagatedBuildInputs = [ six novaclient ]; + + meta = { + homepage = https://pypi.python.org/pypi/os_networksv2_python_novaclient_ext; + license = lib.licenses.asl20; + description = "Adds rackspace networks support to python-novaclient"; + }; +}; + +rax-scheduled-images-python-novaclient-ext = buildPythonPackage rec { + name = "rax_scheduled_images_python_novaclient_ext-0.3.1"; + + src = fetchurl { + url = "mirror://pypi/r/rax_scheduled_images_python_novaclient_ext/${name}.tar.gz"; + sha256 = "1nvwjgrkp1p1d27an393qf49pszm1nvqa2ychhbqmp0bnabwyw7i"; + }; + + propagatedBuildInputs = [ six novaclient ]; + + meta = { + homepage = https://pypi.python.org/pypi/rax_scheduled_images_python_novaclient_ext; + license = lib.licenses.asl20; + description = "Extends python-novaclient to use RAX-SI, the Rackspace Nova API Scheduled Images extension"; + }; +}; + +os-diskconfig-python-novaclient-ext = buildPythonPackage rec { + name = "os_diskconfig_python_novaclient_ext-0.1.3"; + + src = fetchurl { + url = "mirror://pypi/o/os_diskconfig_python_novaclient_ext/${name}.tar.gz"; + sha256 = "0xayy5nlkgl9yr0inqkwirlmar8pv1id29r59lj70g5plwrr5lg7"; + }; + + propagatedBuildInputs = [ six novaclient ]; + + meta = { + homepage = https://pypi.python.org/pypi/os_diskconfig_python_novaclient_ext; + license = lib.licenses.asl20; + description = "Disk Config extension for python-novaclient"; + }; +}; + +in +buildPythonPackage rec { + name = "rackspace-novaclient-2.1"; + + src = fetchurl { + url = "mirror://pypi/r/rackspace-novaclient/${name}.tar.gz"; + sha256 = "1rzaa328hzm8hs9q99gvjr64x47fmcq4dv4656rzxq5s4gv49z12"; + }; + + disabled = isPy3k; + propagatedBuildInputs = [ + requests2 + novaclient + six + # extensions + ip-associations-python-novaclient-ext + os-diskconfig-python-novaclient-ext + os-networksv2-python-novaclient-ext + os-virtual-interfacesv2-python-novaclient-ext + rackspace-auth-openstack + rax-default-network-flags-python-novaclient-ext + rax-scheduled-images-python-novaclient-ext + ]; + + meta = { + homepage = https://pypi.python.org/pypi/rackspace-novaclient/; + license = lib.licenses.asl20; + description = "Metapackage to install python-novaclient and Rackspace extensions"; + maintainers = with lib.maintainers; [ teh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63fc33ed17e..1ab5ebac01b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21554,6 +21554,7 @@ in { doCheck = false; }; + rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient.nix { }; pyrax = buildPythonPackage rec { name = "pyrax-1.8.2"; From a9aeb1039a44a8b1ae30ef8f5fdf54ff62ba3f98 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Thu, 9 Mar 2017 09:22:20 +0000 Subject: [PATCH 074/113] pyrax: 1.8.2 -> 1.9.8 --- pkgs/development/python-modules/pyrax.nix | 26 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +---------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pyrax.nix diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix new file mode 100644 index 00000000000..b0fc29d3cc9 --- /dev/null +++ b/pkgs/development/python-modules/pyrax.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchurl, requests2, novaclient, keyring, + rackspace-novaclient, six, isPy3k }: +buildPythonPackage rec { + name = "pyrax-1.9.8"; + + src = fetchurl { + url = "mirror://pypi/p/pyrax/${name}.tar.gz"; + sha256 = "1x98jzyxnvha81pgx3jpfixljhs7zik89yfp8q06kwpx8ws99nz9"; + }; + + # no good reason given in commit why limited, and seems to work + patchPhase = '' + substituteInPlace "setup.py" \ + --replace "python-novaclient==2.27.0" "python-novaclient" + ''; + + disabled = isPy3k; + propagatedBuildInputs = [ requests2 novaclient keyring rackspace-novaclient six ]; + + meta = { + homepage = "https://github.com/rackspace/pyrax"; + license = lib.licenses.asl20; + description = "Python API to interface with Rackspace"; + maintainers = with lib.maintainers; [ teh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ab5ebac01b..5559b0547a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21556,25 +21556,7 @@ in { rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient.nix { }; - pyrax = buildPythonPackage rec { - name = "pyrax-1.8.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyrax/${name}.tar.gz"; - sha256 = "0hvim60bhgfj91m7pp8jfmb49f087xqlgkqa505zw28r7yl0hcfp"; - }; - - propagatedBuildInputs = with self; [ requests2 ]; - doCheck = false; - - meta = { - broken = true; # missing lots of dependencies with rackspace-novaclient - homepage = "https://github.com/rackspace/pyrax"; - license = licenses.mit; - description = "Python API to interface with Rackspace"; - }; - }; - + pyrax = callPackage ../development/python-modules/pyrax.nix { }; pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; From de363e8706e989dd05afe3ee77633e4d7314d507 Mon Sep 17 00:00:00 2001 From: Pierre Radermecker Date: Thu, 9 Mar 2017 10:44:39 +0100 Subject: [PATCH 075/113] pepper: add 'pierrer' as a maintainer --- lib/maintainers.nix | 1 + pkgs/tools/admin/salt/pepper/default.nix | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ef64a9b53c6..d8056063edd 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -383,6 +383,7 @@ Phlogistique = "Noé Rubinstein "; phreedom = "Evgeny Egorochkin "; phunehehe = "Hoang Xuan Phu "; + pierrer = "Pierre Radermecker "; pierron = "Nicolas B. Pierron "; piotr = "Piotr Pietraszkiewicz "; pjbarnoy = "Perry Barnoy "; diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index 3959946b322..ff9590c79a5 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -10,12 +10,13 @@ python2Packages.buildPythonApplication rec { url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz"; sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck"; }; - + doCheck = false; # no tests available - meta = { + meta = with lib; { description = "A CLI front-end to a running salt-api system"; homepage = https://github.com/saltstack/pepper; - license = lib.licenses.asl20; + maintainers = [ maintainers.pierrer ]; + license = licenses.asl20; }; } From d639498ed9da1001663b86efc14e1c751f384863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Mar 2017 10:52:37 +0100 Subject: [PATCH 076/113] pythonPackges.pyrax: enable tests --- pkgs/development/python-modules/pyrax.nix | 9 ++++++++- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix index b0fc29d3cc9..0abf54f03fe 100644 --- a/pkgs/development/python-modules/pyrax.nix +++ b/pkgs/development/python-modules/pyrax.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchurl, requests2, novaclient, keyring, - rackspace-novaclient, six, isPy3k }: + rackspace-novaclient, six, isPy3k, pytest, glibcLocales }: buildPythonPackage rec { name = "pyrax-1.9.8"; @@ -17,6 +17,13 @@ buildPythonPackage rec { disabled = isPy3k; propagatedBuildInputs = [ requests2 novaclient keyring rackspace-novaclient six ]; + LC_ALL = "en_US.UTF-8"; + buildInputs = [ pytest glibcLocales ]; + + checkPhase = '' + py.test tests/unit + ''; + meta = { homepage = "https://github.com/rackspace/pyrax"; license = lib.licenses.asl20; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5559b0547a0..49f5a48476e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21556,7 +21556,9 @@ in { rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient.nix { }; - pyrax = callPackage ../development/python-modules/pyrax.nix { }; + pyrax = callPackage ../development/python-modules/pyrax.nix { + glibcLocales = pkgs.glibcLocales; + }; pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; From ac1c3c95e18f6e9839f2ca151c761d1b283831f1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 9 Mar 2017 10:59:58 +0000 Subject: [PATCH 077/113] alphabetize maintainers list --- lib/maintainers.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0ffca05180f..6bb0ea3d0b8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -86,9 +86,9 @@ carlsverre = "Carl Sverre "; cdepillabout = "Dennis Gosnell "; cfouche = "Chaddaï Fouché "; + changlinli = "Changlin Li "; chaoflow = "Florian Friesdorf "; chattered = "Phil Scott "; - changlinli = "Changlin Li "; choochootrain = "Hurshal Patel "; chris-martin = "Chris Martin "; chrisjefferson = "Christopher Jefferson "; @@ -354,7 +354,6 @@ np = "Nicolas Pouillard "; nslqqq = "Nikita Mikhailov "; nthorne = "Niklas Thörne "; - xnwdd = "Guillermo NWDD "; obadz = "obadz "; ocharles = "Oliver Charles "; odi = "Oliver Dunkl "; @@ -535,6 +534,7 @@ womfoo = "Kranium Gikos Mendoza "; wscott = "Wayne Scott "; wyvie = "Elijah Rum "; + xnwdd = "Guillermo NWDD "; xwvvvvwx = "David Terry "; yarr = "Dmitry V. "; yochai = "Yochai "; From 0a3b7f994e5995f414b1db3e1d7ca2244220b4e1 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Sat, 4 Mar 2017 13:04:23 +0000 Subject: [PATCH 078/113] python-sip: 4.18.1 -> 4.19.1 --- pkgs/development/python-modules/sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index e44f92ab013..99d3c89e1f9 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,11 +1,11 @@ { lib, fetchurl, mkPythonDerivation, python, isPyPy }: if isPyPy then throw "sip not supported for interpreter ${python.executable}" else mkPythonDerivation rec { - name = "sip-4.18.1"; + name = "sip-4.19.1"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "1452zy3g0qv4fpd9c0y4gq437kn0xf7bbfniibv5n43zpwnpmklv"; + sha256 = "501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e"; }; configurePhase = '' From e7a432db1e5a0e221e598b7bdd76262056542441 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Sat, 4 Mar 2017 13:12:44 +0000 Subject: [PATCH 079/113] python-PyQt: 5.6 -> 5.8 --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 84da1cf9ebf..fcd3f25de7a 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -2,7 +2,7 @@ , lndir, makeWrapper, qmakeHook }: let - version = "5.6"; + version = "5.8"; inherit (pythonPackages) mkPythonDerivation python dbus-python sip; in mkPythonDerivation { name = "PyQt-${version}"; @@ -17,7 +17,7 @@ in mkPythonDerivation { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "1qgh42zsr9jppl9k7fcdbhxcd1wrb7wyaj9lng9nxfa19in1lj1f"; + sha256 = "9edf2816105a4111a447452df2bef7ce47d7efb307c75c3e74c27b8d31d7f66e"; }; buildInputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3136e5edbee..d71380f2c61 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -318,7 +318,7 @@ in { pythonPackages = self; }; - pyqt5 = pkgs.qt5.callPackage ../development/python-modules/pyqt/5.x.nix { + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; From 6631000bd3b229ffaf858642397f496c76fd390c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Mar 2017 22:48:17 +0300 Subject: [PATCH 080/113] pythonPackages.pyqt5: 5.8 -> 5.8.1 --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index fcd3f25de7a..ee3419eed0e 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -2,7 +2,7 @@ , lndir, makeWrapper, qmakeHook }: let - version = "5.8"; + version = "5.8.1"; inherit (pythonPackages) mkPythonDerivation python dbus-python sip; in mkPythonDerivation { name = "PyQt-${version}"; @@ -17,7 +17,7 @@ in mkPythonDerivation { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; - sha256 = "9edf2816105a4111a447452df2bef7ce47d7efb307c75c3e74c27b8d31d7f66e"; + sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy"; }; buildInputs = [ From 7eb9a85b906adca731afdb96bd766cd38f8a71b1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Mar 2017 22:48:31 +0300 Subject: [PATCH 081/113] qt5.qtwebengine: fix library paths Without this it would try to find files in qtbase. --- .../development/libraries/qt-5/5.7/qtwebengine/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix index ec3f9061f79..a42dda1b36c 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix @@ -35,6 +35,13 @@ qtSubmodule { # fix default SSL bundle location sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c + # Fix library paths + sed -i \ + -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ + src/core/web_engine_library_info.cpp + configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ From a0f3590c5bf23bd8ac877ff6b88d06163e4b1757 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Mar 2017 13:16:23 +0300 Subject: [PATCH 082/113] pyqt4: 4.11.3 -> 4.12 --- pkgs/development/python-modules/pyqt/4.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 73835fedcd4..dc3dd69ac02 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: let - version = "4.11.3"; + version = "4.12"; inherit (pythonPackages) mkPythonDerivation python dbus-python sip; in mkPythonDerivation { name = "PyQt-x11-gpl-${version}"; src = fetchurl { - url = "mirror://sourceforge/pyqt/PyQt4/PyQt-${version}/PyQt-x11-gpl-${version}.tar.gz"; - sha256 = "11jnfjw79s0b0qdd9s6kd69w87vf16dhagbhbmwbmrp2vgf80dw5"; + url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz"; + sha256 = "1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w"; }; configurePhase = '' From 15a1743d87edf9f2c85ded977ced7dba52ad6beb Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 9 Mar 2017 07:41:09 -0500 Subject: [PATCH 083/113] libuv: disable tests (temporarily) on Darwin They're flaky, break Hydra builds regularly, and lots of stuff depends transitively on libuv. --- pkgs/development/libraries/libuv/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 0b3b86e66a2..941ab6710c2 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # These should be turned back on, but see https://github.com/NixOS/nixpkgs/issues/23651 + # For now the tests are just breaking large swaths of the nixpkgs binary cache for Darwin, + # and I'd rather have everything else work at all than have stronger assurance here. + doCheck = !stdenv.isDarwin; meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; From 1fa6ecb48d8257dbe33ab688313aba3a66a20c6b Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sat, 4 Mar 2017 18:09:10 +0000 Subject: [PATCH 084/113] nltk: init at 3.2.2 --- pkgs/development/python-modules/nltk.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/nltk.nix diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk.nix new file mode 100644 index 00000000000..c436e40d238 --- /dev/null +++ b/pkgs/development/python-modules/nltk.nix @@ -0,0 +1,30 @@ +{ fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }: + +buildPythonPackage rec { + name = "nltk-${version}"; + version = "3.2.2"; + + src = fetchurl { + url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz"; + sha256 = "13m8i393h5mhpyvh5rghxxpax3bscv8li3ynwfdiq0kh8wsdndqv"; + }; + + propagatedBuildInputs = [ six ]; + + disabled = pythonOlder "2.7" || pythonOlder "3.4" && (pythonAtLeast "3.0"); + + # Tests require some data, the downloading of which is impure. It would + # probably make sense to make the data another derivation, but then feeding + # that into the tests (given that we need nltk itself to download the data, + # unless there's an easy way to download it without nltk's downloader) might + # be complicated. For now let's just disable the tests and hope for the + # best. + doCheck = false; + + meta = { + description = "Natural Language Processing ToolKit"; + homepage = http://nltk.org/; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lheckemann ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e5f9e191304..7c115adc775 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -283,6 +283,8 @@ in { # version of nixpart. nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; + nltk = callPackage ../development/python-modules/nltk.nix { }; + pitz = callPackage ../applications/misc/pitz { }; plantuml = callPackage ../tools/misc/plantuml { }; From be2019570444e6442fc2aee3c53a70ff546042bc Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 9 Mar 2017 14:27:29 +0100 Subject: [PATCH 085/113] qgis: 2.18.3 -> 2.18.4 --- pkgs/applications/gis/qgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index d32aaba8468..004d11fe157 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.3"; + name = "qgis-2.18.4"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "155kz7fizhkmgc4lsmk1cph1zar03pdd8pjpmv81yyx1z0i4ygvl"; + sha256 = "1s264pahxpn0215xmzm8q2khr5xspipd7bbvxah5kj339kyjfy3k"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; From 838051e9cd7a76b93cf94c10d8728c2faca23cdc Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 9 Mar 2017 13:17:32 +0000 Subject: [PATCH 086/113] nixos/iso-image: support boot from USB disks --- nixos/modules/installer/cd-dvd/iso-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 93dba0d882b..85163305c1e 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -280,7 +280,7 @@ in options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ]; }; - boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ]; + boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" "uas" ]; boot.blacklistedKernelModules = [ "nouveau" ]; From 899fd868ea49d9a9835821f60ea58e8e701e280e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 9 Mar 2017 16:14:17 +0100 Subject: [PATCH 087/113] das_watchdog: fix service type --- nixos/modules/services/monitoring/das_watchdog.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/das_watchdog.nix b/nixos/modules/services/monitoring/das_watchdog.nix index 6e2653836d5..88ca3a9227d 100644 --- a/nixos/modules/services/monitoring/das_watchdog.nix +++ b/nixos/modules/services/monitoring/das_watchdog.nix @@ -25,7 +25,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "root"; - Type = "oneshot"; + Type = "simple"; ExecStart = "${das_watchdog}/bin/das_watchdog"; RemainAfterExit = true; }; From c3939cbcf54619b48cbfef16ae627248b0e22558 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 9 Mar 2017 11:46:26 -0500 Subject: [PATCH 088/113] buildbot modules: don't put BB users in nixbld group The nixbld group belongs to nix-daemon and you really don't want to be in it. If you are in it, nix-daemon will kill your processes when you least expect it :) --- .../modules/services/continuous-integration/buildbot/master.nix | 2 +- .../modules/services/continuous-integration/buildbot/worker.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index f363822c21c..0ff6dbac39c 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -118,7 +118,7 @@ in { extraGroups = mkOption { type = types.listOf types.str; - default = [ "nixbld" ]; + default = []; description = "List of extra groups that the buildbot user should be a part of."; }; diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index e80869573fa..00423bd3386 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -31,7 +31,7 @@ in { extraGroups = mkOption { type = types.listOf types.str; - default = [ "nixbld" ]; + default = []; description = "List of extra groups that the Buildbot Worker user should be a part of."; }; From 6962e84b8d9b8069d561709aab21fab15817996c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:14:47 +0100 Subject: [PATCH 089/113] botan2: init at 2.0.1 --- pkgs/development/libraries/botan/2.0.nix | 10 ++++++++++ pkgs/development/libraries/botan/2.0.upstream | 10 ++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/botan/2.0.nix create mode 100644 pkgs/development/libraries/botan/2.0.upstream diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix new file mode 100644 index 00000000000..8d87f119157 --- /dev/null +++ b/pkgs/development/libraries/botan/2.0.nix @@ -0,0 +1,10 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + baseVersion = "2.0"; + revision = "1"; + sha256 = "02sf6qghgs1lmprx715dnyll1rmqcjb9q6s50n20li8idlqysf51"; + postPatch = '' + sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt + ''; +}) diff --git a/pkgs/development/libraries/botan/2.0.upstream b/pkgs/development/libraries/botan/2.0.upstream new file mode 100644 index 00000000000..d10850d46ad --- /dev/null +++ b/pkgs/development/libraries/botan/2.0.upstream @@ -0,0 +1,10 @@ +url http://botan.randombit.net/download.html +version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$' +ensure_version +attribute_name botan2 +do_overwrite(){ + ensure_hash + set_var_value sha256 $CURRENT_HASH + set_var_value baseVersion ${CURRENT_VERSION%.*} + set_var_value revision ${CURRENT_VERSION##*.} +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7baf06381d1..4cd62e54deb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7001,6 +7001,7 @@ with pkgs; boost_process = callPackage ../development/libraries/boost-process { }; botan = callPackage ../development/libraries/botan { }; + botan2 = callPackage ../development/libraries/botan/2.0.nix { }; botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; box2d = callPackage ../development/libraries/box2d { }; From 1a665f4850970230ffe26701876ad201690fbe45 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:15:31 +0100 Subject: [PATCH 090/113] mc: 4.8.18 -> 4.8.19 --- pkgs/tools/misc/mc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 0c9ac20fcc3..7ea7789687f 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mc-${version}"; - version = "4.8.18"; + version = "4.8.19"; src = fetchurl { url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; - sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp"; + sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb"; }; buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE From 5daf9c3e7664d87ac487d23b574e299693b89928 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:27:31 +0100 Subject: [PATCH 091/113] baresip: 0.5.0 -> 0.5.1 --- .../networking/instant-messengers/baresip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 2b831cdcaaf..5dc4294ba3b 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,11 +4,11 @@ , gsm, speex, portaudio, spandsp, libuuid, ccache }: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.5.1"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc"; + sha256 = "0yi80gi2vb600n7wi6mk81zfdi1n5pg1dsz7458sb3z5cv5gj8yg"; }; buildInputs = [zlib openssl libre librem pkgconfig cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good From 1c8c795a209a6e1701fbf6030e2d52745bad81e3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:28:20 +0100 Subject: [PATCH 092/113] asymptote: 2.39 -> 2.40 --- pkgs/tools/graphics/asymptote/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 483c73d149b..0fbca9f659c 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,11 +9,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.39"; + version="2.40"; name="${baseName}-${version}"; - hash="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3"; - url="https://netcologne.dl.sourceforge.net/project/asymptote/2.39/asymptote-2.39.src.tgz"; - sha256="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3"; + hash="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544"; + url="https://netcologne.dl.sourceforge.net/project/asymptote/2.40/asymptote-2.40.src.tgz"; + sha256="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544"; }; buildInputs = [ ghostscriptX imagemagick fftw From a7945a8cab676ba61303910563b0df63fb3e49b8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:29:11 +0100 Subject: [PATCH 093/113] sgt-puzzles: 20161228.7cae89f -> 20170228.1f613ba --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 26278dd031c..6718b3b0b5e 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,6 +1,6 @@ {stdenv, gtk3, pkgconfig, libX11, perl, fetchurl, automake115x, autoconf}: let - version = "20161228.7cae89f"; + version = "20170228.1f613ba"; buildInputs = [ gtk3 pkgconfig libX11 perl automake115x autoconf ]; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "0kqy3gdgfjgaqbjl95pnljz44v91i79qphwdp91k0n5alswxwn76"; + sha256 = "02nqc18fhvxr545wgk55ly61fi0a06q61ljzwadprqxa1n0g0fz5"; }; name = "sgt-puzzles-r" + version; inherit buildInputs; From 3589e08ac5515198986b27076fde8274f848a3b0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:34:06 +0100 Subject: [PATCH 094/113] mpir: 2.7.2 -> 3.0.0 --- pkgs/development/libraries/mpir/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 142bd93fe52..4bfd4350831 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -1,21 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, m4 }: +{ stdenv, fetchurl, fetchpatch, m4, which, yasm }: stdenv.mkDerivation rec { name = "mpir-${version}"; - version = "2.7.2"; + version = "3.0.0"; - buildInputs = [ m4 ]; + nativeBuildInputs = [ m4 which yasm ]; src = fetchurl { url = "http://mpir.org/mpir-${version}.tar.bz2"; - sha256 = "1v25dx7cah2vxwzgq78hpzqkryrfxhwx3mcj3jjq3xxljlsw7m57"; + sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj"; }; - patches = [ (fetchpatch { - url = "https://github.com/wbhart/mpir/commit/fdb590023f7ca4b2e881a2e9573718e7ed180f03.patch"; - sha256 = "152pdqpf8xxr4ky25f9zrvfb66i1wzy6a5b91h4zmpqjdffqf1iw"; - }) ]; - meta = { inherit version; description = ''A highly optimised library for bignum arithmetic forked from GMP''; From 4d44ed9d90b9bc6642e7ee98db2c639471fa96b7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:34:35 +0100 Subject: [PATCH 095/113] ipmiutil: 3.0.1 -> 3.0.2 --- pkgs/tools/system/ipmiutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 059a5d9e416..17477210726 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.0.1"; + version = "3.0.2"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "179hvarw0mk3j1z4102q4692q4mx06y259llr891by0pri0bsb3n"; + sha256 = "0nw12v7w9gx2px3b081i5mm5gl4l9n3vxhhk5n18vj1bs2jsxf4d"; }; buildInputs = [ openssl ]; From c798e3f94a59154561d99991f58ffd5e68207f49 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:37:07 +0100 Subject: [PATCH 096/113] apache-jena: 3.1.1 -> 3.2.0 --- pkgs/servers/nosql/apache-jena/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 13001b1813f..423bc807035 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "3.1.1"; + version = "3.2.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "0sxhpasc3qkj1axkccvckv8wiwcc5v6f4yri49inc3sl02pvvanp"; + sha256 = "0n15mx8lnamkf3a1wlgx5slh6615m14wclv8fzkbb1xqq001c3j4"; }; buildInputs = [ makeWrapper From 30b9da628a5a3921920203be73fc656db132f061 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:37:17 +0100 Subject: [PATCH 097/113] fuseki: 2.4.1 -> 2.5.0 --- pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 12543b336dd..e3e748dc2b4 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "2.4.1"; + version = "2.5.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "01yjpghgz637wwgnk5n9d7kchc3mmrbyrm8fs4rh2hkh66mq3ya4"; + sha256 = "0qkdpifv30138y7d6vj0dksk4fbgcnwl26dqm89q0d66sc0czfbv"; }; buildInputs = [ makeWrapper From 1fc34861547ca6df9cd01ee0765f075afc5ec312 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:37:37 +0100 Subject: [PATCH 098/113] glusterfs: 3.9.1 -> 3.10.0 --- pkgs/tools/filesystems/glusterfs/default.nix | 9 ++++----- pkgs/tools/filesystems/glusterfs/default.upstream | 7 ++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index e81c3768b25..2f49d630c15 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -3,14 +3,13 @@ , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which }: let - s = # Generated upstream information + s = rec { baseName="glusterfs"; - version="3.9.1"; + version = "3.10.0"; name="${baseName}-${version}"; - hash="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.9/3.9.1/glusterfs-3.9.1.tar.gz"; - sha256="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.10/3.10.0/glusterfs-3.10.0.tar.gz"; + sha256 = "1svysq55z4sd6bxcdpkxljwis4cnzkknag22ngyr7sgb4bs19c97"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python2 ncurses readline diff --git a/pkgs/tools/filesystems/glusterfs/default.upstream b/pkgs/tools/filesystems/glusterfs/default.upstream index 7c86455b440..29494eab87b 100644 --- a/pkgs/tools/filesystems/glusterfs/default.upstream +++ b/pkgs/tools/filesystems/glusterfs/default.upstream @@ -1,4 +1,5 @@ url http://download.gluster.org/pub/gluster/glusterfs/ -version_link '[0-9.]+/$' -version_link '[0-9.]+/$' -version_link '[.]tar[.]' +version_link '/[0-9.]+/$' +version_link '/[0-9.]+/$' +version_link 'glusterfs-[0-9.]+[.]tar[.]' +minimize_overwrite From bf514e4412d29f6f177b4d5854367713da45640d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:47:26 +0100 Subject: [PATCH 099/113] sbcl: 1.3.14 -> 1.3.15 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index c713d819661..d1dcda064cb 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.14"; + version = "1.3.15"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1jnwsv8bdkrrg1w0gkjx9nb8sw3if38sna40davrx0rxadc3v5mz"; + sha256 = "11db8pkv3i8ajyb295dh9nl0niyrkh9gjqv4vlaa1dl1vzck5ddi"; }; patchPhase = '' From 8a91ac56b4bbb119dddc8a28832ab0650f57b880 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 15:51:52 +0100 Subject: [PATCH 100/113] eigen3_3: 3.3.1 -> 3.3.3 --- pkgs/development/libraries/eigen/3.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix index ca3d4402206..b4cb1029001 100644 --- a/pkgs/development/libraries/eigen/3.3.nix +++ b/pkgs/development/libraries/eigen/3.3.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - version = "3.3.1"; + version = "3.3.3"; in stdenv.mkDerivation { name = "eigen-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; - sha256 = "141axgv5kykq7125scisjvnfcdx7qcj8n8zlk7g09r7fhqgjr79w"; + sha256 = "0pz7k8kd9nydmsj2prjs67apixipl6pll3f0cjy0y3bvlazqr1wl"; }; nativeBuildInputs = [ cmake ]; From b5485da2cd359a1257a296cba5361a0e52bbe4e0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 18:44:37 +0100 Subject: [PATCH 101/113] icu_57: init at 57.1 for LibreOffice Still --- pkgs/development/libraries/icu/57.nix | 64 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/libraries/icu/57.nix diff --git a/pkgs/development/libraries/icu/57.nix b/pkgs/development/libraries/icu/57.nix new file mode 100644 index 00000000000..fbd5f512aee --- /dev/null +++ b/pkgs/development/libraries/icu/57.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: + +let + pname = "icu4c"; + version = "57.1"; +in +stdenv.mkDerivation ({ + name = pname + "-" + version; + + src = fetchurl { + url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; + sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z"; + }; + + outputs = [ "out" "dev" ]; + outputBin = "dev"; + + # FIXME: This fixes dylib references in the dylibs themselves, but + # not in the programs in $out/bin. + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + postUnpack = '' + sourceRoot=''${sourceRoot}/source + echo Source root reset to ''${sourceRoot} + ''; + + # This pre/postPatch shenanigans is to handle that the patches expect + # to be outside of `source`. + prePatch = '' + pushd .. + ''; + postPatch = '' + popd + ''; + + patches = [ + ]; + + preConfigure = '' + sed -i -e "s|/bin/sh|${stdenv.shell}|" configure + ''; + + configureFlags = "--disable-debug" + + stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath"; + + # remove dependency on bootstrap-tools in early stdenv build + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc + ''; + + postFixup = ''moveToOutput lib/icu "$dev" ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Unicode and globalization support library"; + homepage = http://site.icu-project.org/; + maintainers = with maintainers; [ raskin urkud ]; + platforms = platforms.all; + }; +} // (if stdenv.isArm then { + patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ]; +} else {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cd62e54deb..81a87624088 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7782,6 +7782,8 @@ with pkgs; hyena = callPackage ../development/libraries/hyena { }; icu = callPackage ../development/libraries/icu { }; + # Needed for LibreOffice Still as of 5.2.6.2 + icu_57 = callPackage ../development/libraries/icu/57.nix { }; id3lib = callPackage ../development/libraries/id3lib { }; From ccebeca50046b0181027eb9586686826f44bee20 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 18:45:01 +0100 Subject: [PATCH 102/113] libreoffice-still: use icu_57 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81a87624088..8c8ffd58a8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14268,7 +14268,9 @@ with pkgs; lcms = lcms2; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; + icu = icu_57; }; + icu = icu_57; }); From d90e6c7ee63bf9fba4b50844a29f47459a3833ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Mar 2017 18:47:59 +0100 Subject: [PATCH 103/113] gajim: 0.16.6 -> 0.16.7 --- .../instant-messengers/gajim/default.nix | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index ae318e64424..1228804f5b9 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -25,30 +25,22 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16.6"; + version = "0.16.7"; src = fetchurl { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "1s0h4xll9490vh7ygmi4zsd1fa107f3s9ykhpq0snb04fllwhjq7"; + sha256 = "18srrsswq09i54gcqqy0ylmrix1rrq43f0b8sz1lijr39h3ayw3j"; }; patches = let # An attribute set of revisions to apply from the upstream repository. cherries = { - misc-test-fixes = { - rev = "1f0d7387fd020df5dfc9a6349005ec7dedb7c008"; - sha256 = "0nazpzyg50kl0k8z4dkn033933iz60g1i6nzhib1nmzhwwbnacc5"; - }; - jingle-fix = { - rev = "491d32a2ec13ed3a482e151e0b403eda7b4151b8"; - sha256 = "1pfg1ysr0p6rcwmd8ikjs38av3c4gcxn8pxr6cnnj27n85gvi30g"; - }; - fix-connection-mock = { - rev = "46a19733d208fbd2404cbaeedd8c203d0b6557a4"; - sha256 = "0l3s577pksnz16r4mqa1zmz4y165amsx2mclrm4vzlszy35rmy2b"; - }; + #example-fix = { + # rev = ""; + # sha256 = ""; + #}; }; in mapAttrsToList (name: { rev, sha256 }: fetchurl { name = "gajim-${name}.patch"; From 6de1b73db1e6f1a0e2f11fc603282881d3a03a55 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 18:57:25 +0100 Subject: [PATCH 104/113] eigen: 3.2.5 -> 3.2.10 --- pkgs/development/libraries/eigen/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 0e43b9fb602..c38759e0c75 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - version = "3.2.5"; + version = "3.2.10"; in stdenv.mkDerivation { name = "eigen-${version}"; @@ -9,10 +9,14 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; - sha256 = "1vjixip19lwfia2bjpjwm09j7l20ry75493i6mjsk9djszj61agi"; + sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04"; }; nativeBuildInputs = [ cmake ]; + + postInstall = '' + sed -e '/Cflags:/s@''${prefix}@@' -i "$out"/share/pkgconfig/eigen3.pc + ''; meta = with stdenv.lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; From eaf8cf2f75b17f563f68226184cd06614f4598d5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 18:58:35 +0100 Subject: [PATCH 105/113] harfbuzz: 1.4.2 -> 1.4.4 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 43861e9e195..e8cd4f13ece 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.4.2"; + version = "1.4.4"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "1cxpkhrjd20fwfysyxmi9rjvvggxlbzlyrs39p1dw3q0mg7ls8wg"; + sha256 = "0mfj37qr8fw9mzsvk4296fq8vzq909mwlkl2xrjfrfvc8z5gilim"; }; outputs = [ "out" "dev" ]; From 308f13ce6010cdb3baf035fc50148bed2a6271c0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 18:58:59 +0100 Subject: [PATCH 106/113] libre: 0.5.0 -> 0.5.1 --- pkgs/development/libraries/libre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 6ec6333a73d..5bd18f72356 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.5.1"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "18msdi5a1ssymz00w21hg6sgacb2lzx0ns31iapvk5hv6l225pd2"; + sha256 = "1qs6gpflgwic2pp1nplhhyl585h9q0kf74h5z29ajr5ij0j65rsa"; }; buildInputs = [zlib openssl]; makeFlags = [ From 6fad14b66eacadeb3aec7eb874d756718283512b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Mar 2017 18:59:13 +0100 Subject: [PATCH 107/113] libreoffice-still: 5.2.5.1 -> 5.2.6.2 --- .../office/libreoffice/libreoffice-srcs-still.nix | 10 +++++----- .../office/libreoffice/still-primary-src.nix | 6 +++--- pkgs/applications/office/libreoffice/still.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index 8bfb54fef55..7bcb638b77e 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -112,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.51.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz"; - sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c"; - md5 = "490e19a8ccd1f4a244b50338a0eb9456"; - md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz"; + name = "curl-7.52.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz"; + sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae"; + md5 = "4e1ef056e117b4d25f4ec42ac609c0d4"; + md5name = "4e1ef056e117b4d25f4ec42ac609c0d4-curl-7.52.1.tar.gz"; } { name = "libe-book-0.1.2.tar.bz2"; diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 0fae854f42f..d1e87d7de6d 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "5"; minor = "2"; - patch = "5"; - tweak = "1"; + patch = "6"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "006kn1m5d6c1skgc1scc0gssin922raca2psjv887alplhia6mlp"; + sha256 = "0w1myl4l1qhdkwqb3b52xld1sq45xyg8b45q40l6a50iccwy6j9x"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 329b292da27..6897597e7ef 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0lv3jbnzzkr7nbivsl9jm9b4m9mxvngbmhz6yasblhi0m9ifkxmb"; + sha256 = "0w77mkxmhxx4qjwdwb8bipcdb4pkvkg202mxbbjrv0aj09k6dhvk"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1d29ppdkhhy5x8cric0l872x607ng02bnp2gvv5ck3blb759q68i"; + sha256 = "12xqzp005dhbh618g3zb30vj7rdmccdqj6ix10jlk0clk66n9kf0"; }; }; From 4c33ea35b70fb222aa61f5f1c50d074b6df3e8fc Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 9 Mar 2017 14:40:02 +0100 Subject: [PATCH 108/113] libpcap: fix missing remote-ext.h error --- pkgs/development/libraries/libpcap/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 14567c0daf4..0cd9d758725 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison }: +{ stdenv, fetchurl, fetchpatch, flex, bison }: stdenv.mkDerivation rec { name = "libpcap-1.8.1"; @@ -21,6 +21,13 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace " -arch i386" "" ''; + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/libp/libpcap/1.8.1-3/debian/patches/disable-remote.diff"; + sha256 = "0dvjax9c0spvq8cdjnkbnm65wlzaml259yragf95kzg611vszfmj"; + }) + ]; + preInstall = ''mkdir -p $out/bin''; crossAttrs = { From 16651026882e9e6c74d520be386d4eada09fb572 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 9 Mar 2017 14:46:33 +0100 Subject: [PATCH 109/113] ostinato: refactor --- .../networking/ostinato/default.nix | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 941ed60f9af..41e64d7b721 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchgit, fetchurl, writeText -, qt4, qmake4Hook, protobuf, libpcap -, wireshark, gzip, diffutils, gawk +{ stdenv, fetchFromGitHub, fetchurl, qmake4Hook, makeDesktopItem +, qt4, protobuf, libpcap, wireshark, gzip, diffutils, gawk }: stdenv.mkDerivation rec { - name = "ostinato-2015-12-24"; - src = fetchgit { - url = "https://github.com/pstavirs/ostinato.git"; - rev = "414d89860de0987843295d149bcabeac7c6fd9e5"; - sha256 = "1yif8z8ih027jdsgnxd82z9914wrqpkpi4xgxqv9lygnb2jjjrdx"; + name = "ostinato-${version}"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "pstavirs"; + repo = "ostinato"; + rev = "v${version}"; + sha256 = "1b5a5gypcy9i03mj6md3lkrq05rqmdyhfykrr1z0sv8n3q48xca3"; }; - ostinato_png = fetchurl { + ostinatoIcon = fetchurl { url = "http://ostinato.org/images/site-logo.png"; sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70"; }; @@ -22,7 +24,27 @@ stdenv.mkDerivation rec { patches = [ ./drone_ini.patch ]; + desktopItem = makeDesktopItem { + type = "application"; + name = "ostinato"; + desktopName = "Ostinato"; + genericName = "Packet/Traffic Generator and Analyzer"; + comment = "Network packet and traffic generator and analyzer with a friendly GUI"; + categories = "Network"; + terminal = "false"; + startupNotify = "true"; + exec = "$out/bin/ostinato"; + icon = ostinatoIcon; + extraEntries = '' + GenericName[it]=Generatore ed Analizzatore di pacchetti di rete + Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole + ''; + }; + postInstall = '' + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + cat > $out/bin/ostinato.ini < $out/share/applications/ostinato.desktop < Date: Thu, 9 Mar 2017 15:10:47 -0500 Subject: [PATCH 110/113] pythonPackages.blockdiag: enable on Darwin and other unixes Seemed to work fine on Darwin --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70ed8297ff1..ad065148f74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2991,7 +2991,7 @@ in { description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; homepage = http://blockdiag.com/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; }; From a4f8b67783198ded98516244d5a1592cfc463bd8 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 9 Mar 2017 15:11:05 -0500 Subject: [PATCH 111/113] pythonPackages.funcparserlib: enable on Darwin and other unixes Seemed to work fine on Darwin --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad065148f74..09e0caaf9b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7204,7 +7204,7 @@ in { description = "Recursive descent parsing library based on functional combinators"; homepage = https://code.google.com/p/funcparserlib/; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; }; From 0b0b3b80217a6d8614b6def3b2edb78999b364c4 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 9 Mar 2017 15:12:05 -0500 Subject: [PATCH 112/113] pythonPackages.webcolors: enable on Darwin and other unixes Seemed to work fine on Darwin --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09e0caaf9b0..4dbb61cc456 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26886,7 +26886,7 @@ EOF description = "Library for working with color names/values defined by the HTML and CSS specifications"; homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; }; From 74f92e95562c1dea4791c648fe4a4d9a70b2fd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 9 Mar 2017 21:25:45 +0100 Subject: [PATCH 113/113] knot-resolver: maintenance 1.2.3 -> 1.2.4 --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 24960eb65ef..bc9e35f88c4 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "81a773f182112b4e11935223f900cfbcca8624f2c382b1e39a68d7c3db81c921"; + sha256 = "630b2ad0bfdcf59164957a377adef8b1fddc37a58a7e1d10e76a1b497a30f036"; }; outputs = [ "out" "dev" ];