diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6a1cf6e4ee8..24983cb5287 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -50,3 +50,6 @@ pkgs/development/tools/erlang/* @gleber # Jetbrains pkgs/applications/editors/jetbrains @edwtjo + +# Eclipse +pkgs/applications/editors/eclipse @rycee diff --git a/README.md b/README.md index 1a0fb5014de..b3d5347a6f6 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add ``` For stability and maximum binary package support, it is recommended to maintain -custom changes on top of one of the channels, e.g. `nixos-17.03` for the latest +custom changes on top of one of the channels, e.g. `nixos-17.09` for the latest release and `nixos-unstable` for the latest successful build of master: ``` % git remote update channels -% git rebase channels/nixos-17.03 +% git rebase channels/nixos-17.09 ``` For pull-requests, please rebase onto nixpkgs `master`. @@ -32,9 +32,9 @@ For pull-requests, please rebase onto nixpkgs `master`. * [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22)) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03) +* [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/tested#tabs-constituents) +* [Tests for 17.09 release](https://hydra.nixos.org/job/nixos/release-17.09/tested#tabs-constituents) Communication: diff --git a/lib/maintainers.nix b/lib/maintainers.nix index ccde5c5e25b..0076d9740ab 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -164,13 +164,14 @@ dotlambda = "Robert Schütz "; doublec = "Chris Double "; dpaetzel = "David Pätzel "; + dpflug = "David Pflug "; drets = "Dmytro Rets "; drewkett = "Andrew Burkett "; dsferruzza = "David Sferruzza "; dtzWill = "Will Dietz "; dywedir = "Vladyslav M. "; e-user = "Alexander Kahl "; - ebzzry = "Rommel Martinez "; + ebzzry = "Rommel Martinez "; edanaher = "Evan Danaher "; edef = "edef "; ederoyd46 = "Matthew Brown "; diff --git a/lib/types.nix b/lib/types.nix index 62c6a978af9..c48e3b3000c 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -240,25 +240,6 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; - # List or element of ... - loeOf = elemType: mkOptionType rec { - name = "loeOf"; - description = "element or list of ${elemType.description}s"; - check = x: isList x || elemType.check x; - merge = loc: defs: - let - defs' = filterOverrides defs; - res = (head defs').value; - in - if isList res then concatLists (getValues defs') - else if lessThan 1 (length defs') then - throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}." - else if !isString res then - throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}." - else res; - functor = (defaultFunctor name) // { wrapped = elemType; }; - }; - # Value of given type but with no merging (i.e. `uniq list`s are not concatenated). uniq = elemType: mkOptionType rec { name = "uniq"; diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index 5233e062445..ddc3c7c4a96 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -49,8 +49,8 @@ def get_maintainers(attr_name): @click.command() @click.option( '--jobset', - default="nixos/release-17.03", - help='Hydra project like nixos/release-17.03') + default="nixos/release-17.09", + help='Hydra project like nixos/release-17.09') def cli(jobset): """ Given a Hydra project, inspect latest evaluation diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 4ec48b77335..97a30634dc7 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -398,19 +398,15 @@ EOF # Is this a btrfs filesystem? if ($fsType eq "btrfs") { - my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint"); - if ($status != 0 || join("", @id_info) =~ /ERROR:/) { + my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); + if ($status != 0 || join("", @info) =~ /ERROR:/) { die "Failed to retrieve subvolume info for $mountPoint\n"; } - my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/; + my @ids = join("", @info) =~ m/Subvolume ID:[ \t\n]*([0-9]*)/; if ($#ids > 0) { die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" } elsif ($#ids == 0) { - my ($status, @path_info) = runCommand("btrfs subvol list $rootDir$mountPoint"); - if ($status != 0) { - die "Failed to find $mountPoint subvolume id from btrfs\n"; - } - my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/; + my @paths = join("", @info) =~ m/^([^\n]*)/; if ($#paths > 0) { die "Btrfs returned multiple paths for a single subvolume id, mountpoint $mountPoint\n"; } elsif ($#paths != 0) { diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index 8d3d4f2065e..beaa2c01b29 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -23,7 +23,7 @@ let # proxy_password: password # tags: mytag0, mytag1 - ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"} + ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep ", " cfg.tags }"} # collect_ec2_tags: no # recent_point_threshold: 30 diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index f09791d9aa1..35fe510cbb2 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -34,20 +34,21 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "2.1.0"; + version = "2.2.0"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); -in -stdenv.mkDerivation rec { + withUdisks = (withTaglib && withDevices); + +in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh"; + sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; }; buildInputs = [ vlc ] @@ -60,43 +61,37 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withLame lame ++ stdenv.lib.optional withMtp libmtp ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 - ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; + ++ stdenv.lib.optional withUdisks udisks2; nativeBuildInputs = [ cmake pkgconfig ]; enableParallelBuilding = true; cmakeFlags = stdenv.lib.flatten [ - (fstat withQt5 "QT5") - (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) - (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) - (fstat withCdda "CDPARANOIA") - (fstat withCddb "CDDB") - (fstat withLame "LAME") - (fstat withMtp "MTP") - (fstat withMusicbrainz "MUSICBRAINZ") + (fstat withQt5 "QT5") + (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) + (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) + (fstat withCdda "CDPARANOIA") + (fstat withCddb "CDDB") + (fstat withLame "LAME") + (fstat withMtp "MTP") + (fstat withMusicbrainz "MUSICBRAINZ") (fstat withOnlineServices "ONLINE_SERVICES") - (fstat withDynamic "DYNAMIC") - (fstat withDevices "DEVICES_SUPPORT") - (fstat withHttpServer "HTTP_SERVER") - (fstat withStreams "STREAMS") + (fstat withDynamic "DYNAMIC") + (fstat withDevices "DEVICES_SUPPORT") + (fstat withHttpServer "HTTP_SERVER") + (fstat withStreams "STREAMS") + (fstat withUdisks "UDISKS2") "-DENABLE_HTTPS_SUPPORT=ON" - "-DENABLE_UDISKS2=ON" ]; - # This is already fixed upstream but not released yet. Maybe in version 2. - preConfigure = '' - sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake - ''; - meta = with stdenv.lib; { - homepage = https://github.com/cdrummond/cantata; + homepage = https://github.com/cdrummond/cantata; description = "A graphical client for MPD"; - license = licenses.gpl3; - + license = licenses.gpl3; + maintainers = with maintainers; [ fuuzetsu peterhoeg ]; # Technically Cantata can run on Windows so if someone wants to # bother figuring that one out, be my guest. - platforms = platforms.linux; - maintainers = with maintainers; [ fuuzetsu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix new file mode 100644 index 00000000000..4d3a9a385d6 --- /dev/null +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext +, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 +, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook +, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror +, appstream-glib, desktop_file_utils, atk, pango, duplicity +}: + +stdenv.mkDerivation rec { + name = "deja-dup-${version}"; + version = "36.1"; + + src = fetchurl { + url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz"; + sha256 = "1s48k2sxrpwkzp37s4x7934lyg5194c47nv9ks15rksd5s0alnld"; + }; + + patches = [ + ./fix-paths.patch + ]; + + postPatch = '' + substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \ + "/bin/rm" \ + "${coreutils}/bin/rm" + ''; + + # couldn't find gio/gdesktopappinfo.h + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + nativeBuildInputs = [ + meson ninja pkgconfig vala_0_38 gettext intltool itstool + appstream-glib desktop_file_utils libxml2 wrapGAppsHook + ]; + + buildInputs = [ + libnotify gnome3.libpeas glib gtk3 libsecret + pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus + at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror + ]; + + propagatedUserEnvPkgs = [ duplicity ]; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + # Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed + postFixup = + let + rpath = stdenv.lib.makeLibraryPath [ + glib + gtk3 + gnome3.gnome_online_accounts + gnome3.libpeas + gnome3.nautilus + libgpgerror + libsecret + # Transitive + atk + pango + ]; + in '' + # Unwrap accidentally wrapped library + mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so + + for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do + patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf" + done + ''; + + meta = with stdenv.lib; { + description = "A simple backup tool"; + longDescription = '' + Déjà Dup is a simple backup tool. It hides the complexity \ + of backing up the Right Way (encrypted, off-site, and regular) \ + and uses duplicity as the backend. + ''; + homepage = https://launchpad.net/deja-dup; + license = with licenses; gpl3; + maintainers = with maintainers; [ jtojnar ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch new file mode 100644 index 00000000000..1cc57e6a54a --- /dev/null +++ b/pkgs/applications/backup/deja-dup/fix-paths.patch @@ -0,0 +1,12 @@ +diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build +index 04b136f3..ed8f7cba 100644 +--- a/deja-dup/nautilus/meson.build ++++ b/deja-dup/nautilus/meson.build +@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'], + link_with: [dirhandling], + dependencies: [nautilus_dep], + install: true, +- install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir')) ++ install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0')) + + endif diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 8c77687d875..33d78591151 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0mr82m3yv18ljai3r4ncr65bqhjwxyf1si77iza4ijk5zv1llp7i"; + sha256 = "0xnja2jdjjryisxgyxhh8ik861snl9wdpmr3rjlnalfglghqqb5h"; name = "${name}.deb"; }; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { --set-rpath "${atomEnv.libPath}" \ $out/share/atom/resources/app/apm/bin/node - rm -f $out/share/atom/resources/app/node_modules/dugite/git/bin/git - ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app/node_modules/dugite/git/bin/git + rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git + ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index f72af1908c5..02b8d991eae 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.16.1"; + version = "1.17.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1k06rish1a1hqrkvzy21lg05vmzd345aa65g3d08ikh6508mp100"; - "x86_64-linux" = "1l2xbdvjfmf05cqcjcj3w2450vi7wvkm5zdwkmfhh01fnvbrygnw"; - "x86_64-darwin" = "0bxv3qlhcqn5sb5l5pjhi5560vi1sl844hx3r5x48gmmgd8yziaj"; + "i686-linux" = "1s6nkzdsgfn5x7y91bwb6d7sw4b8s335myc0yhbsfpfks5pgi331"; + "x86_64-linux" = "1av7xcb2sig5p344y2v1zjspg5nl9bds03r1yvgssm7mcy9l1gqk"; + "x86_64-darwin" = "1fn9i5vs4b6xir51zavx7i8m68bwqa1hfr03aagy8byg9v8w5dx8"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 22e56521658..91a34a505f2 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,23 +1,24 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau , libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook +, lensfun }: stdenv.mkDerivation rec { - version = "5.2"; + version = "5.3"; name = "rawtherapee-" + version; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - sha256 = "0i3cr3335bw8yxxzn6kcdx6ccinlnxzrdbgl3ld1kym1w2n5449k"; + sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; buildInputs = [ cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx + lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 286be3cefc9..38eba46138e 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "12914"; + version = "12921"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "104yih9xfgkpcqg8sqgwkpij2l6pwm12jx6kif45j11sg7hxlh8x"; + sha256 = "1fp6mpl8fa91dhdf3hw5hk8xsp1imj7558adjnjkb6n4vmrbszhm"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 587e6a588a7..015ef876064 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -2,7 +2,7 @@ , zlib, libpng , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript -, enableMuPDF ? true, jbig2dec, openjpeg, freetype, harfbuzz, mupdf +, enableMuPDF ? true, mupdf , enableJPEG2K ? true, jasper , enableDJVU ? true, djvulibre , enableGOCR ? false, gocr # Disabled by default due to crashes @@ -51,7 +51,19 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27"; sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693"; }) + + (fetchpatch { + name = "mupdf-1.10a-shared_libs-1.patch"; + url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.10a-shared_libs-1.patch"; + sha256 = "0kg4vahp7hlyyj5hl18brk8s8xcbqrx19pqjzkfq6ha8mqa3k4ab"; + }) ]; + + # Override this since the jpeg directory was renamed libjpeg in mupdf 1.11 + preConfigure = '' + # Don't remove mujs because upstream version is incompatible + rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} + ''; }); leptonica_modded = leptonica.overrideAttrs (attrs: { prePatch = '' @@ -75,8 +87,8 @@ stdenv.mkDerivation rec { [ zlib libpng ] ++ optional enableGSL gsl ++ optional enableGhostScript ghostscript ++ - optionals enableMuPDF [ jbig2dec openjpeg freetype harfbuzz mupdf_modded ] ++ - optionals enableJPEG2K [ jasper ] ++ + optional enableMuPDF mupdf_modded ++ + optional enableJPEG2K jasper ++ optional enableDJVU djvulibre ++ optional enableGOCR gocr ++ optionals enableTesseract [ leptonica_modded tesseract_modded ]; diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch index a393e30fc72..cf7e4896b80 100644 --- a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch +++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch @@ -17,11 +17,11 @@ index 4a2378b..502c477 100644 -# willus.h -# HAVE_GSL_LIB +pkg_check_modules(GSL gsl) -+if(MUPDF_FOUND) ++if(GSL_FOUND) + set(HAVE_GSL_LIB 1) + include_directories(SYSTEM ${GSL_INCLUDEDIR}) + set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS}) -+endif(MUPDF_FOUND) ++endif(GSL_FOUND) # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0) @@ -30,7 +30,7 @@ index 4a2378b..502c477 100644 message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}") set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} - -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype -+ -lopenjp2 -ljbig2dec -ljpeg -lfreetype -lharfbuzz ++ ) endif(MUPDF_FOUND) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6ae86486b47..5de202f8f73 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassx-community-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc"; + sha256 = "1g9qz81i7rsfywl03bwl3cg7q91vp24519b91y5liiyrqrq0zx94"; }; cmakeFlags = [ diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 9fe275b490c..61febf5a7ff 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig -, freetype, harfbuzz, openjpeg, jbig2dec +, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg , enableX11 ? true, libX11, libXext , enableCurl ? true, curl, openssl }: @@ -26,11 +26,17 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614"; sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc"; }) + + (fetchpatch { + name = "mupdf-1.11-shared_libs-1.patch"; + url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch"; + sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j"; + }) ]; makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec ] + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ] ++ lib.optionals enableX11 [ libX11 libXext ] ++ lib.optionals enableCurl [ curl openssl ]; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -41,13 +47,6 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for i in $out/lib/*.a; do - so="''${i%.a}.so" - gcc -shared -o $so.${version} -Wl,--whole-archive $i -Wl,--no-whole-archive - ln -s $so.${version} $so - rm $i - done - mkdir -p "$out/lib/pkgconfig" cat >"$out/lib/pkgconfig/mupdf.pc" < site.cfg + [openblas] + include_dirs = ${numpy.blas}/include + library_dirs = ${numpy.blas}/lib + EOF + ''; + + enableParallelBuilding = true; + + checkPhase = '' + runHook preCheck + pushd dist + ${python.interpreter} -c 'import scipy; scipy.test("fast", verbose=10)' + popd + runHook postCheck + ''; + + passthru = { + blas = numpy.blas; + }; + + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + + meta = { + description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; + homepage = http://www.scipy.org/; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 8970f7a86d1..e61b7f78302 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,22 +1,31 @@ -{ stdenv, binutils, fetchgit }: +{ stdenv, binutils, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2016.12.28"; + version = "2017-10-05"; name = "bloaty-${version}"; - src = fetchgit { - url = "https://github.com/google/bloaty.git"; - rev = "2234386bcee7297dfa1b6d8a5d20f95ea4ed9bb0"; - sha256 = "0cfsjgbp9r16d6qi8v4k609bbhjff4vhdiapfkhr34z1cik1md4l"; + src = fetchFromGitHub { + owner = "google"; + repo = "bloaty"; + rev = "e47b21b01ceecf001e1965e9da249d48d86a1749"; + sha256 = "1il3z49hi0b07agjwr5fg1wzysfxsamfv1snvlp33vrlyl1m7cbm"; fetchSubmodules = true; }; + nativeBuildInputs = [ cmake ]; + enableParallelBuilding = true; - configurePhase = '' - sed -i 's,c++filt,${binutils}/bin/c++filt,' src/bloaty.cc + preConfigure = '' + substituteInPlace src/bloaty.cc \ + --replace "c++filt" \ + "${stdenv.lib.getBin binutils}/bin/c++filt" ''; + doCheck = true; + + checkPhase = "ctest"; + installPhase = '' install -Dm755 {.,$out/bin}/bloaty ''; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e0c027ee632..8701db8d161 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.6.1"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "13jr00jb34ibpqvy1qzzmswc7zfcy82ks7w36iwzh7jlm4l3grd0"; + sha256 = "19rb1lh6v2gi8xlxhdmhydp16i1bgmvb510i053rfy0jlmh1znns"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix new file mode 100644 index 00000000000..e22be524f02 --- /dev/null +++ b/pkgs/development/tools/dep/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "dep-${version}"; + version = "0.3.1"; + rev = "v${version}"; + + goPackagePath = "github.com/golang/dep"; + subPackages = [ "cmd/dep" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "dep"; + sha256 = "0dsiaqfrp7ihhx10qapkl6zm3dw3rwdgcr9rkvmq8zprcp7njz90"; + }; + + buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); + + meta = with stdenv.lib; { + homepage = https://github.com/golang/dep; + description = "Go dependency management tool"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.carlsverre ]; + }; +} diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 91c0054fe91..c61d521ecab 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -85,6 +85,22 @@ in stdenv.mkDerivation rec { ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin + # libiconv: iconv + rm opt/vagrant/embedded/bin/iconv + ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin + + # libxml: xml2-config, xmlcatalog, xmllint + rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} + ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin + ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin + ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin + + # libxslt: xslt-config, xsltproc + rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} + ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin + ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin + + '' + (stdenv.lib.optionalString (! stdenv.isDarwin) '' # ruby: erb, gem, irb, rake, rdoc, ri, ruby rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby} ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin @@ -101,24 +117,10 @@ in stdenv.mkDerivation rec { ln -s $lib opt/vagrant/embedded/lib/''${lib##*/} done - # libiconv: iconv - rm opt/vagrant/embedded/bin/iconv - ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin - - # libxml: xml2-config, xmlcatalog, xmllint - rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} - ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin - ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin - - # libxslt: xslt-config, xsltproc - rm opt/vagrant/embedded/bin/{xslt-config,xsltproc} - ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin - ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin - # libffi ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6 + '') + '' mkdir -p "$out" cp -r opt "$out" cp -r usr/bin "$out" diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index a03695eed77..1172a89caf3 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,36 +1,42 @@ -{ stdenv, fetchurl, pkgconfig -, libX11, mesa, freeglut -, libjack2, libcdio, libsndfile, libsamplerate -, SDL, SDL_net, zlib -}: +{ stdenv, fetchurl, pkgconfig, freeglut, mesa, libcdio, libjack2 +, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: -with stdenv.lib; stdenv.mkDerivation rec { - name = "mednafen-${version}"; - version = "0.9.47"; + version = "0.9.48"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${name}.tar.xz"; - sha256 = "0flz6bjkzs9qrw923s4cpqrz4b2dhc2w7pd8mgw0l1xbmrh7w4si"; + sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; }; - buildInputs = - [ pkgconfig libX11 mesa freeglut libjack2 libcdio - libsndfile libsamplerate SDL SDL_net zlib ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + freeglut + mesa + libcdio + libjack2 + libsamplerate + libsndfile + libX11 + SDL + SDL_net + zlib + ]; + + hardeningDisable = [ "pic" ]; - # Install docs postInstall = '' - mkdir -p $out/share/doc/$name - cd Documentation - install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt + mkdir -p $out/share/doc + mv Documentation $out/share/doc/mednafen ''; meta = with stdenv.lib; { description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; - homepage = http://mednafen.github.io/; + homepage = https://mednafen.github.io/; license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index 91a74171da9..75eeeea4c00 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -1,25 +1,21 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mednafen-server-${version}"; version = "0.5.2"; src = fetchurl { - url = "https://mednafen.github.io/releases/files/mednafen-server-0.5.2.tar.xz"; + url = "https://mednafen.github.io/releases/files/mednafen-server-${version}.tar.xz"; sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq"; }; - postInstall = '' - mkdir -p $out/share/$name - install -m 644 -t $out/share/$name standard.conf - ''; + postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf"; meta = with stdenv.lib; { description = "Netplay server for Mednafen"; - homepage = http://mednafen.github.io/; + homepage = https://mednafen.github.io/; license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 9fb90875b97..0f59892cce1 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional cairoSupport pkgs.cairo ++ lib.optional tiffSupport pkgs.libtiff ++ lib.optional odbcSupport pkgs.unixODBC - ++ lib.optional netapiSupport pkgs.samba3_light + ++ lib.optional netapiSupport pkgs.samba4 ++ lib.optional cursesSupport pkgs.ncurses ++ lib.optional vaSupport pkgs.libva-full ++ lib.optional pcapSupport pkgs.libpcap diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index aaaec67c751..fb384aee746 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -32,15 +32,15 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.17"; + version = "2.18"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "0sgazjn30ki2y3bjrd0xbpf870ii22wkyrmgaxcwbk23j1rrbp3y"; + sha256 = "0l2gmk6g4c5ds29iqcvpmh5g8jdz6g6id7xkgiqps5bqk09322cz"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "11jm39g1kc77fvn02j9g8syyc095b6w2jashyr28v4gi7g0fqv6h"; + sha256 = "02rh2lvx7sd8d6nhgpfq9crjh495k4k7i3wmgigs4m5rlip363s8"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index c45afd1cbeb..043a39ec95a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.4"; + version = "4.13.5"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "087lv2laf4wx28z9zqg9s275nzygica0hc1g8vn5ql6yb7mrb7m0"; + sha256 = "1qi5zxby5qwdv0485gia2jz38dly4ncn10zi3grcckwxc3d5ms59"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 6531323c1d5..e9b9fb54bfc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.52"; + version = "4.9.53"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12h4w6x0zcl8kpia2y7myv7w7i0dihw4g8v638fs8bzk3d7h7pgz"; + sha256 = "095k7kpzic0c2vhwnfm5vcp9j60lyf4qyx2pj9vkp68bpcrmm49j"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index d0d5466ff0f..d141d7f4211 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.13.4"; + version = "4.13.5"; revision = "a"; - sha256 = "0l6xg06w0qicb64h8f6ldic947kn9a68wnad8pjwm89vy8vy4zqm"; + sha256 = "139qa6iyyjwn81v6z66ry1sifdvkbnql45m740djc0gv37il7mzv"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index cd0c283edbb..75fbacfb90e 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -63,8 +63,8 @@ in assert buildKernel -> kernel != null; { splStable = common { - version = "0.7.1"; - sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n"; + version = "0.7.2"; + sha256 = "10rq0npjlp09xjdgn9lc3wm310dqc71j0wgxwj92ncf9r61zf445"; }; splUnstable = common { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 2cd3381933b..dfcb3896244 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -139,9 +139,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.1"; + version = "0.7.2"; - sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n"; + sha256 = "1dl6i4sg7z0k4p1dmfcm9arx62x30lqsr9hycvhhs3pf58ks8z2v"; extraPatches = [ (fetchpatch { diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index ecf9ee9d84a..93fe205a8f9 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -5,7 +5,6 @@ , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 , luaSupport ? false, lua5 -, fetchpatch }: let optional = stdenv.lib.optional; @@ -17,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.27"; + version = "2.4.28"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "699e4e917e8fb5fd7d0ce7e009f8256ed02ec6fc"; + sha256 = "c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666"; }; # FIXME: -dev depends on -doc @@ -40,15 +39,6 @@ stdenv.mkDerivation rec { sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" ''; - patches = [ - (fetchpatch { - name = "CVE-2017-9798.patch"; - url = "https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch"; - sha256 = "00hbq5szgav91kwsc30jdjvgd3vbgm8n198yna8bcs33p434v25k"; - stripLen = 3; - }) - ]; - # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 91b9ed972d8..33da203c502 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.2.27"; + name = "dovecot-2.2.32"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9"; + sha256 = "0bmwyvi1crmrca2knvknsf517x53w7gxrclwyrvrhddgw98j22qn"; }; preConfigure = '' diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 385cf7d35ba..3df0b41c2ca 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.4.10"; + version = "0.4.20"; src = fetchurl { url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; - sha256 = "0vvjj1yjr189rn8f41z5rj8gfvk24a8j33q6spb6bd6k1wbfgpz9"; + sha256 = "0nxy007wmyamwj01yfiqbqjnbsd98z783b811rcavwi5iw5pvqbg"; }; buildInputs = [ dovecot openssl ]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 8a3097ae9de..cf3349dc166 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -85,7 +85,6 @@ let license = licenses.postgresql; maintainers = [ maintainers.ocharles ]; platforms = platforms.unix; - hydraPlatforms = platforms.linux; }; }); @@ -115,4 +114,10 @@ in { sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6"; }; + postgresql100 = common { + version = "10.0"; + psqlSchema = "10.0"; + sha256 = "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi"; + }; + } diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ff542e781a6..f9feaf40ec2 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "btrbk-${version}"; - version = "0.24.0"; + version = "0.25.1"; src = fetchurl { url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "01jrlswly28h4q4r3qfrzadz0pf0ms6wynmqhwddj1ahj31729h3"; + sha256 = "02qc9vbd5l0ywnv01p60v9q3dcx2z92dfaf95qf7ccxqaa9zxfr5"; }; patches = [ diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 313167b1ae2..d55783f7f2c 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; propagatedBuildInputs = with python2Packages; [ - boto cffi cryptography ecdsa enum idna + boto cffi cryptography ecdsa enum idna pygobject3 ipaddress lockfile paramiko pyasn1 pycrypto six ]; checkInputs = with python2Packages; [ lockfile mock pexpect ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix b/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix deleted file mode 100644 index 5bbdbfba188..00000000000 --- a/pkgs/tools/filesystems/btrfs-progs/4.4.1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt -}: - -let version = "4.4.1"; in - -stdenv.mkDerivation rec { - name = "btrfs-progs-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - attr acl zlib libuuid e2fsprogs lzo - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt - ]; - - # gcc bug with -O1 on ARM with gcc 4.8 - # This should be fine on all platforms so apply universally - patchPhase = "sed -i s/-O1/-O2/ configure"; - - meta = with stdenv.lib; { - description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ nckx raskin wkennington ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 87df30bba1c..77411e0cc26 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.8.2"; in +let version = "4.13.1"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0pswcfmdnfc586770h74abp67gn2xv8fd46vxlimnmn837sj7h41"; + sha256 = "1clavvrlkswgicqsm2yfsxqw04lsn8dra0db84jqm6j2apz80kz0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix new file mode 100644 index 00000000000..65eafe76710 --- /dev/null +++ b/pkgs/tools/filesystems/u3-tool/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "u3-tool"; + version = "0.3"; + name = "${pname}-${version}"; + + enableParallelBuilding = true; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + sha256 = "1p9c9kibd1pdbdfa0nd0i3n7bvzi3xg0chm38jg3xfl8gsn0390f"; + }; + + meta = with stdenv.lib; { + description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk"; + homepage = https://sourceforge.net/projects/u3-tool/ ; + license = licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 1606fffe397..cfad499a432 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.12.2"; + version = "2.13.1"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0i8fnxhcl1zin714wxk93x8fi36z4fibapfn4jl3qkwbczkj8c8b"; + sha256 = "1j2jkxzd6rh4ms39izqfm4w8h12dg0ccvqsj0z1z4hb3f1jqcgbz"; }; postConfigure = '' @@ -42,7 +42,7 @@ buildGoPackage rec { In short, this little tool allows you to have project-specific environment variables. ''; - homepage = http://direnv.net; + homepage = https://direnv.net; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 136951cb7bc..5ab05c92135 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { license = licenses.bsd2; version = "0.8.2"; maintainers = [ maintainers.dochang ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index f15c452c955..1b690c04172 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "8047"; + version = "1.2017.16"; name = "plantuml-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar"; - sha256 = "11a1qchalymvc7qn9kqxamp8qm8fljpnxmfi4zs8sg75nzddjnlm"; + url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; + sha256 = "a3d319ed54ed78ce3cf7bfcfe76ffc5aa6ed28a72b5aa575fe9125e0c6bd985c"; }; # It's only a .jar file and a shell wrapper diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index a749f250c11..61370ff890b 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "tmux-${version}"; - version = "2.5"; + version = "2.6"; outputs = [ "out" "man" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0zwjngfaqrlwwbzicc5pq5pyws8f1qghcajvj0hwkipj51hqyswf"; + sha256 = "0605y0nwfmf0mnq075vk80897c2cvhxxvxinqq7hvrpjf2ph5mww"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index aefd6b7500c..c67c758b933 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "aespipe-${version}"; - version = "2.4d"; + version = "2.4e"; src = fetchurl { url = "mirror://sourceforge/loop-aes/aespipe/aespipe-v${version}.tar.bz2"; - sha256 = "03z5i41xv6p3m79lm04d7msda8878lsppv3324zbjjfy19p6bkn5"; + sha256 = "0fmr0vk408bf13jydhdmcdhqw31yc9qk329bs9i60alccywapmds"; }; meta = { diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index e450cf5952e..9eb5858b057 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0dyikpmhsph36ndgd61bs4yx437v5y0bmm8ahjacp1k9c1ly4q56"; }; - patchPhase = '' + postPatch = '' patchShebangs . substituteInPlace src/Makefile.in --replace /bin/echo echo ''; diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index b3625d928b5..28d568d30ae 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,12 +1,12 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_5.4.0-4_amd64.deb", - "sha256": "6b460fed2d7d8473e2b5d069dbe60263195b916c8b79a8fc7c2e8cb953134579", - "version": "5.4.0.post4" + "path": "pool/main/e/enpass/enpass_5.6.0_amd64.deb", + "sha256": "129ae4b4bfb8e0b4fa9acdfb3aebac3dd894364f2f31e9cd3bd5d3567e3a13b7", + "version": "5.6.0" }, "i386": { - "path": "pool/main/e/enpass/enpass_5.4.0-4_i386.deb", - "sha256": "1ec8088d5c3b2906d6820f96e1868c473e78dbe882f04e74a7816d19d43e3692", - "version": "5.4.0.post4" + "path": "pool/main/e/enpass/enpass_5.6.0_i386.deb", + "sha256": "c456002194c0be08a2c0da68ecf224425e35c46de5292098208e4e2b1f6d88ae", + "version": "5.6.0" } } \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cc4c4160e0..a361be01316 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -781,7 +781,6 @@ with pkgs; bsod = callPackage ../misc/emulators/bsod { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; - btrfs-progs_4_4_1 = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { }; btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; @@ -951,6 +950,8 @@ with pkgs; deisctl = callPackage ../development/tools/deisctl {}; + deja-dup = callPackage ../applications/backup/deja-dup { }; + devmem2 = callPackage ../os-specific/linux/devmem2 { }; dbus-broker = callPackage ../os-specific/linux/dbus-broker {}; @@ -1444,6 +1445,8 @@ with pkgs; cuetools = callPackage ../tools/cd-dvd/cuetools { }; + u3-tool = callPackage ../tools/filesystems/u3-tool { }; + unifdef = callPackage ../development/tools/misc/unifdef { }; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; @@ -6306,6 +6309,7 @@ with pkgs; vala_0_28 vala_0_32 vala_0_34 + vala_0_38 vala; valadoc = callPackage ../development/tools/valadoc { }; @@ -10311,8 +10315,14 @@ with pkgs; kirigami_1 kirigami_2; + kdb = callPackage ../development/libraries/kdb { }; + kdiagram = callPackage ../development/libraries/kdiagram { }; + kproperty = callPackage ../development/libraries/kproperty { }; + + kreport = callPackage ../development/libraries/kreport { }; + kirigami = kirigami_1; libcommuni = callPackage ../development/libraries/libcommuni { }; @@ -11761,7 +11771,8 @@ with pkgs; postgresql93 postgresql94 postgresql95 - postgresql96; + postgresql96 + postgresql100; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; @@ -12706,6 +12717,8 @@ with pkgs; delve = callPackage ../development/tools/delve { }; + dep = callPackage ../development/tools/dep { }; + go-bindata = callPackage ../development/tools/go-bindata { }; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; @@ -13820,10 +13833,15 @@ with pkgs; calibre = libsForQt5.callPackage ../applications/misc/calibre { }; - calligra = kde4.callPackage ../applications/office/calligra { + calligra2 = kde4.callPackage ../applications/office/calligra/2.nix { vc = vc_0_7; }; + calligra = libsForQt5.callPackage ../applications/office/calligra { + inherit (kdeApplications) akonadi-calendar akonadi-contacts; + openjpeg = openjpeg_1; + }; + camlistore = callPackage ../applications/misc/camlistore { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -15187,6 +15205,8 @@ with pkgs; kermit = callPackage ../tools/misc/kermit { }; + kexi = libsForQt5.callPackage ../applications/office/kexi { }; + keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { }; keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; @@ -16306,7 +16326,7 @@ with pkgs; shutter = callPackage ../applications/graphics/shutter { }; - simple-scan = callPackage ../applications/graphics/simple-scan { }; + simple-scan = gnome3.simple-scan; siproxd = callPackage ../applications/networking/siproxd { }; @@ -16445,10 +16465,7 @@ with pkgs; smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - snapper = callPackage ../tools/misc/snapper { - btrfs-progs = btrfs-progs_4_4_1; - stdenv = overrideCC stdenv gcc5; - }; + snapper = callPackage ../tools/misc/snapper { }; snd = callPackage ../applications/audio/snd { }; @@ -16700,6 +16717,8 @@ with pkgs; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; + tqsl = callPackage ../applications/misc/tqsl { }; + transcode = callPackage ../applications/audio/transcode { }; transcribe = callPackage ../applications/audio/transcribe { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7e601e88558..275c0739ce6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -114,7 +114,10 @@ let benchmark = callPackage ../development/ocaml-modules/benchmark { }; - biniou = callPackage ../development/ocaml-modules/biniou { }; + biniou = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/biniou { } + else callPackage ../development/ocaml-modules/biniou/1.0.nix { }; bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; @@ -439,8 +442,6 @@ let ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; - ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; - ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; ocf = callPackage ../development/ocaml-modules/ocf { }; @@ -606,6 +607,8 @@ let sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; + ssl = callPackage ../development/ocaml-modules/ssl { }; + stog = callPackage ../applications/misc/stog { }; stringext = callPackage ../development/ocaml-modules/stringext { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e1809d5990b..2ad39ccd280 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11976,13 +11976,13 @@ let self = _self // overrides; _self = with self; { }; }; - ServerStarter = buildPerlModule { - name = "Server-Starter-0.32"; + ServerStarter = buildPerlModule rec { + name = "Server-Starter-0.33"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.32.tar.gz; - sha256 = "a8ecc19f05f3c3b079e1c7f2c007a6df2b9a2912b9848a8fb51bd78c7b13ac1a"; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/${name}.tar.gz"; + sha256 = "109cc1ede244f2edb7e020c507d4a1ff7a8074f22a8f7c30253fb00af1aba6f6"; }; - buildInputs = [ TestRequires TestSharedFork TestTCP ]; + buildInputs = [ ModuleBuild TestRequires TestSharedFork TestTCP ]; meta = { homepage = https://github.com/kazuho/p5-Server-Starter; description = "A superdaemon for hot-deploying server programs"; @@ -12013,11 +12013,15 @@ let self = _self // overrides; _self = with self; { }; }; - SetObject = buildPerlPackage { - name = "Set-Object-1.34"; + SetObject = buildPerlPackage rec { + name = "Set-Object-1.35"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.34.tar.gz; - sha256 = "1dipd6k572pzqjzbj9vagb2k347qcg29lsxzx9y214bhnw7fgvjp"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + sha256 = "189a4d7cc3e583faa8518a63a95cf4aa3a320f79b5c6f5e40970687244080ee7"; + }; + meta = { + description = "Unordered collections (sets) of Perl Objects"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -15457,10 +15461,15 @@ let self = _self // overrides; _self = with self; { }; VariableMagic = buildPerlPackage rec { - name = "Variable-Magic-0.58"; + name = "Variable-Magic-0.61"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Variable/${name}.tar.gz"; - sha256 = "1yhh3zbawx68sw93xrnvfnqq5pb2pmbk20rckqxbwkq1n8c6lv83"; + url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; + sha256 = "b8afe92e54c72a2ed2ca1b08ce90518b855734f7d33c454d0f66f2c1ccf8a6d7"; + }; + meta = { + homepage = http://search.cpan.org/dist/Variable-Magic/; + description = "Associate user-defined magic to variables from Perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e9eaf0fc62..16d279a3897 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14994,6 +14994,59 @@ in { pandas = callPackage ../development/python-modules/pandas { }; + pandas_17 = let + inherit (pkgs.stdenv.lib) optional optionalString; + inherit (pkgs.stdenv) isDarwin; + in buildPythonPackage rec { + name = "pandas-${version}"; + version = "0.17.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; + sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; + }; + + buildInputs = with self; [ nose ] ++ optional isDarwin pkgs.libcxx; + propagatedBuildInputs = with self; [ + dateutil + scipy_0_17 + numexpr + pytz + xlrd + bottleneck + sqlalchemy + lxml + html5lib +# modules.sqlite3 + beautifulsoup4 + ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command + + # For OSX, we need to add a dependency on libcxx, which provides + # `complex.h` and other libraries that pandas depends on to build. + patchPhase = optionalString isDarwin '' + cpp_sdk="${pkgs.libcxx}/include/c++/v1"; + echo "Adding $cpp_sdk to the setup.py common_include variable" + substituteInPlace setup.py \ + --replace "['pandas/src/klib', 'pandas/src']" \ + "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" + + # disable clipboard tests since pbcopy/pbpaste are not open source + substituteInPlace pandas/io/tests/test_clipboard.py \ + --replace pandas.util.clipboard no_such_module \ + --replace OSError ImportError + ''; + + doCheck = false; + + meta = { + homepage = "http://pandas.pydata.org/"; + description = "Python Data Analysis Library"; + license = licenses.bsd3; + maintainers = with maintainers; [ raskin fridh ]; + platforms = platforms.unix; + }; + }; + xlrd = buildPythonPackage rec { name = "xlrd-${version}"; @@ -19354,6 +19407,8 @@ in { scipy = callPackage ../development/python-modules/scipy { }; + scipy_0_17 = callPackage ../development/python-modules/scipy/0.17.1.nix { }; + scikitimage = buildPythonPackage rec { name = "scikit-image-${version}"; version = "0.12.3"; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 41ab5da8067..d6cefb8d184 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -38,13 +38,31 @@ let meta.description = "Release-critical builds for the Nixpkgs darwin channel"; constituents = [ jobs.tarball - jobs.stdenv.x86_64-darwin - jobs.ghc.x86_64-darwin jobs.cabal2nix.x86_64-darwin - jobs.ruby.x86_64-darwin - jobs.python.x86_64-darwin - jobs.rustc.x86_64-darwin + jobs.emacs.x86_64-darwin + jobs.ghc.x86_64-darwin + jobs.git.x86_64-darwin jobs.go.x86_64-darwin + jobs.mysql.x86_64-darwin + jobs.nix-repl.x86_64-darwin + jobs.nix.x86_64-darwin + jobs.nox.x86_64-darwin + jobs.openssh.x86_64-darwin + jobs.openssl.x86_64-darwin + jobs.postgresql.x86_64-darwin + jobs.python.x86_64-darwin + jobs.python3.x86_64-darwin + jobs.ruby.x86_64-darwin + jobs.rustc.x86_64-darwin + jobs.stdenv.x86_64-darwin + jobs.vim.x86_64-darwin + + jobs.tests.cc-wrapper.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-darwin + jobs.tests.cc-wrapper-libcxx.x86_64-darwin + jobs.tests.cc-wrapper-clang-39.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin + jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin ]; }; @@ -76,6 +94,20 @@ let jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin jobs.vim.x86_64-darwin + + jobs.tests.cc-wrapper.x86_64-linux + jobs.tests.cc-wrapper.x86_64-darwin + jobs.tests.cc-wrapper-clang.x86_64-linux + jobs.tests.cc-wrapper-clang.x86_64-darwin + jobs.tests.cc-wrapper-libcxx.x86_64-linux + jobs.tests.cc-wrapper-libcxx.x86_64-darwin + jobs.tests.cc-wrapper-clang-39.x86_64-linux + jobs.tests.cc-wrapper-clang-39.x86_64-darwin + jobs.tests.cc-wrapper-libcxx-39.x86_64-linux + jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin + jobs.tests.stdenv-inputs.x86_64-linux + jobs.tests.stdenv-inputs.x86_64-darwin + jobs.tests.macOSSierraShared.x86_64-darwin ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; };