From 546346849e489054bc9107c55037ebf7f514de89 Mon Sep 17 00:00:00 2001 From: Volth Date: Sun, 25 Jun 2017 12:25:01 +0000 Subject: [PATCH 001/992] fetchMavenArtifact: prevent leaking nix hash to jar name --- pkgs/build-support/fetchmavenartifact/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index a9c53249ae81..dc48a312fb37 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -67,7 +67,7 @@ in # packages packages that mention this derivation in their buildInputs. installPhase = '' mkdir -p $out/share/java - ln -s ${jar} $out/share/java + ln -s ${jar} $out/share/java/${artifactId}-${version}.jar ''; # We also add a `jar` attribute that can be used to easily obtain the path # to the downloaded jar file. From 15bfee85f35231be92e439e7f3f02e9aba34dcdf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 22 Mar 2018 01:22:05 +0300 Subject: [PATCH 002/992] impureUseNativeOptimizations: add stdenv adapter This allows one to force a compiler to use native machine optimizations. This goes contrary to all the usual guarantees of Nix and so should be used only by end-user and only in specific cases when they know what are they doing. In my case this is needed to get a noticeable FPS boost in RPCS3 which is very CPU-hungry PlayStation 3 emulator. --- pkgs/stdenv/adapters.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 734119491a0b..d3f7e4e99331 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -210,4 +210,19 @@ rec { NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -fuse-ld=gold"; }); }; + + + /* Modify a stdenv so that it builds binaries optimized specifically + for the machine they are built on. + + WARNING: this breaks purity! */ + impureUseNativeOptimizations = stdenv: stdenv // + { mkDerivation = args: stdenv.mkDerivation (args // { + NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native"; + NIX_ENFORCE_NO_NATIVE = false; + + preferLocalBuild = true; + allowSubstitutes = false; + }); + }; } From c3c695183cde665872fa53f4c592b47e3976c379 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 27 Apr 2018 15:09:48 +0800 Subject: [PATCH 003/992] nix-optimise: do not run in container --- nixos/modules/services/misc/nix-optimise.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index 295e7fb0ba03..f3c5d3e81db4 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -40,6 +40,8 @@ in systemd.services.nix-optimise = { description = "Nix Store Optimiser"; + # No point running it inside a nixos-container. It should be on the host instead. + unitConfig.ConditionVirtualization = "!container"; serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise"; startAt = optionals cfg.automatic cfg.dates; }; From 6fcee4e1dde50336a7f1874dc63ec8e52b6254d9 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 20 Jun 2018 20:52:36 -0400 Subject: [PATCH 004/992] clementine: add gst_plugins to buildInputs so setup hooks work when the build was refactored in ef5e212d, this was lost. a4ba8c65 got most of it back, but missed the addition of gst_plugins to buildInputs. fixes #39960 --- pkgs/applications/audio/clementine/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 6379975e951c..a18622e8bafc 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -72,7 +72,8 @@ let name = "clementine-free-${version}"; inherit src patches nativeBuildInputs postPatch; - buildInputs = buildInputs ++ [ makeWrapper ]; + # gst_plugins needed for setup-hooks + buildInputs = buildInputs ++ [ makeWrapper gst_plugins ]; cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; @@ -104,7 +105,7 @@ let ./clementine-spotify-blob.patch ]; - buildInputs = buildInputs ++ [ libspotify makeWrapper gst_plugins ]; + buildInputs = buildInputs ++ [ libspotify makeWrapper ]; # Only build and install the Spotify blob preBuild = '' cd ext/clementine-spotifyblob From d9fa88dfe86b4a884f64ccb785077020a21793e8 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Mon, 25 Jun 2018 14:11:59 +0200 Subject: [PATCH 005/992] Use a NixOS module for generating the gdk-pixbuf loaders cache. Fixes issue #33231 and makes it possible to enable Plasma and KDE at the same time. Previously, this worked like this: - The gdk-pixbuf package comes with a cache file covering the modules bundled with gdk-pixbuf. - The librsvg package comes with a cache covering modules from gdk-pixbuf as well as librsvg. - plasma5 and xfce modules set the environment variable GDK_PIXBUF_MODULE_FILE to the one from librsvg, so that SVG was supported in addition to the formats supported by gdk-pixbuf. However if both were enabled a configuration conflict would result (despite setting to the same value). While this sort of worked (ignoring the conflict which perhaps could be hacked around), it is unscalable and a hack, as there would be a real problem when one wanted to add a third package that supports additional image formats. A new NixOS module (gdk-pixbuf) is added with a configuration option (modulePackages) that other modules use to request specific packages to be included in the loaders cache. When any package is present in the list, the module generates a system-wide loaders cache which includes the requested packages (and always gdk-pixbuf itself), and sets the environment variable GDK_PIXBUF_MODULE_FILE to point to the generated cache file. The plasma5 and xfce modules are updated to add librsvg to modulePackages instead of setting GDK_PIXBUF_MODULE_FILE. Note that many packages create wrappers that set GDK_PIXBUF_MODULE_FILE, some directly to the one from librsvg. Therefore this change does not change the existing hack in the librsvg package which ensures that file is generated. This change aims only to solve the conflict in the global environent variable configuration. --- nixos/modules/module-list.nix | 1 + .../services/x11/desktop-managers/plasma5.nix | 6 +-- .../services/x11/desktop-managers/xfce.nix | 3 +- nixos/modules/services/x11/gdk-pixbuf.nix | 45 +++++++++++++++++++ 4 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 nixos/modules/services/x11/gdk-pixbuf.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 193ef0d1c961..688239b044bf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -703,6 +703,7 @@ ./services/x11/hardware/multitouch.nix ./services/x11/hardware/synaptics.nix ./services/x11/hardware/wacom.nix + ./services/x11/gdk-pixbuf.nix ./services/x11/redshift.nix ./services/x11/urxvtd.nix ./services/x11/window-managers/awesome.nix diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 91d091d7d7e2..72e08eda0412 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -181,10 +181,8 @@ in target = "X11/xkb"; }; - environment.variables = { - # Enable GTK applications to load SVG icons - GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; - }; + # Enable GTK applications to load SVG icons + services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; fonts.fonts = with pkgs; [ noto-fonts hack-font ]; fonts.fontconfig.defaultFonts = { diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 7dcc600d2664..824e89781bc0 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -112,10 +112,11 @@ in ]; environment.variables = { - GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ]; }; + services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; + services.xserver.desktopManager.session = [{ name = "xfce"; bgSupport = true; diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix new file mode 100644 index 000000000000..58faa8e2f9df --- /dev/null +++ b/nixos/modules/services/x11/gdk-pixbuf.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.gdk-pixbuf; + + # Get packages to generate the cache for. We always include gdk_pixbuf. + effectivePackages = unique ([pkgs.gdk_pixbuf] ++ cfg.modulePackages); + + # Generate the cache file by running gdk-pixbuf-query-loaders for each + # package and concatenating the results. + loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" {} '' + ( + for package in ${concatStringsSep " " effectivePackages}; do + module_dir="$package/${pkgs.gdk_pixbuf.moduleDir}" + if [[ ! -d $module_dir ]]; then + echo "Warning (services.xserver.gdk-pixbuf): missing module directory $module_dir" 1>&2 + continue + fi + GDK_PIXBUF_MODULEDIR="$module_dir" \ + ${pkgs.gdk_pixbuf.dev}/bin/gdk-pixbuf-query-loaders + done + ) > "$out" + ''; +in + +{ + options = { + services.xserver.gdk-pixbuf.modulePackages = mkOption { + type = types.listOf types.package; + default = [ ]; + description = "Packages providing GDK-Pixbuf modules, for cache generation."; + }; + }; + + # If there is any package configured in modulePackages, we generate the + # loaders.cache based on that and set the environment variable + # GDK_PIXBUF_MODULE_FILE to point to it. + config = mkIf (cfg.modulePackages != []) { + environment.variables = { + GDK_PIXBUF_MODULE_FILE = "${loadersCache}"; + }; + }; +} From 92d48c6a21a0fe1c814d611b8a923688404f83f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Jul 2018 22:20:07 -0700 Subject: [PATCH 006/992] libraw: 0.18.12 -> 0.19.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libraw/versions. These checks were done: - built on NixOS - /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/raw-identify passed the binary check. - /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/unprocessed_raw passed the binary check. - /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/4channels passed the binary check. - /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/simple_dcraw passed the binary check. - /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/mem_image passed the binary check. - /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/dcraw_half passed the binary check. - /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/half_mt passed the binary check. - /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/multirender_test passed the binary check. - /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/postprocessing_benchmark passed the binary check. - /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/dcraw_emu passed the binary check. - 10 of 10 passed binary check by having a zero exit code. - 0 of 10 passed binary check by having the new version present in output. - found 0.19.0 with grep in /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0 - directory tree listing: https://gist.github.com/d21a46bb80b662baa7febf18eab4e313 - du listing: https://gist.github.com/02a9d0af77dcf1045b4d3c5f7d17528f --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 9803e09610e6..e009a9f920b1 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.18.12"; + version = "0.19.0"; src = fetchurl { url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"; + sha256 = "0nfj7s7qmgfy1cl8s3ck7dxjvprfq5glfi6iidmvmy8r7gl52gz8"; }; outputs = [ "out" "lib" "dev" "doc" ]; From ae7cc3eb5c5edacb586fa613a2e98fc4b94aff3a Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sun, 5 Aug 2018 13:05:23 +0200 Subject: [PATCH 007/992] soulseekqt : refactoring appimage manipulation to be more generic. --- .../networking/p2p/soulseekqt/default.nix | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 44e434aa8ee9..e67d768f3ded 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -5,7 +5,7 @@ , qtbase, qtmultimedia , libjson, libgpgerror , libX11, libxcb, libXau, libXdmcp, freetype, libbsd -, pythonPackages, squashfsTools, makeDesktopItem +, pythonPackages, squashfsTools, desktop_file_utils }: with stdenv.lib; @@ -23,16 +23,6 @@ let }; }; - desktopItem = makeDesktopItem { - name = "SoulseekQt"; - exec = "soulseekqt"; - icon = "$out/share/soulseekqt/"; - comment = "Official Qt SoulSeek client"; - desktopName = "SoulseekQt"; - genericName = "SoulseekQt"; - categories = "Network;"; - }; - in stdenv.mkDerivation rec { name = "soulseekqt-${version}"; @@ -41,26 +31,36 @@ in stdenv.mkDerivation rec { dontBuild = true; - buildInputs = [ pythonPackages.binwalk squashfsTools ]; + buildInputs = [ pythonPackages.binwalk squashfsTools desktop_file_utils ]; - # avoid usage of appimagetool + # avoid usage of appimage's runner option --appimage-extract unpackCmd = '' export HOME=$(pwd) # workaround for binwalk - tar xvf $curSrc && binwalk --quiet \ - ${mainbin}.AppImage -D 'squashfs:.squashfs:unsquashfs %e' + appimage=$(tar xvf $curSrc) && binwalk --quiet \ + $appimage -D 'squashfs:squashfs:unsquashfs %e' ''; + + patchPhase = '' + cd squashfs-root/ + binary="$(readlink AppRun)" + + # fixup desktop file + desktop-file-edit --set-key Exec --set-value $binary default.desktop + desktop-file-edit --set-key Comment --set-value "${meta.description}" default.desktop + desktop-file-edit --set-key Categories --set-value Network default.desktop + ''; installPhase = '' - mkdir -p $out/{bin,share/soulseekqt} - cd squashfs-root/ - cp -R soulseek.png translations $out/share/soulseekqt - cp SoulseekQt $out/bin/soulseekqt + mkdir -p $out/{bin,share/applications,share/icons/} + cp default.desktop $out/share/applications/$binary.desktop + cp soulseek.png $out/share/icons/ + cp $binary $out/bin/ ''; fixupPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} \ - $out/bin/soulseekqt + $out/bin/$binary ''; meta = with stdenv.lib; { From c79d054a4c579555a3c70b523c4efa02b6137c71 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 17 Apr 2018 20:37:01 +0100 Subject: [PATCH 008/992] libharu: Build on darwin --- pkgs/development/libraries/libharu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 5d120f61e086..0830b45b308b 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { homepage = http://libharu.org/; license = stdenv.lib.licenses.zlib; maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } From 9c34d1069f4c6664a259a66c1815d473c1b8d4de Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 17 Apr 2018 20:37:29 +0100 Subject: [PATCH 009/992] libiodbc: Build on darwin --- pkgs/development/libraries/libiodbc/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 738c11161955..45649f944f51 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }: +{ stdenv, fetchurl, pkgconfig, gtk2, Carbon, useGTK ? false }: stdenv.mkDerivation rec { name = "libiodbc-3.52.12"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = stdenv.lib.optionals useGTK [ gtk2 ]; + buildInputs = stdenv.lib.optionals useGTK [ gtk2 ] + ++ stdenv.lib.optional stdenv.isDarwin Carbon; preBuild = '' @@ -19,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "iODBC driver manager"; homepage = http://www.iodbc.org; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26fef8cb1d7d..bcb3acac0acd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10373,6 +10373,7 @@ with pkgs; libiodbc = callPackage ../development/libraries/libiodbc { useGTK = config.libiodbc.gtk or false; + inherit (darwin.apple_sdk.frameworks) Carbon; }; libivykis = callPackage ../development/libraries/libivykis { }; From 2891beb31c5d3c8d055804ae4f41b07fbb366244 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 17 Apr 2018 20:39:10 +0100 Subject: [PATCH 010/992] vigra: Build on darwin --- pkgs/development/libraries/vigra/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 14211ea65e9a..27f66ff68812 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -15,6 +15,12 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; + # Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414 + patches = + let clangPatch = fetchurl { url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch"; + sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; }; + in [ clangPatch ]; + buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng libtiff numpy openexr python ]; @@ -31,6 +37,6 @@ in stdenv.mkDerivation rec { homepage = https://hci.iwr.uni-heidelberg.de/vigra; license = licenses.mit; maintainers = [ maintainers.viric ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From cce0fc8fe5c5991b2fc36455b4b0353fff6cc2cf Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 17 Apr 2018 20:36:47 +0100 Subject: [PATCH 011/992] saga: Build on darwin There are some unresolved dependency issues which means a lot of additional dependencies have to be added explicitly on darwin but not on linux. Maybe something to do with libtool. See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs --- pkgs/applications/gis/saga/default.nix | 17 +++++++++++------ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index a0f2e007555e..02f2de64811a 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,10 +1,15 @@ { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper, - libharu, opencv, vigra, postgresql }: + libharu, opencv, vigra, postgresql, Cocoa, + unixODBC , poppler, hdf4, hdf5, netcdf, sqlite }: stdenv.mkDerivation rec { name = "saga-6.3.0"; - buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ]; + # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs + # for why the have additional buildInputs on darwin + buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ] + ++ stdenv.lib.optionals stdenv.isDarwin + [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; enableParallelBuilding = true; @@ -13,11 +18,11 @@ stdenv.mkDerivation rec { sha256 = "0hyjim8fcp3mna1hig22nnn4ki3j6b7096am2amcs99sdr09jjxv"; }; - meta = { + meta = with stdenv.lib; { description = "System for Automated Geoscientific Analyses"; homepage = http://www.saga-gis.org; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = ["x86_64-linux" ]; + license = licenses.gpl2Plus; + maintainers = [ maintainers.michelk ]; + platforms = with platforms; unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcb3acac0acd..7e124de83a48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19878,6 +19878,10 @@ with pkgs; saga = callPackage ../applications/gis/saga { }; + saga = callPackage ../applications/gis/saga { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + samplv1 = callPackage ../applications/audio/samplv1 { }; sauerbraten = callPackage ../games/sauerbraten {}; From 7262b88b0a9033e3b000ac6b80582551245a6fa7 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 17 Apr 2018 20:39:50 +0100 Subject: [PATCH 012/992] saga_2_3_2: Init at 2.3.2 This is the lts branch of SAGA which is currently used by QGIS 2.18.x series. --- pkgs/applications/gis/saga/clang_patch.patch | 19 +++++++++++ pkgs/applications/gis/saga/lts.nix | 33 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/applications/gis/saga/clang_patch.patch create mode 100644 pkgs/applications/gis/saga/lts.nix diff --git a/pkgs/applications/gis/saga/clang_patch.patch b/pkgs/applications/gis/saga/clang_patch.patch new file mode 100644 index 000000000000..e6af8d130514 --- /dev/null +++ b/pkgs/applications/gis/saga/clang_patch.patch @@ -0,0 +1,19 @@ +commit e92b250968e9656084ab5984689747ca615ff6e7 +Author: Volker Wichmann +Date: Sun Mar 5 13:49:53 2017 +0100 + + saga_api, CSG_Table::Del_Records(): bug fix, check record count correctly + +diff --git a/src/saga_core/saga_api/table.cpp b/src/saga_core/saga_api/table.cpp +index 76a1d8d..fa1a66f 100644 +--- a/src/saga_core/saga_api/table.cpp ++++ b/src/saga_core/saga_api/table.cpp +@@ -901,7 +901,7 @@ bool CSG_Table::Del_Record(int iRecord) + //--------------------------------------------------------- + bool CSG_Table::Del_Records(void) + { +- if( m_Records > 0 ) ++ if( m_nRecords > 0 ) + { + _Index_Destroy(); + diff --git a/pkgs/applications/gis/saga/lts.nix b/pkgs/applications/gis/saga/lts.nix new file mode 100644 index 000000000000..a0e9d64ac8e8 --- /dev/null +++ b/pkgs/applications/gis/saga/lts.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, gdal, wxGTK30, proj, libiodbc, lzma, jasper, + libharu, opencv, vigra, postgresql, autoreconfHook, Cocoa + , unixODBC , poppler, hdf4, hdf5, netcdf, sqlite }: + +stdenv.mkDerivation rec { + name = "saga-2.3.2"; + + # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs + # for why the have additional buildInputs on darwin + buildInputs = [ autoreconfHook gdal wxGTK30 proj libharu opencv vigra + postgresql libiodbc lzma jasper + Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; + + enableParallelBuilding = true; + + sourceRoot = "code-b6f474f/saga-gis"; + + patches = [ ./clang_patch.patch ]; + + src = fetchgit { + url = "https://git.code.sf.net/p/saga-gis/code.git"; + rev = "b6f474f8af4af7f0ff82548cc6f88c53547d91f5"; + sha256 = "0iakynai8mhcwj6wxvafkqhd7b417ss7hyhbcp9wf6092l6vc2zd"; + }; + + meta = with stdenv.lib; { + description = "System for Automated Geoscientific Analyses"; + homepage = http://www.saga-gis.org; + license = licenses.gpl2Plus; + maintainers = [ maintainers.mpickering ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e124de83a48..56088c77e847 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19882,6 +19882,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; + saga_2_3_2 = callPackage ../applications/gis/saga/lts.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + samplv1 = callPackage ../applications/audio/samplv1 { }; sauerbraten = callPackage ../games/sauerbraten {}; From f5b097b34606cee52021f28f7b86abff4b31a694 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Wed, 18 Apr 2018 21:23:13 +0100 Subject: [PATCH 013/992] Build QGIS with SAGA plugins --- pkgs/applications/gis/qgis/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 8f06a659f60c..d76557b0a412 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qjson, qca2, txt2tags, openssl, darwin, pkgconfig -, withGrass ? true, grass, IOKit, ApplicationServices +, withGrass ? true, grass, saga, IOKit, ApplicationServices }: stdenv.mkDerivation rec { name = "qgis-2.18.22"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla - fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig ] + fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig + saga ] ++ (stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]) ++ @@ -60,6 +61,8 @@ stdenv.mkDerivation rec { # Necessary for QGIS to find the correct default GRASS path # Plugins look for gdal tools like deminfo on the PATH ${stdenv.lib.optionalString withGrass "ln -sf ${grass} $out/QGIS.app/Contents/MacOS/grass"} + # Necessary for QGIS to find the right SAGA installation + ln -sf ${saga}/bin/saga_cmd $out/QGIS.app/Contents/MacOS/bin/saga_cmd for file in $(find $out -type f -name "QGIS"); do wrapProgram "$file" \ --prefix DYLD_LIBRARY_PATH : "${qwt}/lib" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56088c77e847..10ce58081ba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17950,6 +17950,7 @@ with pkgs; qgis = callPackage ../applications/gis/qgis { inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; + saga = saga_2_3_2; }; qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; From 115027abe153ceb7872be82f13959a9e5136d2f2 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sat, 11 Aug 2018 17:18:58 +0000 Subject: [PATCH 014/992] Fix linux build --- pkgs/applications/gis/saga/lts.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/gis/saga/lts.nix b/pkgs/applications/gis/saga/lts.nix index a0e9d64ac8e8..ed2fb1a65ada 100644 --- a/pkgs/applications/gis/saga/lts.nix +++ b/pkgs/applications/gis/saga/lts.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { # for why the have additional buildInputs on darwin buildInputs = [ autoreconfHook gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper - Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; + unixODBC poppler hdf4.out hdf5 netcdf sqlite ] + ++ stdenv.lib.optional stdenv.isDarwin Cocoa ; enableParallelBuilding = true; From bcab40610be6e1b31c14c95fe7b195f43536459f Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sat, 11 Aug 2018 23:08:17 +0100 Subject: [PATCH 015/992] Remove duplicated attribute --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10ce58081ba3..a2da185795cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19877,8 +19877,6 @@ with pkgs; rrootage = callPackage ../games/rrootage { }; - saga = callPackage ../applications/gis/saga { }; - saga = callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; }; From 5caa3fcae9a757d67d97caa0ada7732d79f6642e Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sun, 12 Aug 2018 10:36:43 +0100 Subject: [PATCH 016/992] Small fixes --- pkgs/applications/gis/saga/default.nix | 4 ++-- pkgs/desktops/gnome-2/platform/GConf/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 02f2de64811a..b1ad81a6a3ff 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper, libharu, opencv, vigra, postgresql, Cocoa, - unixODBC , poppler, hdf4, hdf5, netcdf, sqlite }: + unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull }: stdenv.mkDerivation rec { name = "saga-6.3.0"; # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ] + buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper qhull ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index dd9264514d4a..df3de11e738d 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://projects.gnome.org/gconf/; description = "Deprecated system for storing application preferences"; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 8a4661588af073fe6a3f8e90f66fdd2c11b99153 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sun, 12 Aug 2018 22:13:00 +0100 Subject: [PATCH 017/992] Fixes for rebase --- pkgs/applications/gis/saga/finite.patch | 13 +++++++++++++ pkgs/applications/gis/saga/lts.nix | 10 +++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/gis/saga/finite.patch diff --git a/pkgs/applications/gis/saga/finite.patch b/pkgs/applications/gis/saga/finite.patch new file mode 100644 index 000000000000..7f60743534bd --- /dev/null +++ b/pkgs/applications/gis/saga/finite.patch @@ -0,0 +1,13 @@ +diff --git a/saga-gis/src/modules/imagery/imagery_maxent/me.cpp b/saga-gis/src/modules/imagery/imagery_maxent/me.cpp +index c5da854..d3e9cff 100755 +--- a/src/modules/imagery/imagery_maxent/me.cpp ++++ b/src/modules/imagery/imagery_maxent/me.cpp +@@ -21,7 +21,7 @@ + #ifdef _SAGA_MSW + #define isinf(x) (!_finite(x)) + #else +-#define isinf(x) (!finite(x)) ++#define isinf(x) (!isfinite(x)) + #endif + + /** The input array contains a set of log probabilities lp1, lp2, lp3 diff --git a/pkgs/applications/gis/saga/lts.nix b/pkgs/applications/gis/saga/lts.nix index ed2fb1a65ada..e69d52701be7 100644 --- a/pkgs/applications/gis/saga/lts.nix +++ b/pkgs/applications/gis/saga/lts.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, gdal, wxGTK30, proj, libiodbc, lzma, jasper, libharu, opencv, vigra, postgresql, autoreconfHook, Cocoa - , unixODBC , poppler, hdf4, hdf5, netcdf, sqlite }: + , unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: stdenv.mkDerivation rec { name = "saga-2.3.2"; @@ -9,14 +9,18 @@ stdenv.mkDerivation rec { # for why the have additional buildInputs on darwin buildInputs = [ autoreconfHook gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper - unixODBC poppler hdf4.out hdf5 netcdf sqlite ] + unixODBC poppler hdf4.out hdf5 netcdf sqlite qhull giflib ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa ; enableParallelBuilding = true; + GDAL_CFLAGS = "-std=c++11"; + + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; + sourceRoot = "code-b6f474f/saga-gis"; - patches = [ ./clang_patch.patch ]; + patches = [ ./clang_patch.patch ./finite.patch]; src = fetchgit { url = "https://git.code.sf.net/p/saga-gis/code.git"; From 0c171538ff7245f9e45ea509953082bb76f54360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 13 Aug 2018 11:53:20 +0900 Subject: [PATCH 018/992] wasm: rename unofficial package into proglodyte-wasm --- .../interpreters/{wasm => proglodyte-wasm}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/interpreters/{wasm => proglodyte-wasm}/default.nix (100%) diff --git a/pkgs/development/interpreters/wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix similarity index 100% rename from pkgs/development/interpreters/wasm/default.nix rename to pkgs/development/interpreters/proglodyte-wasm/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9f6c16e9928..fc5de6d4ff2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7655,7 +7655,7 @@ with pkgs; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; - wasm = callPackage ../development/interpreters/wasm { }; + proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; ### DEVELOPMENT / MISC From 2d1ecc482d12fb55b9fbfbe60c8140695191496e Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 11 Aug 2018 22:13:14 -0400 Subject: [PATCH 019/992] lightdm-enso-os-greeter: init at 0.2.1 --- .../lightdm-greeters/enso-os.nix | 159 ++++++++++++++++++ .../services/x11/display-managers/lightdm.nix | 1 + .../lightdm-enso-os-greeter/default.nix | 71 ++++++++ pkgs/top-level/all-packages.nix | 5 + 4 files changed, 236 insertions(+) create mode 100644 nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix create mode 100644 pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix new file mode 100644 index 000000000000..7c794b1ba175 --- /dev/null +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -0,0 +1,159 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + dmcfg = config.services.xserver.displayManager; + ldmcfg = dmcfg.lightdm; + cfg = ldmcfg.greeters.enso; + + theme = cfg.theme.package; + icons = cfg.iconTheme.package; + cursors = cfg.cursorTheme.package; + + # We need a few things in the environment for the greeter to run with + # fonts/icons. + wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter" + { buildInputs = [ pkgs.makeWrapper ]; } + '' + # This wrapper ensures that we actually get themes + makeWrapper ${pkgs.lightdm-enso-os-greeter}/bin/pantheon-greeter \ + $out/greeter \ + --prefix PATH : "${pkgs.glibc.bin}/bin" \ + --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ + --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \ + --set GTK_EXE_PREFIX "${theme}" \ + --set GTK_DATA_PREFIX "${theme}" \ + --set XDG_DATA_DIRS "${theme}/share:${icons}/share:${cursors}/share" \ + --set XDG_CONFIG_HOME "${theme}/share" + + cat - > $out/lightdm-enso-os-greeter.desktop << EOF + [Desktop Entry] + Name=LightDM Greeter + Comment=This runs the LightDM Greeter + Exec=$out/greeter + Type=Application + EOF + ''; + + ensoGreeterConf = pkgs.writeText "lightdm-enso-os-greeter.conf" '' + [greeter] + default-wallpaper=${ldmcfg.background} + gtk-theme=${cfg.theme.name} + icon-theme=${cfg.iconTheme.name} + cursor-theme=${cfg.cursorTheme.name} + blur=${toString cfg.blur} + brightness=${toString cfg.brightness} + ${cfg.extraConfig} + ''; +in { + options = { + services.xserver.displayManager.lightdm.greeters.enso = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable enso-os-greeter as the lightdm greeter + ''; + }; + + theme = { + package = mkOption { + type = types.package; + default = pkgs.gnome3.gnome-themes-extra; + defaultText = "pkgs.gnome3.gnome-themes-extra"; + description = '' + The package path that contains the theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "Adwaita"; + description = '' + Name of the theme to use for the lightdm-enso-os-greeter + ''; + }; + }; + + iconTheme = { + package = mkOption { + type = types.package; + default = pkgs.papirus-icon-theme; + defaultText = "pkgs.papirus-icon-theme"; + description = '' + The package path that contains the icon theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "ePapirus"; + description = '' + Name of the icon theme to use for the lightdm-enso-os-greeter + ''; + }; + }; + + cursorTheme = { + package = mkOption { + type = types.package; + default = pkgs.capitaine-cursors; + defaultText = "pkgs.capitaine-cursors"; + description = '' + The package path that contains the cursor theme given in the name option. + ''; + }; + + name = mkOption { + type = types.str; + default = "capitane-cursors"; + description = '' + Name of the cursor theme to use for the lightdm-enso-os-greeter + ''; + }; + }; + + blur = mkOption { + type = types.bool; + default = false; + description = '' + Whether or not to enable blur + ''; + }; + + brightness = mkOption { + type = types.int; + default = 7; + description = '' + Brightness + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the greeter.conf + configuration file + ''; + }; + }; + }; + + config = mkIf (ldmcfg.enable && cfg.enable) { + environment.etc."lightdm/greeter.conf".source = ensoGreeterConf; + + services.xserver.displayManager.lightdm = { + greeter = mkDefault { + package = wrappedEnsoGreeter; + name = "lightdm-enso-os-greeter"; + }; + + greeters = { + gtk = { + enable = mkDefault false; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 6be15d8cdf46..57a92e697015 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -73,6 +73,7 @@ in imports = [ ./lightdm-greeters/gtk.nix ./lightdm-greeters/mini.nix + ./lightdm-greeters/enso-os.nix ]; options = { diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix new file mode 100644 index 000000000000..38270a25c9c9 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchgit, pkgconfig +, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs +, gtk3, vala, cmake, libgee, libX11, lightdm, gdk_pixbuf, clutter-gtk }: + +stdenv.mkDerivation rec { + version = "0.2.1"; + name = "lightdm-enso-os-greeter-${version}"; + + src = fetchgit { + url = https://github.com/nick92/Enso-OS; + rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427"; + sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; + }; + + buildInputs = [ + dbus + gtk3 + pcre + vala + cmake + epoxy + libgee + libX11 + lightdm + libXdmcp + gdk_pixbuf + clutter-gtk + libxklavier + at-spi2-core + libxkbcommon + libpthreadstubs + ]; + + nativeBuildInputs = [ + pkgconfig + ]; + + postPatch = '' + sed -i "s@\''${CMAKE_INSTALL_PREFIX}/@@" greeter/CMakeLists.txt + ''; + + preConfigure = '' + cd greeter + ''; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + preFixup = '' + mv $out/usr/* $out + rm -r $out/usr + ''; + + postFixup = '' + rm -r $out/sbin + ''; + + meta = with stdenv.lib; { + description = '' + A fork of pantheon greeter that positions elements in a central and + vertigal manner and adds a blur effect to the background + ''; + homepage = https://github.com/nick92/Enso-OS; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ + eadwu + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c29238170a49..8a268669a379 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18326,6 +18326,11 @@ with pkgs; lightdm_qt = lightdm.override { withQt5 = true; }; + lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { + inherit (gnome3) libgee; + inherit (xorg) libX11 libXdmcp libpthreadstubs; + }; + lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { inherit (xfce) exo; }; From 86b966f10862862f77f44ac7bc25d786d148a6f2 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Wed, 15 Aug 2018 09:10:28 +0100 Subject: [PATCH 020/992] Patches for saga-6.3.0 --- pkgs/applications/gis/saga/default.nix | 9 ++- pkgs/applications/gis/saga/finite-6.3.0.patch | 55 +++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/gis/saga/finite-6.3.0.patch diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index b1ad81a6a3ff..10cec193cc0d 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,18 +1,23 @@ { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper, libharu, opencv, vigra, postgresql, Cocoa, - unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull }: + unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: stdenv.mkDerivation rec { name = "saga-6.3.0"; # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper qhull ] + buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma + jasper qhull giflib ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; enableParallelBuilding = true; + patches = [ ./finite-6.3.0.patch]; + + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; + src = fetchurl { url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.3.0/saga-6.3.0.tar.gz"; sha256 = "0hyjim8fcp3mna1hig22nnn4ki3j6b7096am2amcs99sdr09jjxv"; diff --git a/pkgs/applications/gis/saga/finite-6.3.0.patch b/pkgs/applications/gis/saga/finite-6.3.0.patch new file mode 100644 index 000000000000..91c9543edfda --- /dev/null +++ b/pkgs/applications/gis/saga/finite-6.3.0.patch @@ -0,0 +1,55 @@ +diff --git a/src/tools/imagery/imagery_maxent/me.cpp b/src/tools/imagery/imagery_maxent/me.cpp +index c5da854..d3e9cff 100755 +--- a/src/tools/imagery/imagery_maxent/me.cpp ++++ b/src/tools/imagery/imagery_maxent/me.cpp +@@ -21,7 +21,7 @@ + #ifdef _SAGA_MSW + #define isinf(x) (!_finite(x)) + #else +-#define isinf(x) (!finite(x)) ++#define isinf(x) (!isfinite(x)) + #endif + + /** The input array contains a set of log probabilities lp1, lp2, lp3 +@@ -47,7 +47,7 @@ double sumLogProb(vector& logprobs) + /** returns log (e^logprob1 + e^logprob2). */ + double sumLogProb(double logprob1, double logprob2) + { +- if (isinf(logprob1) && isinf(logprob2)) ++ if (isinf(logprob1) && isinf(logprob2)) + return logprob1; // both prob1 and prob2 are 0, return log 0. + if (logprob1>logprob2) + return logprob1+log(1+exp(logprob2-logprob1)); +@@ -70,8 +70,8 @@ void MaxEntModel::print(ostream& ostrm, MaxEntTrainer& trainer) + for (FtMap::iterator it = _index.begin(); it!=_index.end(); it++) { + unsigned long i = it->second; + for (unsigned long c = 0; c<_classes; c++) { +- ostrm << "lambda(" << trainer.className(c) << ", " +- << trainer.getStr(it->first) << ")=" ++ ostrm << "lambda(" << trainer.className(c) << ", " ++ << trainer.getStr(it->first) << ")=" + << _lambda[i+c] << endl; + } + } +@@ -86,7 +86,7 @@ int MaxEntModel::getProbs(MaxEntEvent& event, vector& probs) + double s = 0; + for (unsigned int f = 0; fsecond+c]; + } + probs[c] = s; +@@ -142,10 +142,10 @@ double MaxEntModel::getObsCounts(EventSet& events, vector& obsCounts) + double ftSum = 0; + for (unsigned long j=0; jsecond+c] += count; + else { // new feature, need to expand obsCounts and _lambda +- for (unsigned int k = 0; k<_classes; k++) ++ for (unsigned int k = 0; k<_classes; k++) + obsCounts.push_back(0); + obsCounts[_lambda.size()+c] += count; + addFeature(e[j]); From 1c9af2d89cdeb62eef0c9d3798fdd2203f21f221 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Wed, 15 Aug 2018 09:10:42 +0100 Subject: [PATCH 021/992] Remove unecessary option --- pkgs/applications/gis/saga/lts.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/gis/saga/lts.nix b/pkgs/applications/gis/saga/lts.nix index e69d52701be7..ca0034aa9708 100644 --- a/pkgs/applications/gis/saga/lts.nix +++ b/pkgs/applications/gis/saga/lts.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - GDAL_CFLAGS = "-std=c++11"; - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; sourceRoot = "code-b6f474f/saga-gis"; From 58a2632148e754b3dd52cf74b736b03d8e6a9589 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 16 Aug 2018 10:56:42 +0200 Subject: [PATCH 022/992] triggerhappy: build with systemd socket support --- .../inputmethods/triggerhappy/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix index 719d86b3a389..ec8ac8845597 100644 --- a/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromGitHub, pkgconfig, perl, systemd }: stdenv.mkDerivation rec { name = "triggerhappy-${version}"; version = "0.5.0"; - src = fetchurl { - url = "https://github.com/wertarbyte/triggerhappy/archive/release/${version}.tar.gz"; - sha256 = "af0fc196202f2d35153be401769a9ad9107b5b6387146cfa8895ae9cafad631c"; + src = fetchFromGitHub { + owner = "wertarbyte"; + repo = "triggerhappy"; + rev = "release/${version}"; + sha256 = "0gb1qhrxwq7i5abd408d01a2dpf28nr1fph1fg7w7n0i5i1nnk90"; }; - buildInputs = [ perl ]; - installFlags = [ "DESTDIR=$(out)" ]; + nativeBuildInputs = [ pkgconfig perl ]; + buildInputs = [ systemd ]; - postPatch = '' - substituteInPlace Makefile --replace "/usr/" "/" - substituteInPlace Makefile --replace "/sbin/" "/bin/" - ''; + makeFlags = [ "PREFIX=$(out)" "BINDIR=$(out)/bin" ]; postInstall = '' install -D -m 644 -t "$out/etc/triggerhappy/triggers.d" "triggerhappy.conf.examples" - install -D -m 644 -t "$out/usr/lib/systemd/system" "systemd/triggerhappy.service" "systemd/triggerhappy.socket" - install -D -m 644 -t "$out/usr/lib/udev/rules.d" "udev/triggerhappy-udev.rules" ''; meta = with stdenv.lib; { @@ -34,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/wertarbyte/triggerhappy/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.taha ]; + maintainers = with maintainers; [ jfrankenau taha ]; }; } From f9129251ea633ccf94ba4699a3ce5694c2e0c3b9 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Thu, 16 Aug 2018 11:00:29 +0200 Subject: [PATCH 023/992] nixos/triggerhappy: init --- nixos/modules/module-list.nix | 1 + .../services/hardware/triggerhappy.nix | 114 ++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 nixos/modules/services/hardware/triggerhappy.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e19853efd73c..2fc5e274906b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -274,6 +274,7 @@ ./services/hardware/tlp.nix ./services/hardware/thinkfan.nix ./services/hardware/trezord.nix + ./services/hardware/triggerhappy.nix ./services/hardware/u2f.nix ./services/hardware/udev.nix ./services/hardware/udisks2.nix diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix new file mode 100644 index 000000000000..81d4a1ae65bf --- /dev/null +++ b/nixos/modules/services/hardware/triggerhappy.nix @@ -0,0 +1,114 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.triggerhappy; + + socket = "/run/thd.socket"; + + configFile = pkgs.writeText "triggerhappy.conf" '' + ${concatMapStringsSep "\n" + ({ keys, event, cmd, ... }: + ''${concatMapStringsSep "+" (x: "KEY_" + x) keys} ${toString { press = 1; hold = 2; release = 0; }.${event}} ${cmd}'' + ) + cfg.bindings} + ${cfg.extraConfig} + ''; + + bindingCfg = { config, ... }: { + options = { + + keys = mkOption { + type = types.listOf types.str; + description = "List of keys to match. Key names as defined in linux/input-event-codes.h"; + }; + + event = mkOption { + type = types.enum ["press" "hold" "release"]; + default = "press"; + description = "Event to match."; + }; + + cmd = mkOption { + type = types.str; + description = "What to run."; + }; + + }; + }; + +in + +{ + + ###### interface + + options = { + + services.triggerhappy = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the triggerhappy hotkey daemon. + ''; + }; + + bindings = mkOption { + type = types.listOf (types.submodule bindingCfg); + default = []; + example = lib.literalExample '' + [ { keys = ["PLAYPAUSE"]; cmd = "''${pkgs.mpc_cli}/bin/mpc -q toggle"; } ] + ''; + description = '' + Key bindings for triggerhappy. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Literal contents to append to the end of triggerhappy configuration file. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.sockets.triggerhappy = { + description = "Triggerhappy Socket"; + wantedBy = [ "sockets.target" ]; + socketConfig.ListenDatagram = socket; + }; + + systemd.services.triggerhappy = { + wantedBy = [ "multi-user.target" ]; + after = [ "local-fs.target" ]; + description = "Global hotkey daemon"; + serviceConfig = { + ExecStart = "${pkgs.triggerhappy}/bin/thd --user nobody --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*"; + }; + }; + + services.udev.packages = lib.singleton (pkgs.writeTextFile { + name = "triggerhappy-udev-rules"; + destination = "/etc/udev/rules.d/61-triggerhappy.rules"; + text = '' + ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \ + RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev" + ''; + }); + + }; + +} From f086c4bb339ed006252876f43247f63406c86769 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 27 Aug 2018 19:03:42 +0300 Subject: [PATCH 024/992] vk-messenger: init --- .../vk-messenger/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/vk-messenger/default.nix diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix new file mode 100644 index 000000000000..5642d254295e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, rpmextract, autoPatchelfHook +, xorg, gtk2, gnome2, nss, alsaLib, udev, libnotify }: + +let + version = "3.9.0"; +in stdenv.mkDerivation { + name = "vk-messenger-${version}"; + src = { + i686-linux = fetchurl { + url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; + sha256 = "150qjj6ccbdp3gxs99jbzp27in1y8qkngn7jgb9za61pm4j70va3"; + }; + x86_64-linux = fetchurl { + url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; + sha256 = "04lavv614qhj17zccpdih4k6ghj21nd0s8qxbkxkqb1jb0z8dfz9"; + }; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + + nativeBuildInputs = [ rpmextract autoPatchelfHook ]; + buildInputs = (with xorg; [ + libXdamage libXtst libXScrnSaver libxkbfile + ]) ++ [ + gtk2 gnome2.GConf nss alsaLib + ]; + runtimeDependencies = [ udev.lib libnotify ]; + + unpackPhase = '' + rpmextract $src + ''; + + buildPhase = '' + substituteInPlace usr/share/applications/vk.desktop \ + --replace /usr/share/pixmaps/vk.png vk + ''; + + installPhase = '' + mkdir $out + cd usr + cp -r --parents bin $out + cp -r --parents share/vk $out + cp -r --parents share/applications $out + cp -r --parents share/pixmaps $out + ''; + + meta = with stdenv.lib; { + description = "Simple and Convenient Messaging App for VK"; + homepage = https://vk.com/messenger; + license = licenses.unfree; + maintainers = [ maintainers.gnidorah ]; + platforms = ["i686-linux" "x86_64-linux"]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86de6b193186..f8a09cd9f60c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5682,6 +5682,8 @@ with pkgs; vampire = callPackage ../applications/science/logic/vampire {}; + vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {}; + volatility = callPackage ../tools/security/volatility { }; vbetool = callPackage ../tools/system/vbetool { }; From 25a14fc261b0ffd5a4b157c5f663d025913fc3b5 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 3 Sep 2018 14:42:48 +0200 Subject: [PATCH 025/992] nixos docs: system restart to apply containers nat --- nixos/doc/manual/administration/container-networking.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index 4b977d1d82eb..8aca329c8f1f 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -52,4 +52,7 @@ $ ping -c1 10.233.4.2 networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; + + You may need to restart your system for the changes to take effect. + From 31919bce6ba59e7fb117b34bd2b1f460ef208053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 4 Sep 2018 14:22:20 +0200 Subject: [PATCH 026/992] nix-daemon service: Ensure `ssh` is on PATH. Fixes #46038. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a regression introduced in commit 700e21d6dac4683ef40f20127a6eb2a74b9bd8c6 nix needs ssh on path for the SSH substituter functionality, not only the distributed builds functionality. Signed-off-by: Niklas Hambüchen --- nixos/modules/services/misc/nix-daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index c0eb882c58f3..ec56e75992be 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -400,8 +400,8 @@ in systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ]; systemd.services.nix-daemon = - { path = [ nix pkgs.utillinux ] - ++ optionals cfg.distributedBuilds [ config.programs.ssh.package pkgs.gzip ] + { path = [ nix pkgs.utillinux config.programs.ssh.package ] + ++ optionals cfg.distributedBuilds [ pkgs.gzip ] ++ optionals (!isNix20) [ pkgs.openssl.bin ]; environment = cfg.envVars From ef043c727fcef41a918192f47187cdaea0b5485f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 22:17:55 -0700 Subject: [PATCH 027/992] linuxPackages.evdi: 1.5.0 -> 1.5.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/evdi/versions --- pkgs/os-specific/linux/evdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 730df56a6429..79a943895740 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "evdi-${version}"; - version = "1.5.0"; + version = "1.5.0.2"; src = fetchFromGitHub { owner = "DisplayLink"; repo = "evdi"; rev = "v${version}"; - sha256 = "01z7bx5rgpb5lc4c6dxfiv52ni25564djxmvmgy3d7r1x1mqhxgs"; + sha256 = "1wjk023lpjxnspfl34c6rzkrixahfdzdkmc3hnmrdw12s3i6ca5x"; }; nativeBuildInputs = kernel.moduleBuildDependencies; From ee58a5b30d6e60407b44fbb02ddade6c20fd8763 Mon Sep 17 00:00:00 2001 From: Remy Goldschmidt Date: Tue, 4 Sep 2018 18:31:32 -0500 Subject: [PATCH 028/992] v8_6_x: 6.2.414.27 -> 6.9.427.14 --- pkgs/development/libraries/v8/6_x.nix | 124 +++++++++++++++----------- 1 file changed, 73 insertions(+), 51 deletions(-) diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix index adebedbf2ac1..85d0c0d91bb5 100644 --- a/pkgs/development/libraries/v8/6_x.nix +++ b/pkgs/development/libraries/v8/6_x.nix @@ -13,82 +13,102 @@ let else "ia32"; git_url = "https://chromium.googlesource.com"; + # This data is from the DEPS file in the root of a V8 checkout deps = { "base/trace_event/common" = fetchgit { - url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "65d1d42a5df6c0a563a6fdfa58a135679185e5d9"; - sha256 = "0ikk0dj12adzr0138jrmwzhx8n9sl5qzs86a3mc3gva08a8wc84p"; + url = "${git_url}/chromium/src/base/trace_event/common.git"; + rev = "211b3ed9d0481b4caddbee1322321b86a483ca1f"; + sha256 = "080sya1dg32hi5gj7zr3r5l18r6w8g0imajyf3xfvnz67a2i8dd7"; }; "build" = fetchgit { - url = "${git_url}/chromium/src/build.git"; - rev = "48a2b7b39debc7c77c868c9ddb0a360af1ebc367"; - sha256 = "0aj554dfdbwnikwaapznfq55wkwbvg4114h7qamixy8ryjkaiy0k"; + url = "${git_url}/chromium/src/build.git"; + rev = "7315579e388589b62236ad933f09afd1e838d234"; + sha256 = "14gsigyjfm03kfzmz0v6429b6qnycvzx0yj3vwaks8may26aiv71"; }; "buildtools" = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "5af0a3a8b89827a8634132080a39ab4b63dee489"; - sha256 = "1841803m40w1hmnmm7qzdpk4b6q1m8cb7q4hsflqfpddpf4lp3v1"; + url = "${git_url}/chromium/buildtools.git"; + rev = "0dd5c6f980d22be96b728155249df2da355989d9"; + sha256 = "0m1fh0qjcx9c69khnqcsqvrnqs7ji6wfxns9vv9mknj20sph5ydr"; }; "test/benchmarks/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/benchmarks.git"; - rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; + url = "${git_url}/v8/deps/third_party/benchmarks.git"; + rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; }; "test/mozilla/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; - rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; + url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; + rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; }; "test/test262/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/test262.git"; - rev = "1b911a8f8abf4cb63882cfbe72dcd4c82bb8ad91"; - sha256 = "1hbp7vv41k7jka8azc78hhw4qng7gckr6dz1van7cyd067znwvr4"; + url = "${git_url}/external/github.com/tc39/test262.git"; + rev = "a6c1d05ac4fed084fa047e4c52ab2a8c9c2a8aef"; + sha256 = "1cy3val2ih6r4sbaxd1v9fir87mrlw1kr54s64g68gnch53ck9s3"; }; "test/test262/harness" = fetchgit { - url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; - rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd"; + url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; + rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd"; sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp"; }; "test/wasm-js" = fetchgit { - url = "${git_url}/external/github.com/WebAssembly/spec.git"; - rev = "17b4a4d98c80b1ec736649d5a73496a0e6d12d4c"; - sha256 = "03nyrrqffzj6xrmqi1v7f9m9395bdk53x301fy5mcq4hhpq6rsjr"; + url = "${git_url}/external/github.com/WebAssembly/spec.git"; + rev = "2113ea7e106f8a964e0445ba38f289d2aa845edd"; + sha256 = "07aw7x2xzmzk905mqf8gbbb1bi1a5kv99g8iv6x2p07d3zns7xzx"; }; - "testing/gmock" = fetchgit { - url = "${git_url}/external/googlemock.git"; - rev = "0421b6f358139f02e102c9c332ce19a33faf75be"; - sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp"; + "third_party/depot_tools" = fetchgit { + url = "${git_url}/chromium/tools/depot_tools.git"; + rev = "fb734036f4b5ae6d5afc63cbfc41d3a5d1c29a82"; + sha256 = "1738y7xgfnn0hfdr8g5jw7555841ycxbn580mdffwv4jnbn7120s"; }; - "testing/gtest" = fetchgit { - url = "${git_url}/external/github.com/google/googletest.git"; - rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; - sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; + "third_party/googletest/src" = fetchgit { + url = "${git_url}/external/github.com/google/googletest.git"; + rev = "ce468a17c434e4e79724396ee1b51d86bfc8a88b"; + sha256 = "0nik8wb1b0zk2sslawgp5h211r5bc4x7m962dgnmbk11ccvsmr23"; }; "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "08cb956852a5ccdba7f9c941728bb833529ba3c6"; - sha256 = "0vn2iv068kmcjqqx5cgyha80x9iraz11hpx3q4n3rkvrlvbb3d7b"; + url = "${git_url}/chromium/deps/icu.git"; + rev = "a9a2bd3ee4f1d313651c5272252aaf2a3e7ed529"; + sha256 = "1bfyxakgv9z0rxbqsy5csi85kg8dqy7i6zybmng5wyzag9cns4f9"; }; "third_party/instrumented_libraries" = fetchgit { - url = "${git_url}/chromium/src/third_party/instrumented_libraries.git"; - rev = "644afd349826cb68204226a16c38bde13abe9c3c"; - sha256 = "0d1vkwilgv1a4ghazn623gwmm7h51padpfi94qrmig1y748xfwfa"; + url = "${git_url}/chromium/src/third_party/instrumented_libraries.git"; + rev = "323cf32193caecbf074d1a0cb5b02b905f163e0f"; + sha256 = "0q3n3ivqva28qpn67ds635521pwzpc9apcyagz65i9j17bb1k231"; }; - # templates of code generator require jinja2 2.8 (while nixpkgs has 2.9.5, which breaks the template) "third_party/jinja2" = fetchgit { - url = "${git_url}/chromium/src/third_party/jinja2.git"; - rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0"; - sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd"; + url = "${git_url}/chromium/src/third_party/jinja2.git"; + rev = "b41863e42637544c2941b574c7877d3e1f663e25"; + sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r"; }; "third_party/markupsafe" = fetchgit { - url = "${git_url}/chromium/src/third_party/markupsafe.git"; - rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; + url = "${git_url}/chromium/src/third_party/markupsafe.git"; + rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; }; + "third_party/proguard" = fetchgit { + url = "${git_url}/chromium/src/third_party/proguard.git"; + rev = "eba7a98d98735b2cc65c54d36baa5c9b46fe4f8e"; + sha256 = "1yx86z2p243b0ykixgqz6nlqfp8swa6n0yl5fgb29fa4jvsjz3d1"; + }; "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "40f69660bf3cd407e72b8ae240fdd6c513dddbfe"; - sha256 = "1plkb9dcn34yd6lad7w59s9vqwmcc592dasgdk232spkafpg8qcf"; + url = "${git_url}/chromium/src/tools/clang.git"; + rev = "c0b1d892b2bc1291eb287d716ca239c1b03fb215"; + sha256 = "1mz1pqzr2b37mymbkqkmpmj48j7a8ig0ibaw3dfilbx5nbl4wd2z"; + }; + "tools/gyp" = fetchgit { + url = "${git_url}/external/gyp.git"; + rev = "d61a9397e668fa9843c4aa7da9e79460fe590bfb"; + sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0"; + }; + "tools/luci-go" = fetchgit { + url = "${git_url}/chromium/src/tools/luci-go.git"; + rev = "abcd908f74fdb155cc8870f5cae48dff1ece7c3c"; + sha256 = "07c8vanc31wal6aw8v0s499l7ifrgvdvi2sx4ln3nyha5ngxinld"; + }; + "tools/swarming_client" = fetchgit { + url = "${git_url}/infra/luci/client-py.git"; + rev = "9a518d097dca20b7b00ce3bdfc5d418ccc79893a"; + sha256 = "1d8nly7rp24gx7q0m01jvsc15nw5fahayfczwd40gzzzkmvhjazi"; }; }; @@ -96,7 +116,7 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "6.2.414.27"; + version = "6.9.427.14"; inherit doCheck; @@ -104,7 +124,7 @@ stdenv.mkDerivation rec { owner = "v8"; repo = "v8"; rev = version; - sha256 = "15zrb9bcpnhljhrilqnjaak3a4xnhj8li6ra12g3gkrw3fzir9a2"; + sha256 = "13d50iz87qh7v8l8kjky8wqs9rvz02pgw74q8crqi5ywnvvill1x"; }; postUnpack = '' @@ -133,11 +153,13 @@ stdenv.mkDerivation rec { configurePhase = '' tools/dev/v8gen.py -vv ${arch}.release -- \ - is_component_build=true \ - ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false" } \ - is_clang=false \ - linux_use_bundled_binutils=false \ - treat_warnings_as_errors=false + is_component_build=true \ + ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \ + is_clang=false \ + linux_use_bundled_binutils=false \ + treat_warnings_as_errors=false \ + use_custom_libcxx=false \ + use_custom_libcxx_for_host=false ''; nativeBuildInputs = [ gn ninja pkgconfig ]; From 899b7663b0ce22676884989cefdcff668cd20250 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Wed, 12 Sep 2018 21:35:16 +0200 Subject: [PATCH 029/992] masterpdfeditor: 5.1.12 -> 5.1.36 --- pkgs/applications/misc/masterpdfeditor/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 3155ab678d86..c5a125e95adf 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook }: +{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }: let - version = "5.1.12"; + version = "5.1.36"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "1i3pdrhnlj06phm36gs42s6b94pigcfb8wa5dhmplxn0dqp434hq"; + sha256 = "10kydjg9qi6kvzn7ny5nk4xn2fsm47anq3al89hq97ppm9dlvh48"; }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ]; dontStrip = true; + postInstall = '' + wrapProgram $out/bin/masterpdfeditor5 --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins + ''; + installPhase = '' runHook preInstall From 9624b748d1fb06ff35d21f27c61f392381244c8f Mon Sep 17 00:00:00 2001 From: haslersn Date: Thu, 13 Sep 2018 21:23:58 +0200 Subject: [PATCH 030/992] maintainers: add 'haslersn' --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 837c4f46dee2..512439196170 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1610,6 +1610,11 @@ github = "hamhut1066"; name = "Hamish Hutchings"; }; + haslersn = { + email = "haslersn@fius.informatik.uni-stuttgart.de"; + github = "haslersn"; + name = "Sebastian Hasler"; + }; havvy = { email = "ryan.havvy@gmail.com"; github = "havvy"; From ceb0d1a5658c1c27b48ef52504809f78cef70e79 Mon Sep 17 00:00:00 2001 From: haslersn Date: Thu, 13 Sep 2018 23:15:54 +0200 Subject: [PATCH 031/992] any-nix-shell: init at 1.1.0 --- pkgs/shells/any-nix-shell/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/shells/any-nix-shell/default.nix diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix new file mode 100644 index 000000000000..21f40858ea28 --- /dev/null +++ b/pkgs/shells/any-nix-shell/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + name = "any-nix-shell-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "haslersn"; + repo = "any-nix-shell"; + rev = "v${version}"; + sha256 = "02cv86csk1m8nlh2idvh7bjw43lpssmdawya2jhr4bam2606yzdv"; + }; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + cp -r bin $out + wrapProgram $out/bin/any-nix-shell --prefix PATH ":" $out/bin + ''; + + meta = with stdenv.lib; { + description = "fish and zsh support for nix-shell"; + license = licenses.mit; + homepage = https://github.com/haslersn/any-nix-shell; + maintainers = with maintainers; [ haslersn ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e29c2db3577c..7c066fedcd8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6243,6 +6243,8 @@ with pkgs; runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}"; runtimeShellPackage = bash; + any-nix-shell = callPackage ../shells/any-nix-shell { }; + bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed From 7e0f7a0b54d8c485cca0fed83357dceb1bbbabf9 Mon Sep 17 00:00:00 2001 From: TG x <*@tg-x.net> Date: Tue, 18 Sep 2018 10:38:59 +0200 Subject: [PATCH 032/992] build-idris-package: ipkgName --- pkgs/development/idris-modules/bi.nix | 1 + pkgs/development/idris-modules/bifunctors.nix | 4 --- .../idris-modules/build-idris-package.nix | 25 +++++++++++++------ pkgs/development/idris-modules/canvas.nix | 2 ++ pkgs/development/idris-modules/coda.nix | 2 ++ pkgs/development/idris-modules/containers.nix | 4 --- pkgs/development/idris-modules/electron.nix | 5 ---- pkgs/development/idris-modules/free.nix | 2 ++ pkgs/development/idris-modules/hamt.nix | 2 +- pkgs/development/idris-modules/hrtime.nix | 1 + .../idris-modules/idrishighlighter.nix | 1 + .../development/idris-modules/jheiling-js.nix | 1 + pkgs/development/idris-modules/mhd.nix | 1 + pkgs/development/idris-modules/patricia.nix | 4 --- .../idris-modules/permutations.nix | 4 --- .../idris-modules/recursion_schemes.nix | 4 --- pkgs/development/idris-modules/refined.nix | 6 ++--- pkgs/development/idris-modules/snippets.nix | 1 + pkgs/development/idris-modules/tap.nix | 5 +--- pkgs/development/idris-modules/tparsec.nix | 2 ++ pkgs/development/idris-modules/vdom.nix | 2 ++ pkgs/development/idris-modules/yaml.nix | 1 + pkgs/development/idris-modules/yampa.nix | 1 + 23 files changed, 40 insertions(+), 41 deletions(-) diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix index d16d9b2245d6..844ce98cd4c3 100644 --- a/pkgs/development/idris-modules/bi.nix +++ b/pkgs/development/idris-modules/bi.nix @@ -8,6 +8,7 @@ build-idris-package { name = "bi"; version = "2018-06-25"; + ipkgName = "Bi"; idrisDeps = [ contrib pruviloj ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix index 53b4fb0a004f..3a915cd67f41 100644 --- a/pkgs/development/idris-modules/bifunctors.nix +++ b/pkgs/development/idris-modules/bifunctors.nix @@ -13,10 +13,6 @@ build-idris-package { sha256 = "0cfp58lhm2g0g1vrpb0mh71qb44n2yvg5sil9ndyf2sqd5ria6yq"; }; - postUnpack = '' - rm source/test.ipkg - ''; - meta = { description = "A small bifunctor library for idris"; homepage = https://github.com/japesinator/Idris-Bifunctors; diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 3ed1404fef7c..5e1288685a7e 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -5,6 +5,7 @@ , noBase ? false , name , version + , ipkgName ? name , extraBuildInputs ? [] , ... }@attrs: @@ -13,7 +14,10 @@ let ++ lib.optional (!noPrelude) idrisPackages.prelude ++ lib.optional (!noBase) idrisPackages.base; idris-with-packages = idrisPackages.with-packages allIdrisDeps; - newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "extraBuildInputs" "name" "version" ] // { + newAttrs = builtins.removeAttrs attrs [ + "idrisDeps" "noPrelude" "noBase" + "name" "version" "ipkgName" "extraBuildInputs" + ] // { meta = attrs.meta // { platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms; }; @@ -29,22 +33,29 @@ stdenv.mkDerivation ({ # opts = -i ../../path/to/package # rather than the declarative pkgs attribute so we have to rewrite the path. postPatch = '' - sed -i *.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g" + runHook prePatch + sed -i ${ipkgName}.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g" ''; buildPhase = '' - idris --build *.ipkg + runHook preBuild + idris --build ${ipkgName}.ipkg + runHook postBuild ''; checkPhase = '' - if grep -q test *.ipkg; then - idris --testpkg *.ipkg + runHook preCheck + if grep -q tests ${ipkgName}.ipkg; then + idris --testpkg ${ipkgName}.ipkg fi + runHook postCheck ''; installPhase = '' - idris --install *.ipkg --ibcsubdir $out/libs - IDRIS_DOC_PATH=$out/doc idris --installdoc *.ipkg || true + runHook preInstall + idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs + IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg || true + runHook postInstall ''; } // newAttrs) diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix index 72e5e3f5be7e..0f6e258ee202 100644 --- a/pkgs/development/idris-modules/canvas.nix +++ b/pkgs/development/idris-modules/canvas.nix @@ -6,6 +6,8 @@ build-idris-package { name = "canvas"; version = "2017-11-09"; + ipkgName = "idriscanvas"; + src = fetchFromGitHub { owner = "JinWuZhao"; repo = "idriscanvas"; diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix index 7dbd12110888..c5e33f4594f2 100644 --- a/pkgs/development/idris-modules/coda.nix +++ b/pkgs/development/idris-modules/coda.nix @@ -6,6 +6,8 @@ build-idris-package { name = "coda"; version = "2018-01-25"; + ipkgName = "Coda"; + src = fetchFromGitHub { owner = "ostera"; repo = "idris-coda"; diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix index c12ea54f5f9f..2fe783da4486 100644 --- a/pkgs/development/idris-modules/containers.nix +++ b/pkgs/development/idris-modules/containers.nix @@ -17,10 +17,6 @@ build-idris-package { sha256 = "0vyjadd9sb8qcbzvzhnqwc8wa7ma770c10xhn96jsqsnzr81k52d"; }; - postUnpack = '' - rm source/containers-travis.ipkg - ''; - meta = { description = "Various data structures for use in the Idris Language."; homepage = https://github.com/jfdm/idris-containers; diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix index 3989b8f41135..8b968c9732ab 100644 --- a/pkgs/development/idris-modules/electron.nix +++ b/pkgs/development/idris-modules/electron.nix @@ -18,11 +18,6 @@ build-idris-package { sha256 = "1rpa7yjvfpzl06h0qbk54jd2n52nmgpf7nq5aamcinqh7h5gbiwn"; }; - postUnpack = '' - rm source/example_main.ipkg - rm source/example_view.ipkg - ''; - meta = { description = "Electron bindings for Idris"; homepage = https://github.com/jheiling/idris-electron; diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix index 8e979ea796ec..06b8ec5e82d2 100644 --- a/pkgs/development/idris-modules/free.nix +++ b/pkgs/development/idris-modules/free.nix @@ -6,6 +6,8 @@ build-idris-package { name = "free"; version = "2017-07-03"; + ipkgName = "idris-free"; + src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-free"; diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix index 17706d1b0969..79df925323ed 100644 --- a/pkgs/development/idris-modules/hamt.nix +++ b/pkgs/development/idris-modules/hamt.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "idris-hamt"; + name = "hamt"; version = "2016-11-15"; idrisDeps = [ contrib effects ]; diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix index 09fabb6715db..9e9736d25661 100644 --- a/pkgs/development/idris-modules/hrtime.nix +++ b/pkgs/development/idris-modules/hrtime.nix @@ -7,6 +7,7 @@ build-idris-package { name = "hrtime"; version = "2017-04-16"; + ipkgName = "hrTime"; idrisDeps = [ idrisscript ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix index d8b469ca7689..5629221d601b 100644 --- a/pkgs/development/idris-modules/idrishighlighter.nix +++ b/pkgs/development/idris-modules/idrishighlighter.nix @@ -8,6 +8,7 @@ build-idris-package { name = "idrishighlighter"; version = "2018-02-22"; + ipkgName = "idris-code-highlighter"; idrisDeps = [ effects lightyear ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix index 2281e4821f7a..dae310cda053 100644 --- a/pkgs/development/idris-modules/jheiling-js.nix +++ b/pkgs/development/idris-modules/jheiling-js.nix @@ -8,6 +8,7 @@ build-idris-package { name = "jheiling-js"; version = "2016-03-09"; + ipkgName = "js"; idrisDeps = [ contrib jheiling-extras ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix index 9f4af7cc3b85..197cb1552cbd 100644 --- a/pkgs/development/idris-modules/mhd.nix +++ b/pkgs/development/idris-modules/mhd.nix @@ -9,6 +9,7 @@ build-idris-package { name = "mhd"; version = "2016-04-22"; + ipkgName = "MHD"; idrisDeps = [ contrib effects ]; extraBuildInputs = [ libmicrohttpd ]; diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix index 9ba8c6bb2d4d..5ce9ad7e915d 100644 --- a/pkgs/development/idris-modules/patricia.nix +++ b/pkgs/development/idris-modules/patricia.nix @@ -16,10 +16,6 @@ build-idris-package { sha256 = "093q3qjmr93wv8pqwk0zfm3hzf14c235k9c9ip53rhg6yzcm0yqz"; }; - postUnpack = '' - rm source/patricia-nix.ipkg - ''; - meta = { description = "Immutable map from integer keys to values based on patricia tree. Basically persistent array."; homepage = https://github.com/ChShersh/idris-patricia; diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix index 8bcb67fa759a..21b81f4a95c5 100644 --- a/pkgs/development/idris-modules/permutations.nix +++ b/pkgs/development/idris-modules/permutations.nix @@ -13,10 +13,6 @@ build-idris-package { sha256 = "1dirzqy40fczbw7gp2jr51lzqsnq5vcx9z5l6194lcrq2vxgzv1s"; }; - postUnpack = '' - rm source/test.ipkg - ''; - meta = { description = "Type-safe way of working with permutations in Idris"; homepage = https://github.com/vmchale/permutations; diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix index 78f3674aeabd..dab6913ee8bc 100644 --- a/pkgs/development/idris-modules/recursion_schemes.nix +++ b/pkgs/development/idris-modules/recursion_schemes.nix @@ -20,10 +20,6 @@ build-idris-package { sha256 = "0rbx0yqa0fb7h7qfsvqvirc5q85z51rcwbivn6351jgn3a0inmhf"; }; - postUnpack = '' - rm source/test.ipkg - ''; - meta = { description = "Recursion schemes for Idris"; homepage = https://github.com/vmchale/recursion_schemes; diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix index 00252b6a7cd6..433fdf647697 100644 --- a/pkgs/development/idris-modules/refined.nix +++ b/pkgs/development/idris-modules/refined.nix @@ -6,6 +6,8 @@ build-idris-package { name = "refined"; version = "2017-12-28"; + ipkgName = "idris-refined"; + src = fetchFromGitHub { owner = "janschultecom"; repo = "idris-refined"; @@ -13,10 +15,6 @@ build-idris-package { sha256 = "1am7kfc51p2zlml954v8cl9xvx0g0f1caq7ni3z36xvsd7fh47yh"; }; - postUnpack = '' - rm source/idris-refined-test.ipkg - ''; - meta = { description = "Port of Scala/Haskell Refined library to Idris"; homepage = https://github.com/janschultecom/idris-refined; diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix index c8d993ccb8a2..6d752fed0f98 100644 --- a/pkgs/development/idris-modules/snippets.nix +++ b/pkgs/development/idris-modules/snippets.nix @@ -7,6 +7,7 @@ build-idris-package { name = "snippets"; version = "2018-03-17"; + ipkgName = "idris-snippets"; idrisDeps = [ contrib ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix index 7f80a1ce3c50..98f4b4ea4d63 100644 --- a/pkgs/development/idris-modules/tap.nix +++ b/pkgs/development/idris-modules/tap.nix @@ -7,6 +7,7 @@ build-idris-package { name = "tap"; version = "2017-04-08"; + ipkgName = "TAP"; idrisDeps = [ contrib ]; src = fetchFromGitHub { @@ -16,10 +17,6 @@ build-idris-package { sha256 = "0fhlmmivq9xv89r7plrnhmvay1j7bapz3wh7y8lygwvcrllh9zxs"; }; - postUnpack = '' - rm source/Draft.ipkg - ''; - meta = { description = "A simple TAP producer and consumer/reporter for Idris"; homepage = https://github.com/ostera/tap-idris; diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index bd895a33bae3..00d4adba5dc8 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -6,6 +6,8 @@ build-idris-package { name = "tparsec"; version = "2018-06-26"; + ipkgName = "TParsec"; + src = fetchFromGitHub { owner = "gallais"; repo = "idris-tparsec"; diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix index 7f1ecb61c8ec..f6fdaf7a75e2 100644 --- a/pkgs/development/idris-modules/vdom.nix +++ b/pkgs/development/idris-modules/vdom.nix @@ -6,6 +6,8 @@ build-idris-package { name = "vdom"; version = "0.6.0"; + ipkgName = "idris-vdom"; + src = fetchFromGitHub { owner = "brandondyck"; repo = "idris-vdom"; diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix index ec689ce4805a..61efb8cd575e 100644 --- a/pkgs/development/idris-modules/yaml.nix +++ b/pkgs/development/idris-modules/yaml.nix @@ -8,6 +8,7 @@ build-idris-package { name = "yaml"; version = "2018-01-25"; + ipkgName = "Yaml"; idrisDeps = [ contrib lightyear ]; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix index 0231555b4ad6..ebe92f468982 100644 --- a/pkgs/development/idris-modules/yampa.nix +++ b/pkgs/development/idris-modules/yampa.nix @@ -7,6 +7,7 @@ build-idris-package { name = "yampa"; version = "2016-07-05"; + ipkgName = "idris-yampa"; idrisDeps = [ bifunctors ]; src = fetchFromGitHub { From aaa3e3f0b430afd8d0fb1f2ab4e17cdd12135fd2 Mon Sep 17 00:00:00 2001 From: Assassinkin Date: Wed, 19 Sep 2018 16:14:37 +0100 Subject: [PATCH 033/992] pythonPackages.osmnx: init at 0.8.2 --- .../python-modules/osmnx/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100755 pkgs/development/python-modules/osmnx/default.nix diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix new file mode 100755 index 000000000000..c34b75bd0415 --- /dev/null +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy +, pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}: + +buildPythonPackage rec { + pname = "osmnx"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "gboeing"; + repo = pname; + rev = "v${version}"; + sha256 = "1pn2v3dhbmb0yhqif9padg7x3sdx27pgfr95i3kxj4v0yrviaf9k"; + }; + + propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; + + checkInputs = [ coverage pytest coveralls ]; + #Fails when using sandboxing as it requires internet connection, works fine without it + doCheck = false; + + #Check phase for the record + #checkPhase = '' + # coverage run --source osmnx -m pytest --verbose + #''; + + meta = with stdenv.lib; { + description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; + homepage = https://github.com/gboeing/osmnx; + license = licenses.mit; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 157f45f3f2a9..66625c85a70d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -368,6 +368,8 @@ in { ordered-set = callPackage ../development/python-modules/ordered-set { }; + osmnx = callPackage ../development/python-modules/osmnx { }; + outcome = callPackage ../development/python-modules/outcome {}; palettable = callPackage ../development/python-modules/palettable { }; From f2b3b13876e5c1e4f3c57b7b10c172baf1ae2be9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 02:21:40 -0700 Subject: [PATCH 034/992] vips: 8.6.5 -> 8.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vips/versions --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index e2688e930cf6..735d2565b045 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "vips-${version}"; - version = "8.6.5"; + version = "8.7.0"; src = fetchurl { url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1nymm4vzscb68aifin9q742ff64b4k4ddppq1060w8hf6h7ay0l7"; + sha256 = "16086hdg6m44llz69fkp1n0ckjb7zhl6i2bg0wwllrchznikwiy4"; }; nativeBuildInputs = [ pkgconfig ]; From 43f32d2fb83763cf9ac89ee053340dafa2131158 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 09:19:16 -0700 Subject: [PATCH 035/992] altcoins.litecoin: 0.16.0 -> 0.16.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/litecoin/versions --- pkgs/applications/altcoins/litecoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index ed268e34946f..447ccca93792 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/pkgs/applications/altcoins/litecoin.nix @@ -11,13 +11,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "litecoin-project"; repo = "litecoin"; rev = "v${version}"; - sha256 = "1g79sbplkn2bnb17i2kyh1d64bjl3ihbx83n0xssvjaajn56hbzw"; + sha256 = "0xfwh7cxxz6w8kgr4kl48w3zm81n1hv8fxb5l9zx3460im1ffgy6"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From fd7bf0460d12dc06a144e2d0e200a31fe15eccff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 13:54:53 -0700 Subject: [PATCH 036/992] fwupd: 1.1.1 -> 1.1.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fwupd/versions --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index e29dd2e6ee53..eabb27f6ae2f 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -7,7 +7,7 @@ }: let # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc - version = "1.1.1"; + version = "1.1.2"; python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]); installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]); @@ -18,7 +18,7 @@ in stdenv.mkDerivation { name = "fwupd-${version}"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "0szakfnp6pl8vv3ivb40p5j8pxapfp724a55s2dr1qzzdlbjd08s"; + sha256 = "1qhg8h1dv9k3i0429j0wl37rpxfbahggfd1j8s7a4cw83k42cgfs"; }; outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; From 98a4afc505647658f41f3d1c2c0a1b35b0ddf3bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 14:29:34 -0700 Subject: [PATCH 037/992] geos: 3.6.3 -> 3.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/geos/versions --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index c1b4c88aa479..2417af3dbfd8 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.6.3"; + name = "geos-3.7.0"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "0jrypv61rbyp7vi9qpnnaiigjj8cgdqvyk8ymik8h1ppcw5am7mb"; + sha256 = "1mrz778m6bd1x9k6sha5kld43kalhq79h2lynlx2jx7xjakl3gsg"; }; enableParallelBuilding = true; From 6974f982451752b269e814ed5ff114ad4a096020 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 20 Sep 2018 20:58:14 -0500 Subject: [PATCH 038/992] netbsd 7.1.2 -> 8.0 --- pkgs/os-specific/bsd/netbsd/default.nix | 76 ++++++++++++------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 2d1909547b61..e4d9fbea1e3b 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -133,7 +133,7 @@ let makeMinimal = netBSDDerivation rec { path = "tools/make"; sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb"; - version = "7.1.2"; + version = "8.0"; buildInputs = []; nativeBuildInputs = []; @@ -165,7 +165,7 @@ let compat = netBSDDerivation rec { path = "tools/compat"; sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z"; - version = "7.1.2"; + version = "8.0"; setupHooks = [ ../../../build-support/setup-hooks/role.bash @@ -222,9 +222,9 @@ let find $out -type d -empty -delete ''; extraPaths = [ libc.src libutil.src - (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp") - (fetchNetBSD "external/bsd/flex" "7.1.2" "0m0m72r3zzc9gi432h3xkqdzspr4n0hj4m8h7j74pwbvpfg9d9qq") - (fetchNetBSD "sys/sys" "7.1.2" "1vwnv5nk7rlgn5w9nkdqj9652hmwmfwqxj3ymcz0zk10abbaib93") + (fetchNetBSD "include" "8.0" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp") + (fetchNetBSD "external/bsd/flex" "8.0" "0m0m72r3zzc9gi432h3xkqdzspr4n0hj4m8h7j74pwbvpfg9d9qq") + (fetchNetBSD "sys/sys" "8.0" "1vwnv5nk7rlgn5w9nkdqj9652hmwmfwqxj3ymcz0zk10abbaib93") ] ++ libutil.extraPaths ++ libc.extraPaths; }; @@ -237,7 +237,7 @@ let xinstall "$@" ''; in netBSDDerivation { path = "usr.bin/xinstall"; - version = "7.1.2"; + version = "8.0"; sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8"; extraPaths = [ mtree.src make.src ]; nativeBuildInputs = [ makeMinimal mandoc groff ]; @@ -258,13 +258,13 @@ let pname = "fts"; path = "include/fts.h"; sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; - version = "7.1.2"; + version = "8.0"; nativeBuildInputs = [ ]; propagatedBuildInputs = [ compat ]; extraPaths = [ - (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") - (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") - (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") + (fetchNetBSD "lib/libc/gen/fts.c" "8.0" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") + (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") + (fetchNetBSD "lib/libc/gen/fts.3" "8.0" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") ]; buildPhase = '' cc -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \ @@ -289,21 +289,21 @@ let stat = netBSDDerivation { path = "usr.bin/stat"; - version = "7.1.2"; + version = "8.0"; sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh"; nativeBuildInputs = [ makeMinimal mandoc groff install ]; }; tsort = netBSDDerivation { path = "usr.bin/tsort"; - version = "7.1.2"; + version = "8.0"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; nativeBuildInputs = [ makeMinimal mandoc groff install ]; }; lorder = netBSDDerivation { path = "usr.bin/lorder"; - version = "7.1.2"; + version = "8.0"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = [ makeMinimal mandoc groff install ]; }; @@ -313,26 +313,26 @@ let libutil = netBSDDerivation { path = "lib/libutil"; - version = "7.1.2"; + version = "8.0"; sha256 = "12848ynizz13mvn2kndrkq482xhkw323b7c8fg0zli1nhfsmwsm8"; extraPaths = [ - (fetchNetBSD "common/lib/libutil" "7.1.2" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") + (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") ]; }; libc = netBSDDerivation { path = "lib/libc"; - version = "7.1.2"; + version = "8.0"; sha256 = "13rcx3mbx2644z01zgk9gggdfr0hqdbsvd7zrsm2l13yf9aix6pg"; extraPaths = [ - (fetchNetBSD "common/lib/libc" "7.1.2" "1va8zd4lqyrc1d0c9q04r8y88cfxpkhwcxasggxxvhksd3khkpha") + (fetchNetBSD "common/lib/libc" "8.0" "1va8zd4lqyrc1d0c9q04r8y88cfxpkhwcxasggxxvhksd3khkpha") ]; }; make = netBSDDerivation { path = "usr.bin/make"; sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar"; - version = "7.1.2"; + version = "8.0"; postPatch = '' # make needs this to pick up our sys make files export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" @@ -358,19 +358,19 @@ let (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install) ''; extraPaths = [ - (fetchNetBSD "share/mk" "7.1.2" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa") + (fetchNetBSD "share/mk" "8.0" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa") ]; }; mtree = netBSDDerivation { path = "usr.sbin/mtree"; - version = "7.1.2"; + version = "8.0"; sha256 = "1dhsyfvcm67kf5zdbg5dmx5y8fimnbll6qxwp3gjfmbxqigmc52m"; }; who = netBSDDerivation { path = "usr.bin/who"; - version = "7.1.2"; + version = "8.0"; sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ @@ -393,19 +393,19 @@ in rec { getent = netBSDDerivation { path = "usr.bin/getent"; sha256 = "1ylhw4dnpyrmcy8n5kjcxywm8qc9p124dqnm17x4magiqx1kh9iz"; - version = "7.1.2"; + version = "8.0"; patches = [ ./getent.patch ]; }; getconf = netBSDDerivation { path = "usr.bin/getconf"; sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; - version = "7.1.2"; + version = "8.0"; }; dict = netBSDDerivation { path = "share/dict"; - version = "7.1.2"; + version = "8.0"; sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; makeFlags = [ "BINDIR=/share" ]; }; @@ -413,7 +413,7 @@ in rec { games = netBSDDerivation { path = "games"; sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; - version = "7.1.2"; + version = "8.0"; makeFlags = [ "BINDIR=/bin" "SCRIPTSDIR=/bin" ]; postPatch = '' @@ -491,7 +491,7 @@ in rec { finger = netBSDDerivation { path = "usr.bin/finger"; sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; - version = "7.1.2"; + version = "8.0"; NIX_CFLAGS_COMPILE = [ (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP") (if stdenv.isDarwin then "-DSUPPORT_UTMPX" else "-USUPPORT_UTMPX") @@ -505,13 +505,13 @@ in rec { ${who.postPatch} ''; extraPaths = [ who.src ] - ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "7.1.2" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px"); + ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "8.0" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px"); }; fingerd = netBSDDerivation { path = "libexec/fingerd"; sha256 = "1hhdq70hrxxkjnjfmjm3w8w9g9xq2ngxaxk0chy4vm7chg9nfpmp"; - version = "7.1.2"; + version = "8.0"; }; libedit = netBSDDerivation { @@ -529,13 +529,13 @@ in rec { "-D__scanflike(a,b)=" "-D__va_list=va_list" ]; - version = "7.1.2"; + version = "8.0"; sha256 = "0qvr52j4qih10m7fa8nddn1psyjy9l0pa4ix02acyssjvgbz2kca"; }; libterminfo = netBSDDerivation { path = "lib/libterminfo"; - version = "7.1.2"; + version = "8.0"; sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; buildInputs = [ compat tic nbperf ]; MKPIC = if stdenv.isDarwin then "no" else "yes"; @@ -547,13 +547,13 @@ in rec { (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install) ''; extraPaths = [ - (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") + (fetchNetBSD "share/terminfo" "8.0" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") ]; }; libcurses = netBSDDerivation { path = "lib/libcurses"; - version = "7.1.2"; + version = "8.0"; sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; buildInputs = [ libterminfo ]; makeFlags = [ "INCSDIR=/include" ]; @@ -576,33 +576,33 @@ in rec { nbperf = netBSDDerivation { path = "usr.bin/nbperf"; - version = "7.1.2"; + version = "8.0"; sha256 = "0gzm0zv2400lasnsswnjw9bwzyizhxzdbrcjwcl1k65aj86aqyqb"; }; tic = netBSDDerivation { path = "tools/tic"; - version = "7.1.2"; + version = "8.0"; sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; HOSTPROG = "tic"; buildInputs = [ compat nbperf ]; extraPaths = [ libterminfo.src - (fetchNetBSD "usr.bin/tic" "7.1.2" "1ghwsaag4gbwvgp3lfxscnh8hn27n8cscwmgjwp3bkx5vl85nfsa") - (fetchNetBSD "tools/Makefile.host" "7.1.2" "076r3amivb6xranpvqjmg7x5ibj4cbxaa3z2w1fh47h7d55dw9w8") + (fetchNetBSD "usr.bin/tic" "8.0" "1ghwsaag4gbwvgp3lfxscnh8hn27n8cscwmgjwp3bkx5vl85nfsa") + (fetchNetBSD "tools/Makefile.host" "8.0" "076r3amivb6xranpvqjmg7x5ibj4cbxaa3z2w1fh47h7d55dw9w8") ]; }; misc = netBSDDerivation { path = "share/misc"; - version = "7.1.2"; + version = "8.0"; sha256 = "1vyn30js14nnadlls55mg7g1gz8h14l75rbrrh8lgn49qg289665"; makeFlags = [ "BINDIR=/share" ]; }; locale = netBSDDerivation { path = "usr.bin/locale"; - version = "7.1.2"; + version = "8.0"; sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; patches = [ ./locale.patch ]; }; From 8517039fb96ae2debbe37e8d85c80e4c55cdf288 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 20 Sep 2018 21:11:12 -0500 Subject: [PATCH 039/992] netbsd: hashes --- pkgs/os-specific/bsd/netbsd/default.nix | 54 ++++++++++++------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index e4d9fbea1e3b..50f4416ade89 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -132,7 +132,7 @@ let ## makeMinimal = netBSDDerivation rec { path = "tools/make"; - sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb"; + sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1"; version = "8.0"; buildInputs = []; @@ -164,7 +164,7 @@ let compat = netBSDDerivation rec { path = "tools/compat"; - sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z"; + sha256 = "050449lq5gpxqsripdqip5ks49g5ypjga188nd3ss8dg1zf7ydz3"; version = "8.0"; setupHooks = [ @@ -222,9 +222,9 @@ let find $out -type d -empty -delete ''; extraPaths = [ libc.src libutil.src - (fetchNetBSD "include" "8.0" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp") - (fetchNetBSD "external/bsd/flex" "8.0" "0m0m72r3zzc9gi432h3xkqdzspr4n0hj4m8h7j74pwbvpfg9d9qq") - (fetchNetBSD "sys/sys" "8.0" "1vwnv5nk7rlgn5w9nkdqj9652hmwmfwqxj3ymcz0zk10abbaib93") + (fetchNetBSD "include" "8.0" "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq") + (fetchNetBSD "external/bsd/flex" "8.0" "0yxcjshz9nj827qhmjwwjmzvmmqgaf0d25b42k7lj84vliwrgyr6") + (fetchNetBSD "sys/sys" "8.0" "0b0yjjy0c0cvk5nyffppqwxlwh2s1qr2xzl97a9ldck00dibar94") ] ++ libutil.extraPaths ++ libc.extraPaths; }; @@ -238,7 +238,7 @@ let ''; in netBSDDerivation { path = "usr.bin/xinstall"; version = "8.0"; - sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8"; + sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = [ mtree.src make.src ]; nativeBuildInputs = [ makeMinimal mandoc groff ]; buildInputs = [ compat fts ]; @@ -262,8 +262,8 @@ let nativeBuildInputs = [ ]; propagatedBuildInputs = [ compat ]; extraPaths = [ - (fetchNetBSD "lib/libc/gen/fts.c" "8.0" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9") - (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y") + (fetchNetBSD "lib/libc/gen/fts.c" "8.0" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") + (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "1sjvh9nw3prnk4rmdwrfsxh6gdb9lmilkn46jcfh3q5c8glqzrd7") (fetchNetBSD "lib/libc/gen/fts.3" "8.0" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") ]; buildPhase = '' @@ -314,7 +314,7 @@ let libutil = netBSDDerivation { path = "lib/libutil"; version = "8.0"; - sha256 = "12848ynizz13mvn2kndrkq482xhkw323b7c8fg0zli1nhfsmwsm8"; + sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; extraPaths = [ (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") ]; @@ -323,15 +323,15 @@ let libc = netBSDDerivation { path = "lib/libc"; version = "8.0"; - sha256 = "13rcx3mbx2644z01zgk9gggdfr0hqdbsvd7zrsm2l13yf9aix6pg"; + sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; extraPaths = [ - (fetchNetBSD "common/lib/libc" "8.0" "1va8zd4lqyrc1d0c9q04r8y88cfxpkhwcxasggxxvhksd3khkpha") + (fetchNetBSD "common/lib/libc" "8.0" "1kbhj0vxixvdy9fvsr5y70ri4mlkmim1v9m98sqjlzc1vdiqfqc8") ]; }; make = netBSDDerivation { path = "usr.bin/make"; - sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar"; + sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c"; version = "8.0"; postPatch = '' # make needs this to pick up our sys make files @@ -358,20 +358,20 @@ let (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install) ''; extraPaths = [ - (fetchNetBSD "share/mk" "8.0" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa") + (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") ]; }; mtree = netBSDDerivation { path = "usr.sbin/mtree"; version = "8.0"; - sha256 = "1dhsyfvcm67kf5zdbg5dmx5y8fimnbll6qxwp3gjfmbxqigmc52m"; + sha256 = "0hanmzm8bgwz2bhsinmsgfmgy6nbdhprwmgwbyjm6bl17vgn7vid"; }; who = netBSDDerivation { path = "usr.bin/who"; version = "8.0"; - sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88"; + sha256 = "0ll76rbblps9hqmncxvw5qx0hhwfz678g70vgfyng8ahxz27rhd9"; postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \ @@ -406,13 +406,13 @@ in rec { dict = netBSDDerivation { path = "share/dict"; version = "8.0"; - sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4"; + sha256 = "1pk0y3xc5ihc2k89wjkh33qqx3w9q34k03k2qcffvbqh1l6wm36l"; makeFlags = [ "BINDIR=/share" ]; }; games = netBSDDerivation { path = "games"; - sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1"; + sha256 = "1vb4ahmiywgd3q3lzwb34mdd7agdlhsmw077alddkqinvyyxq1jz"; version = "8.0"; makeFlags = [ "BINDIR=/bin" "SCRIPTSDIR=/bin" ]; @@ -490,7 +490,7 @@ in rec { finger = netBSDDerivation { path = "usr.bin/finger"; - sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; + sha256 = "1mbxjdzcbx7xsbn3x1qm1cd0kna07yh61wqxmrrphjhl5gv13ra3"; version = "8.0"; NIX_CFLAGS_COMPILE = [ (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP") @@ -505,12 +505,12 @@ in rec { ${who.postPatch} ''; extraPaths = [ who.src ] - ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "8.0" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px"); + ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "8.0" "05690fzz0825p2bq0sfyb01mxwd0wa06qryqgqkwpqk9y2xzc7px"); }; fingerd = netBSDDerivation { path = "libexec/fingerd"; - sha256 = "1hhdq70hrxxkjnjfmjm3w8w9g9xq2ngxaxk0chy4vm7chg9nfpmp"; + sha256 = "0blcahhgyj1lm0mimrbvgmq3wkjvqk5wy85sdvbs99zxg7da1190"; version = "8.0"; }; @@ -530,13 +530,13 @@ in rec { "-D__va_list=va_list" ]; version = "8.0"; - sha256 = "0qvr52j4qih10m7fa8nddn1psyjy9l0pa4ix02acyssjvgbz2kca"; + sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; }; libterminfo = netBSDDerivation { path = "lib/libterminfo"; version = "8.0"; - sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq"; + sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r"; buildInputs = [ compat tic nbperf ]; MKPIC = if stdenv.isDarwin then "no" else "yes"; makeFlags = [ "INCSDIR=/include" ]; @@ -547,14 +547,14 @@ in rec { (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install) ''; extraPaths = [ - (fetchNetBSD "share/terminfo" "8.0" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3") + (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm") ]; }; libcurses = netBSDDerivation { path = "lib/libcurses"; version = "8.0"; - sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf"; + sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; buildInputs = [ libterminfo ]; makeFlags = [ "INCSDIR=/include" ]; NIX_CFLAGS_COMPILE = [ @@ -588,15 +588,15 @@ in rec { buildInputs = [ compat nbperf ]; extraPaths = [ libterminfo.src - (fetchNetBSD "usr.bin/tic" "8.0" "1ghwsaag4gbwvgp3lfxscnh8hn27n8cscwmgjwp3bkx5vl85nfsa") - (fetchNetBSD "tools/Makefile.host" "8.0" "076r3amivb6xranpvqjmg7x5ibj4cbxaa3z2w1fh47h7d55dw9w8") + (fetchNetBSD "usr.bin/tic" "8.0" "0diirnzmdnpc5bixyb34c9rid9paw2a4zfczqrpqrfvjsf1nnljf") + (fetchNetBSD "tools/Makefile.host" "8.0" "1p23dsc4qrv93vc6gzid9w2479jwswry9qfn88505s0pdd7h6nvp") ]; }; misc = netBSDDerivation { path = "share/misc"; version = "8.0"; - sha256 = "1vyn30js14nnadlls55mg7g1gz8h14l75rbrrh8lgn49qg289665"; + sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch8"; makeFlags = [ "BINDIR=/share" ]; }; From d08ff06d0a207a64c8a7f34c275239bc6d495ffa Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 20 Sep 2018 22:56:45 -0500 Subject: [PATCH 040/992] netbsd.terminfo: break libcurses dep cycle with simple decl of use_env --- pkgs/os-specific/bsd/netbsd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 50f4416ade89..3ef458c1ca9d 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -542,6 +542,8 @@ in rec { makeFlags = [ "INCSDIR=/include" ]; postPatch = '' substituteInPlace term.c --replace /usr/share $out/share + substituteInPlace setupterm.c --replace '#include ' 'void use_env(bool);' + ''; postInstall = '' (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install) From 9e2bd0ddc2046e91c684c2b499614d553c893bf4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 20 Sep 2018 23:00:45 -0500 Subject: [PATCH 041/992] netbsd: there is no /usr/bin/env in the nix sandbox, use /bin/sh --- pkgs/os-specific/bsd/netbsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 3ef458c1ca9d..9c55aa418390 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -231,7 +231,7 @@ let # HACK to ensure parent directories exist. This emulates GNU # install’s -D option. No alternative seems to exist in BSD install. install = let binstall = writeText "binstall" '' - #!/usr/bin/env sh + #!/bin/sh for last in $@; do true; done mkdir -p $(dirname $last) xinstall "$@" From 353d994254ee3da604465e53a89e5718e88b4ecc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 20 Sep 2018 23:20:31 -0500 Subject: [PATCH 042/992] netbsd.libcurses: patch around funopen2 now instead of funopen --- pkgs/os-specific/bsd/netbsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 9c55aa418390..d93e9fb75147 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -569,7 +569,7 @@ in rec { MKPIC = if stdenv.isDarwin then "no" else "yes"; postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace printw.c \ - --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ + --replace "funopen2(win, NULL, winwrite, NULL, NULL, NULL)" NULL \ --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' substituteInPlace scanw.c \ --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' From 6d8647fd36137dc269557af3545ab2a54b569aa0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 21 Sep 2018 06:42:46 -0500 Subject: [PATCH 043/992] netbsd: set HOST_CC/HOST_CXX -- maybe help aarch64 defaulting to clang --- pkgs/os-specific/bsd/netbsd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index d93e9fb75147..3e1d1f01aa0d 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -40,6 +40,9 @@ let INSTALL_LINK = "install -U -l h"; INSTALL_SYMLINK = "install -U -l s"; + HOST_CC = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; + HOST_CXX = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; + # libs will be provided by cc-wrapper LIBCRT0 = ""; LIBCRTI = ""; From 1ce496bfab37bca1619c053db7a535e0ff96eed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Fri, 21 Sep 2018 23:46:30 +0200 Subject: [PATCH 044/992] nixos lircd: fix deletion of lircd socket --- nixos/modules/services/hardware/lirc.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix index a66a7fbf495f..5635d6f09715 100644 --- a/nixos/modules/services/hardware/lirc.nix +++ b/nixos/modules/services/hardware/lirc.nix @@ -65,6 +65,10 @@ in { serviceConfig = { RuntimeDirectory = "lirc"; + + # socket lives in runtime directory; we have to keep is available + RuntimeDirectoryPreserve = true; + ExecStart = '' ${pkgs.lirc}/bin/lircd --nodaemon \ ${escapeShellArgs cfg.extraArguments} \ From 5ebbd44e6d531937e063c01fe43079e0d2535f47 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 3 Sep 2018 14:33:21 +0200 Subject: [PATCH 045/992] systrayhelper: init at 0.0.3 offers a stdio json interface to create menu-items. and send click events back over stdout. --- pkgs/tools/misc/systrayhelper/default.nix | 41 +++++++++ pkgs/tools/misc/systrayhelper/deps.nix | 102 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 145 insertions(+) create mode 100644 pkgs/tools/misc/systrayhelper/default.nix create mode 100644 pkgs/tools/misc/systrayhelper/deps.nix diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix new file mode 100644 index 000000000000..e812d6799fea --- /dev/null +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -0,0 +1,41 @@ +{ stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "systrayhelper-${version}"; + version = "0.0.3"; + rev = "0953942245566bf358ba937af840947100380e15"; + + goPackagePath = "github.com/ssbc/systrayhelper"; + + src = fetchFromGitHub { + inherit rev; + owner = "ssbc"; + repo = "systrayhelper"; + sha256 = "12xmzcw94in4m1hl4hbfdsbvkkaqrljgb67b95m1qwkkjak3q9g6"; + }; + + goDeps = ./deps.nix; + + # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178 + # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time. + buildFlagsArray = [ ''-ldflags= + -X main.version=v${version} + -X main.commit=${rev} + -X main.date="nix-byrev" + -s + -w + '' ]; + + nativeBuildInputs = [ pkgconfig libappindicator-gtk3 ]; + buildInputs = [ libappindicator-gtk3 ]; + + meta = with stdenv.lib; { + description = "A systray utility written in go, using json over stdio for control and events"; + homepage = "https://github.com/ssbc/systrayhelper"; + maintainers = with maintainers; [ cryptix ]; + license = licenses.mit; + # It depends on the inputs, i guess? not sure about solaris, for instance. go supports it though + # I hope nix can figure this out?! ¯\\_(ツ)_/¯ + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/systrayhelper/deps.nix b/pkgs/tools/misc/systrayhelper/deps.nix new file mode 100644 index 000000000000..67ec6662d984 --- /dev/null +++ b/pkgs/tools/misc/systrayhelper/deps.nix @@ -0,0 +1,102 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/getlantern/context"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/context"; + rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775"; + sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b"; + }; + } + { + goPackagePath = "github.com/getlantern/errors"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/errors"; + rev = "e24b7f4ff7c70be59bbefca6b7695d68cda8b399"; + sha256 = "1wshagslgl3r07gniq0g55cqgi1j1gk0yrri5ywjz7wm8da42qcr"; + }; + } + { + goPackagePath = "github.com/getlantern/golog"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/golog"; + rev = "cca714f7feb5df8e455f409b549d384441ac4578"; + sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q"; + }; + } + { + goPackagePath = "github.com/getlantern/hex"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/hex"; + rev = "083fba3033ad473db3dd31c9bb368473d37581a7"; + sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77"; + }; + } + { + goPackagePath = "github.com/getlantern/hidden"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/hidden"; + rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7"; + sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi"; + }; + } + { + goPackagePath = "github.com/getlantern/ops"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/ops"; + rev = "37353306c90844c8e0591956f56611f46299d202"; + sha256 = "0q8j2963jqf3p7fcnsfinkvz71mfylrkk2xjar775zjx5a23sa5i"; + }; + } + { + goPackagePath = "github.com/getlantern/systray"; + fetch = { + type = "git"; + url = "https://github.com/getlantern/systray"; + rev = "3fd1443dac5c8297999189fe28d5836b2b075b66"; + sha256 = "1sb11n27zy8xmq0lvrpqikb53425jvwl5617cp201va6iwk1hgnh"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/oxtoacart/bpool"; + fetch = { + type = "git"; + url = "https://github.com/oxtoacart/bpool"; + rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6"; + sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "c059e472caf75dbe73903f6521a20abac245b17f"; + sha256 = "07xg8ym776j2w0k8445ii82lx8yz358cp1z96r739y13i1anqdzi"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0be0721c37eeb5299f245a996a483160fc36940"; + sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32af34bf70b0..653c34cea9e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5462,6 +5462,8 @@ with pkgs; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; + systrayhelper = callPackage ../tools/misc/systrayhelper {}; + otter-browser = qt5.callPackage ../applications/networking/browsers/otter {}; privoxy = callPackage ../tools/networking/privoxy { From d7c1d04af4085e0ae6fecbffdb0a19299de598e8 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 17 Aug 2018 20:48:40 -0400 Subject: [PATCH 046/992] mkl: init at 2019.0.117 This packags the Intel Math Kernel library on x86-64 platforms, which is a dependency for many data science and machine learning packages. Upstream, Intel provides proprietary binary RPMs with a permissive redistribution license. These have been repackaged in both Debian and Anaconda, so we are not the first distribution to redistribute. --- lib/licenses.nix | 8 +++ .../libraries/science/math/mkl/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 67 insertions(+) create mode 100644 pkgs/development/libraries/science/math/mkl/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index c4db280645a4..64d538df3c90 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -387,6 +387,14 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "ISC License"; }; + # Proprietary binaries; free to redistribute without modification. + issl = { + fullName = "Intel Simplified Software License"; + url = https://software.intel.com/en-us/license/intel-simplified-software-license; + free = false; + }; + + lgpl2 = spdx { spdxId = "LGPL-2.0"; fullName = "GNU Library General Public License v2 only"; diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix new file mode 100644 index 000000000000..7412ecdba21d --- /dev/null +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -0,0 +1,55 @@ +{ stdenvNoCC, writeText, fetchurl, rpm, cpio, openmp }: + +stdenvNoCC.mkDerivation rec { + name = "mkl-${version}"; + version = "${date}.${rel}"; + date = "2019.0"; + rel = "117"; + + src = fetchurl { + url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_${version}.tgz"; + sha256 = "1bf7i54iqlf7x7fn8kqwmi06g30sxr6nq3ac0r871i6g0p3y47sf"; + }; + + buildInputs = [ rpm cpio ]; + propagatedBuildInputs = [ openmp ]; + + buildPhase = '' + rpm2cpio rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm | cpio -idmv + rpm2cpio rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm | cpio -idmv + ''; + + installPhase = '' + mkdir -p $out/lib + cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/ + cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/ + cp license.txt $out/lib/ + ''; + + # Per license agreement, do not modify the binary + dontStrip = true; + dontPatchELF = true; + + # Some mkl calls require openmp, but Intel does not add these to SO_NEEDED and + # instructs users to put openmp on their LD_LIBRARY_PATH. + setupHook = writeText "setup-hook.sh" '' + addOpenmp() { + addToSearchPath LD_LIBRARY_PATH ${openmp}/lib + } + addEnvHooks "$targetOffset" addOpenmp + ''; + + meta = with stdenvNoCC.lib; { + description = "Intel Math Kernel Library"; + longDescription = '' + Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort + for future generations of Intel processors. It is compatible with your + choice of compilers, languages, operating systems, and linking and + threading models. + ''; + homepage = https://software.intel.com/en-us/mkl; + license = licenses.issl; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18ad8892e55f..f9eb92364af2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20858,6 +20858,10 @@ with pkgs; m4rie = callPackage ../development/libraries/science/math/m4rie { }; + mkl = callPackage ../development/libraries/science/math/mkl { + inherit (llvmPackages) openmp; + }; + nasc = callPackage ../applications/science/math/nasc { }; openblas = callPackage ../development/libraries/science/math/openblas { }; From 27420636772da3301d8eed2af417869f7eceac4f Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sun, 23 Sep 2018 22:55:59 +0200 Subject: [PATCH 047/992] nixos/network-interfaces-scripted: fix container networking bug When a bridge interface was reconfigured, running containers using this bridge lost connectivity: restarting network-addresses-brN.service triggered a restart of network-setup.service via a "partOf" relationship introduced in 07e0c0e0a2f237639600f2a0d62f6eac748b1e6e. This in turn restarted brN-netdev.service. The bridge was thus destroyed and recreated with the same name but a new interface id, causing attached veth interfaces to lose their connection. This change removes the "partOf" relationship between network-setup.service and network-addresses-brN.service for all bridges. --- nixos/modules/tasks/network-interfaces-scripted.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index af61c95da0af..93dfefdce902 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -85,7 +85,8 @@ let after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ]; before = [ "network.target" "shutdown.target" ]; wants = [ "network.target" ]; - partOf = map (i: "network-addresses-${i.name}.service") interfaces; + # exclude bridges from the partOf relationship to fix container networking bug #47210 + partOf = map (i: "network-addresses-${i.name}.service") (filter (i: !(hasAttr i.name cfg.bridges)) interfaces); conflicts = [ "shutdown.target" ]; wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target"; From b4323269f57ba5b92d478b72bf7776115ba1437f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 25 Sep 2018 07:40:30 -0500 Subject: [PATCH 048/992] cairo: 1.15.12 -> 1.15.14 --- pkgs/development/libraries/cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index db46412ceb55..7c0664533b8f 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -10,14 +10,14 @@ assert glSupport -> libGL != null; let - version = "1.15.12"; + version = "1.15.14"; inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { name = "cairo-${version}"; src = fetchurl { url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; - sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn"; + sha256 = "1399jfdpdhn4hf812hxlj1gyi3bznxwzhp2rnyq1nxjs05n6nmhn"; }; outputs = [ "out" "dev" "devdoc" ]; From 7047d60ef4a8aa0484ab6f59c594bfacfc054368 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 25 Sep 2018 20:03:46 -0500 Subject: [PATCH 049/992] libXinerama: 1.1.3 -> 1.1.4 https://lists.x.org/archives/xorg-announce/2018-July/002905.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 06dd540a4818..c33997b72c84 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -908,11 +908,11 @@ let }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; libXinerama = (mkDerivation "libXinerama" { - name = "libXinerama-1.1.3"; + name = "libXinerama-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2; - sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"; + url = mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2; + sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xineramaproto ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index ca77e6408149..846fa56de30c 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -73,7 +73,7 @@ mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 -mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 From 3a275ac1eb4ea538222e8b282d9804bab6e6e543 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Wed, 26 Sep 2018 13:35:23 +0200 Subject: [PATCH 050/992] ejson: init at 1.2.0 --- pkgs/development/tools/ejson/Gemfile | 4 + pkgs/development/tools/ejson/Gemfile.lock | 54 +++++++ pkgs/development/tools/ejson/default.nix | 46 ++++++ pkgs/development/tools/ejson/deps.nix | 48 ++++++ pkgs/development/tools/ejson/gemset.nix | 188 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 342 insertions(+) create mode 100644 pkgs/development/tools/ejson/Gemfile create mode 100644 pkgs/development/tools/ejson/Gemfile.lock create mode 100644 pkgs/development/tools/ejson/default.nix create mode 100644 pkgs/development/tools/ejson/deps.nix create mode 100644 pkgs/development/tools/ejson/gemset.nix diff --git a/pkgs/development/tools/ejson/Gemfile b/pkgs/development/tools/ejson/Gemfile new file mode 100644 index 000000000000..f860fe5075d4 --- /dev/null +++ b/pkgs/development/tools/ejson/Gemfile @@ -0,0 +1,4 @@ +source 'https://rubygems.org' + +gem 'fpm' +gem 'ronn' diff --git a/pkgs/development/tools/ejson/Gemfile.lock b/pkgs/development/tools/ejson/Gemfile.lock new file mode 100644 index 000000000000..bc72352c7ab1 --- /dev/null +++ b/pkgs/development/tools/ejson/Gemfile.lock @@ -0,0 +1,54 @@ +GEM + remote: https://rubygems.org/ + specs: + arr-pm (0.0.10) + cabin (> 0) + backports (3.8.0) + cabin (0.9.0) + childprocess (0.7.1) + ffi (~> 1.0, >= 1.0.11) + clamp (1.0.1) + dotenv (2.2.1) + ffi (1.9.18) + fpm (1.9.2) + arr-pm (~> 0.0.10) + backports (>= 2.6.2) + cabin (>= 0.6.0) + childprocess + clamp (~> 1.0.0) + ffi + json (>= 1.7.7, < 2.0) + pleaserun (~> 0.0.29) + ruby-xz + stud + hpricot (0.8.6) + insist (1.0.0) + io-like (0.3.0) + json (1.8.6) + mustache (0.99.8) + pleaserun (0.0.30) + cabin (> 0) + clamp + dotenv + insist + mustache (= 0.99.8) + stud + rdiscount (2.2.0.1) + ronn (0.7.3) + hpricot (>= 0.8.2) + mustache (>= 0.7.0) + rdiscount (>= 1.5.8) + ruby-xz (0.2.3) + ffi (~> 1.9) + io-like (~> 0.3) + stud (0.0.23) + +PLATFORMS + ruby + +DEPENDENCIES + fpm + ronn + +BUNDLED WITH + 1.16.0 diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix new file mode 100644 index 000000000000..80129f318e39 --- /dev/null +++ b/pkgs/development/tools/ejson/default.nix @@ -0,0 +1,46 @@ +{ lib, bundlerEnv, ruby, buildGoPackage, fetchFromGitHub }: +let + # needed for manpage generation + gems = bundlerEnv { + name = "ejson-gems"; + gemdir = ./.; + inherit ruby; + }; +in buildGoPackage rec { + name = "ejson-${version}"; + version = "1.2.0"; + rev = "v${version}"; + + nativeBuildInputs = [ gems ]; + + goPackagePath = "github.com/Shopify/ejson"; + subPackages = [ "cmd/ejson" ]; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "Shopify"; + repo = "ejson"; + inherit rev; + sha256 = "07ig24fryb9n0mfyqb0sgpj7di9y7wbvh2ppwfs2jqfpvpncd7yh"; + }; + + # set HOME, otherwise bundler will insert stuff in the manpages + postBuild = '' + cd go/src/$goPackagePath + HOME=$PWD make man + ''; + + postInstall = '' + mkdir -p $out/share + cp -r build/man $out/share + ''; + + meta = with lib; { + description = "A small library to manage encrypted secrets using asymmetric encryption."; + license = licenses.mit; + homepage = https://github.com/Shopify/ejson; + platforms = platforms.unix; + maintainers = [ maintainers.manveru ]; + }; +} diff --git a/pkgs/development/tools/ejson/deps.nix b/pkgs/development/tools/ejson/deps.nix new file mode 100644 index 000000000000..b0c7defc5d78 --- /dev/null +++ b/pkgs/development/tools/ejson/deps.nix @@ -0,0 +1,48 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "9908e96513e5a94de37004098a3974a567f18111"; + sha256 = "0g6sihdb53nlf770dp3jc0qqxnlir5n2yjbp5p5vf7kcj3p54p34"; + }; + } + { + goPackagePath = "github.com/dustin/gojson"; + fetch = { + type = "git"; + url = "https://github.com/dustin/gojson"; + rev = "057ac0edc14e44d03df3bb03449e666ff50884c1"; + sha256 = "1kzzbi5yshcg1v99gab5ymd3psild3p0rbq9jf7mssjvh11yza6f"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "90f2eae17a8bdcbe3f6f654fc76af7f39e97d7b9"; + sha256 = "0s984ksmc8npf642nwwd1a81c2sfi613v7yia9jff710i5472fah"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "ca7e7f10cb9fd9c1a6ff7f60436c086d73714180"; + sha256 = "02wmfdq40fjszrd9l2w4c1g34zxnxyydwr4sqvp2blmw2s6ww4bx"; + }; + } +] \ No newline at end of file diff --git a/pkgs/development/tools/ejson/gemset.nix b/pkgs/development/tools/ejson/gemset.nix new file mode 100644 index 000000000000..b6fb1473d222 --- /dev/null +++ b/pkgs/development/tools/ejson/gemset.nix @@ -0,0 +1,188 @@ +{ + arr-pm = { + dependencies = ["cabin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; + type = "gem"; + }; + version = "0.0.10"; + }; + backports = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17pcz0z6jms5jydr1r95kf1bpk3ms618hgr26c62h34icy9i1dpm"; + type = "gem"; + }; + version = "3.8.0"; + }; + cabin = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici"; + type = "gem"; + }; + version = "0.9.0"; + }; + childprocess = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04cypmwyy4aj5p9b5dmpwiz5p1gzdpz6jaxb42fpckdbmkpvn6j1"; + type = "gem"; + }; + version = "0.7.1"; + }; + clamp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az"; + type = "gem"; + }; + version = "1.0.1"; + }; + dotenv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv"; + type = "gem"; + }; + version = "2.2.1"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + type = "gem"; + }; + version = "1.9.18"; + }; + fpm = { + dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09vzjsiwa2dlhph6fc519x5l0bfn2qfhayfld48cdl2561x5c7fb"; + type = "gem"; + }; + version = "1.9.2"; + }; + hpricot = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z"; + type = "gem"; + }; + version = "0.8.6"; + }; + insist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bw3bdwns14mapbgb8cbjmr0amvwz8y72gyclq04xp43wpp5jrvg"; + type = "gem"; + }; + version = "1.0.0"; + }; + io-like = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k"; + type = "gem"; + }; + version = "0.3.0"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + type = "gem"; + }; + version = "1.8.6"; + }; + mustache = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + type = "gem"; + }; + version = "0.99.8"; + }; + pleaserun = { + dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p"; + type = "gem"; + }; + version = "0.0.30"; + }; + rdiscount = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3"; + type = "gem"; + }; + version = "2.2.0.1"; + }; + ronn = { + dependencies = ["hpricot" "mustache" "rdiscount"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2"; + type = "gem"; + }; + version = "0.7.3"; + }; + ruby-xz = { + dependencies = ["ffi" "io-like"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; + type = "gem"; + }; + version = "0.2.3"; + }; + stud = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb"; + type = "gem"; + }; + version = "0.0.23"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39e70e5e1761..ea0d9fc8e123 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1292,6 +1292,8 @@ with pkgs; et = callPackage ../applications/misc/et {}; + ejson = callPackage ../development/tools/ejson {}; + eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; f3 = callPackage ../tools/filesystems/f3 { }; From 115bc86e6c48f83d718ad03c2ad1380c6da4ed00 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 6 Aug 2018 19:18:02 -0400 Subject: [PATCH 051/992] paxctl: Fix cross and Darwin builds --- pkgs/os-specific/linux/paxctl/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 270be695f03a..8fdd2356c30d 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, elf-header }: stdenv.mkDerivation rec { name = "paxctl-${version}"; @@ -9,8 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53"; }; + buildInputs = [ elf-header ]; + preBuild = '' - sed "s|--owner 0 --group 0||g" -i Makefile + sed -i Makefile \ + -e 's|--owner 0 --group 0||g' \ + -e '/CC:=gcc/d' ''; makeFlags = [ @@ -24,7 +28,7 @@ stdenv.mkDerivation rec { description = "A tool for controlling PaX flags on a per binary basis"; homepage = "https://pax.grsecurity.net"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice ]; }; } From 361521f5b0062d396dabe72b3f0ca0cdd31b8bf9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 26 Sep 2018 11:26:27 -0400 Subject: [PATCH 052/992] Revert "stdenv: partial revert of f2bb59e" This reverts commit 607063f61be3b19a2da054776b360d9c5b03038a. --- pkgs/stdenv/cross/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index d1efa3602374..daa9f66615c9 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -53,6 +53,9 @@ in lib.init bootStages ++ [ else buildPackages.gcc; extraNativeBuildInputs = old.extraNativeBuildInputs + ++ lib.optionals + (hostPlatform.isLinux && !buildPlatform.isLinux) + [ buildPackages.patchelf buildPackages.paxctl ] ++ lib.optional (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook From 91c304030a509c1913d6baf5d274e2d078d10bfd Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 27 Sep 2018 11:54:40 -0400 Subject: [PATCH 053/992] texlive: generate MkIV caches Documentation: http://www.pragma-ade.com/general/manuals/tools-mkiv.pdf Fixes: #19279 Closes: #47370 --- pkgs/tools/typesetting/tex/texlive/combine.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 8a01ac744145..f76b71ced3cf 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -235,6 +235,19 @@ in buildEnv { ln -s -t . ../texmf/doc/"$d"/* ) done + '' + + # MkIV uses its own lookup mechanism and we need to initialize + # caches for it. Unsetting TEXMFCNF is needed to let mtxrun + # determine it from kpathsea so that the config path is given with + # "selfautodir:" as it will be in runtime. This is important because + # the cache is identified by a hash of this path. + '' + if [[ -e "$out/bin/mtxrun" ]]; then + ( + unset TEXMFCNF + mtxrun --generate + ) + fi '' + bin.cleanBrokenLinks ; From 977a05cc3bc3c699f3c8ade0054a9d39fcbafa0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 27 Sep 2018 12:03:16 -0700 Subject: [PATCH 054/992] p11-kit: 0.23.13 -> 0.23.14 (#46220) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from p11-kit --- pkgs/development/libraries/p11-kit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index e0e0b59a9a9f..b4bdd200211c 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "p11-kit-${version}"; - version = "0.23.13"; + version = "0.23.14"; src = fetchFromGitHub { owner = "p11-glue"; repo = "p11-kit"; rev = version; - sha256 = "1z2rbw2qbwj64i88llc1mkf0263qa0kxc2350kg25r7mghxbw1y6"; + sha256 = "0zmrw1ciybhnxjlsfb07wnf11ak5vrmy8y8fnz3mwm8v3w8dzlvw"; }; outputs = [ "out" "dev"]; From d47f73242853cfcc41db84344ab36e7fbdd24756 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 27 Sep 2018 12:05:13 -0700 Subject: [PATCH 055/992] bison: 3.0.5 -> 3.1 (#45843) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from bison --- pkgs/development/tools/parsing/bison/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 469e64acff06..d75a7e0ee3db 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl, help2man }: stdenv.mkDerivation rec { - name = "bison-3.0.5"; + name = "bison-3.1"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "0rnml9spd6p0i5qy9g4r82drwdr09r1z9cf4p89agbrkxqmrsffd"; + sha256 = "0ip9krjf0lw57pk3wfbxgjhif1i18hm3vh35d1ifrvhnafskdjx7"; }; patches = []; # remove on another rebuild From f66ae2c8b20fd00853246cfd0a32fea0a7e06814 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 28 Sep 2018 03:15:59 -0500 Subject: [PATCH 056/992] libxcb: 1.13 -> 1.13.1 (#47450) https://lists.freedesktop.org/archives/xcb/2018-September/011155.html (cherry picked from commit b043a056a2cc6a4ab129ab1ce2bf7d4aa7d2ea69) --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/extra.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c33997b72c84..b06f41226ed1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1136,11 +1136,11 @@ let }) // {inherit ;}; libxcb = (mkDerivation "libxcb" { - name = "libxcb-1.13"; + name = "libxcb-1.13.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2; - sha256 = "1ahxhmdqp4bhb90zmc275rmf5wixqra4bnw9pqnzyl1w3598g30q"; + url = http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2; + sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 222a9f654266..3c45e6062e26 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,5 +1,5 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 From 830f9fabd4a564bfbc3fbfc33a62b02010c0a7a5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 27 Sep 2018 17:40:16 -0500 Subject: [PATCH 057/992] patch-shebangs: use isScript to safely check for shebang start Fixes commonly encountered errors about broken pipes or null-bytes in command-substitution. --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index d5586fccae67..0ac81102658b 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -19,9 +19,8 @@ patchShebangs() { local newInterpreterLine find "$dir" -type f -perm -0100 | while read f; do - if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then - # missing shebang => not a script - continue + if ! isScript "$f"; then + continue fi oldInterpreterLine=$(head -1 "$f" | tail -c+3) From 286381f0727a5aee3413c24989ad5fb609653c49 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 28 Sep 2018 11:17:33 -0500 Subject: [PATCH 058/992] patch-shebangs: simplify a bit per reviewer suggestion --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 0ac81102658b..18eb011b0c79 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -19,9 +19,7 @@ patchShebangs() { local newInterpreterLine find "$dir" -type f -perm -0100 | while read f; do - if ! isScript "$f"; then - continue - fi + isScript "$f" || continue oldInterpreterLine=$(head -1 "$f" | tail -c+3) read -r oldPath arg0 args <<< "$oldInterpreterLine" From f7db287960241736213c0f262ad655ce40cfc624 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 28 Sep 2018 11:21:51 -0500 Subject: [PATCH 059/992] patch-shebangs.sh: use more robust 'for each file' loop, check for dir The latter is to avoid warnings printed by find if it doesn't exist. --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 18eb011b0c79..d26bf735d30a 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -18,7 +18,10 @@ patchShebangs() { local oldInterpreterLine local newInterpreterLine - find "$dir" -type f -perm -0100 | while read f; do + [ -e "$dir" ] || return 0 + + local f + while IFS= read -r -d $'\0' f; do isScript "$f" || continue oldInterpreterLine=$(head -1 "$f" | tail -c+3) @@ -58,7 +61,7 @@ patchShebangs() { rm "$f.timestamp" fi fi - done + done < <(find "$dir" -type f -perm -0100 -print0) stopNest } From 68879b36cbf3fae32b485a5af54b009139ae96e5 Mon Sep 17 00:00:00 2001 From: Zach Coyle Date: Fri, 28 Sep 2018 16:59:03 -0400 Subject: [PATCH 060/992] teamocil: init at 1.4.2 --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/misc/teamocil/Gemfile | 2 ++ pkgs/tools/misc/teamocil/Gemfile.lock | 13 +++++++++++++ pkgs/tools/misc/teamocil/default.nix | 17 +++++++++++++++++ pkgs/tools/misc/teamocil/gemset.nix | 10 ++++++++++ pkgs/tools/misc/teamocil/update | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 7 files changed, 59 insertions(+) create mode 100644 pkgs/tools/misc/teamocil/Gemfile create mode 100644 pkgs/tools/misc/teamocil/Gemfile.lock create mode 100644 pkgs/tools/misc/teamocil/default.nix create mode 100644 pkgs/tools/misc/teamocil/gemset.nix create mode 100755 pkgs/tools/misc/teamocil/update diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ae4e1209ca2..34f99825184d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4633,6 +4633,11 @@ github = "maggesi"; name = "Marco Maggesi"; }; + zachcoyle = { + email = "zach.coyle@gmail.com"; + github = "zachcoyle"; + name = "Zach Coyle"; + }; zagy = { email = "cz@flyingcircus.io"; github = "zagy"; diff --git a/pkgs/tools/misc/teamocil/Gemfile b/pkgs/tools/misc/teamocil/Gemfile new file mode 100644 index 000000000000..046ba3d536e0 --- /dev/null +++ b/pkgs/tools/misc/teamocil/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'teamocil' diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/pkgs/tools/misc/teamocil/Gemfile.lock new file mode 100644 index 000000000000..419c2ae49d31 --- /dev/null +++ b/pkgs/tools/misc/teamocil/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + teamocil (1.4.2) + +PLATFORMS + ruby + +DEPENDENCIES + teamocil + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix new file mode 100644 index 000000000000..2215e4d4fee7 --- /dev/null +++ b/pkgs/tools/misc/teamocil/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + inherit ruby; + pname = "teamocil"; + gemdir = ./.; + + meta = with lib; { + description = "A simple tool used to automatically create windows and panes in tmux with YAML files"; + homepage = https://github.com/remiprev/teamocil; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ + zachcoyle + ]; + }; +} diff --git a/pkgs/tools/misc/teamocil/gemset.nix b/pkgs/tools/misc/teamocil/gemset.nix new file mode 100644 index 000000000000..f363d62b6d68 --- /dev/null +++ b/pkgs/tools/misc/teamocil/gemset.nix @@ -0,0 +1,10 @@ +{ + teamocil = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l5f33faipb45xx7ds67s7dqgvjlljlcxgpgig4pg8p002vg06r2"; + type = "gem"; + }; + version = "1.4.2"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/teamocil/update b/pkgs/tools/misc/teamocil/update new file mode 100755 index 000000000000..58a7bd4a4539 --- /dev/null +++ b/pkgs/tools/misc/teamocil/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -rf ~/.gem +fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 736b3118f2dc..d31cb39d9317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2320,6 +2320,8 @@ with pkgs; tealdeer = callPackage ../tools/misc/tealdeer { }; + teamocil = callPackage ../tools/misc/teamocil { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { From 2f92b456ac5aae061ca2995321b3fe69ff14bc73 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Sat, 29 Sep 2018 13:31:26 +0200 Subject: [PATCH 061/992] dbmate: init at 1.4.1 --- .../tools/database/dbmate/default.nix | 25 ++++++ .../tools/database/dbmate/deps.nix | 84 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 111 insertions(+) create mode 100644 pkgs/development/tools/database/dbmate/default.nix create mode 100644 pkgs/development/tools/database/dbmate/deps.nix diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix new file mode 100644 index 000000000000..14fcc3f8607c --- /dev/null +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "dbmate-${version}"; + version = "1.4.1"; + + goPackagePath = "github.com/amacneil/dbmate"; + + src = fetchFromGitHub { + owner = "amacneil"; + repo = "dbmate"; + rev = "v${version}"; + sha256 = "0s3l51kmpsaikixq1yxryrgglzk4kfrjagcpf1i2bkq4wc5gyv5d"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Database migration tool"; + homepage = https://dbmate.readthedocs.io; + license = licenses.mit; + maintainers = [ maintainers.manveru ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix new file mode 100644 index 000000000000..97bfc10b20af --- /dev/null +++ b/pkgs/development/tools/database/dbmate/deps.nix @@ -0,0 +1,84 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "2cc627ac8defc45d65066ae98f898166f580f9a4"; + sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "a79fa1e548e2c689c241d10173efd51e5d689d5b"; + sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "19c8e9ad00952ce0c64489b60e8df88bb16dd514"; + sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "6c771bb9887719704b210e87e934f08be014bdb1"; + sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; + sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; + sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6bbd0598ee7..3ce2f9390fe3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6439,6 +6439,8 @@ with pkgs; crystal = callPackage ../development/compilers/crystal { }; + dbmate = callPackage ../development/tools/database/dbmate { }; + devpi-client = callPackage ../development/tools/devpi-client {}; devpi-server = callPackage ../development/tools/devpi-server {}; From 73de0734057b2b0b5203a92e941e6f13fdf1b488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sat, 29 Sep 2018 20:56:34 +0200 Subject: [PATCH 062/992] nixos/kmscon: Add autologin option --- nixos/modules/services/ttys/kmscon.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 59c45fcb44ee..82b6a51028e3 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -4,6 +4,8 @@ let cfg = config.services.kmscon; + autologinArg = lib.optionalString (cfg.autologinUser != null) "-f ${cfg.autologinUser}"; + configDir = pkgs.writeTextFile { name = "kmscon-config"; destination = "/kmscon.conf"; text = cfg.extraConfig; }; in { options = { @@ -39,6 +41,15 @@ in { default = ""; example = "--term xterm-256color"; }; + + autologinUser = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Username of the account that will be automatically logged in at the console. + If unspecified, a login prompt is shown as usual. + ''; + }; }; }; @@ -61,7 +72,7 @@ in { [Service] ExecStart= - ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p + ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg} UtmpIdentifier=%I TTYPath=/dev/%I TTYReset=yes From 438559182f0c95dd75328f8f16e43793e328ddde Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Mon, 1 Oct 2018 20:37:48 +0200 Subject: [PATCH 063/992] heptio-ark: 0.9.4 -> 0.9.6 --- pkgs/applications/networking/cluster/heptio-ark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix index f786bff01d62..6a83ac34f3f9 100644 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "heptio-ark-${version}"; - version = "0.9.4"; + version = "0.9.6"; goPackagePath = "github.com/heptio/ark"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "heptio"; repo = "ark"; - sha256 = "01z0zkw7l6haxky9l45iqqnvs6104xx4195jm250nv9j1x8n59ai"; + sha256 = "0q353a6f3hvg1gr6rmg8pbqnkrbgjchdr7f6f9503l1qbyyf95fz"; }; postInstall = "rm $bin/bin/generate"; From e7345efa6a63b3ad1610fbef28657945f8bc9266 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 30 Sep 2018 21:49:35 -0500 Subject: [PATCH 064/992] google-chrome: use default patchelf, "fixes" nacl_helper crashing. I'm not sure what the problem is, precisely, but even so this was preventing use of things like cast'ing-- not that I'm entirely clear on what that would be the case either :/. Err on caution and let's go back to what the situation was before and fix it properly when we better understand the issue. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4177bce4d22..9c1c2238596b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16895,7 +16895,7 @@ with pkgs; googleearth = callPackage ../applications/misc/googleearth { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; patchelf = patchelfUnstable; }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; From da4813072f3cab88cff1ee71be9f877c3ed774a8 Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Sat, 29 Sep 2018 23:10:23 +0200 Subject: [PATCH 065/992] boost: fix fiber header (#47540) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit include/boost/fiber/detail/context_spmc_queue.hpp:1:1: error: stray ‘\357’ in program caused by a leftover UTF-8 Byte Order Mark --- pkgs/development/libraries/boost/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 4131e5f7a27c..1ab0718e7960 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { postFixup = '' # Make boost header paths relative so that they are not runtime dependencies cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ - -exec sed '1i#line 1 "{}"' -i '{}' \; + -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \; '' + optionalString (stdenv.hostPlatform.libc == "msvcrt") '' $RANLIB "$out/lib/"*.a ''; From 55b6cad5376186affaebc2d990515ad5f1cef1c1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 1 Oct 2018 17:14:26 -0500 Subject: [PATCH 066/992] lz4: 1.8.2 -> 1.8.3 (#47547) --- pkgs/tools/compression/lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index 7e29ee2b856a..1cd4c30a3886 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "lz4-${version}"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { - sha256 = "0xbjbjrvgzypk8dnldakir06gb8m946d064lxx0qc4ky6m8n9hn2"; + sha256 = "0lq00yi7alr9aip6dw0flykzi8yv7z43aay177n86spn9qms7s3g"; rev = "v${version}"; repo = "lz4"; owner = "lz4"; From 8621415289becc0ef8ab4aee2e4d07894702007d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:31 +0000 Subject: [PATCH 067/992] [cpan2nix] perlPackages.ArchiveExtract: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18ca62c02b04..2d4490731327 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -493,7 +493,6 @@ let url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; sha256 = "25cbc2d5626c14d39a0b5e4fe8383941e085c9a7e0aa873d86e81b6e709025f4"; }; - propagatedBuildInputs = [ ModuleLoadConditional ]; meta = { description = "Generic archive extracting mechanism"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From b139a94587ae589dd4d92517a9e82daf252a014f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:31 +0000 Subject: [PATCH 068/992] [cpan2nix] perlPackages.AttributeHandlers: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2d4490731327..18fc60073140 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -407,17 +407,7 @@ let }; }; - AttributeHandlers = buildPerlPackage { - name = "Attribute-Handlers-0.99"; - src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Attribute-Handlers-0.99.tar.gz; - sha256 = "937ea3ebfc9b14f4a4148bf3c32803709edbd12a387137a26370b38ee1fc9835"; - }; - meta = { - description = "Simpler definition of attribute handlers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + AttributeHandlers = null; # part of Perl 5.26 AttributeParamsValidate = buildPerlPackage { name = "Attribute-Params-Validate-1.21"; From 002a2a8d399902acff6ea1d362ec374006858db8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:34 +0000 Subject: [PATCH 069/992] [cpan2nix] perlPackages.CPANMeta: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18fc60073140..bdb5ea9f2287 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2795,18 +2795,7 @@ let }; }; - CPANMeta = buildPerlPackage rec { - name = "CPAN-Meta-2.150010"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "1mm3dfw3ffyzb2ikpqn9l6zyqrxijb4vyywmbx2l21ryqwp0zy74"; - }; - meta = { - homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Meta; - description = "The distribution metadata for a CPAN dist"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + CPANMeta = null; # part of Perl 5.26 CPANMetaCheck = buildPerlPackage rec { name = "CPAN-Meta-Check-0.014"; From 34d42976681beca8c855abb7407296291da4397d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:35 +0000 Subject: [PATCH 070/992] [cpan2nix] perlPackages.CPANMetaRequirements: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bdb5ea9f2287..789e3543f546 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2810,18 +2810,7 @@ let }; }; - CPANMetaRequirements = buildPerlPackage { - name = "CPAN-Meta-Requirements-2.140"; - src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.140.tar.gz; - sha256 = "0898645e8e86f0922f0f0502b503f592a8eb3d3176b4fd87adcc7ba51e751fa9"; - }; - meta = { - homepage = https://github.com/dagolden/CPAN-Meta-Requirements; - description = "A set of version requirements for a CPAN dist"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + CPANMetaRequirements = null; # part of Perl 5.26 CPANMetaYAML = buildPerlPackage rec { name = "CPAN-Meta-YAML-0.018"; From 877253bb2485c7dfd03b2a4107faafc95fe9cdbe Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:35 +0000 Subject: [PATCH 071/992] [cpan2nix] perlPackages.CPANMetaYAML: removed built-in --- pkgs/top-level/perl-packages.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 789e3543f546..05e1395f9b42 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2812,19 +2812,7 @@ let CPANMetaRequirements = null; # part of Perl 5.26 - CPANMetaYAML = buildPerlPackage rec { - name = "CPAN-Meta-YAML-0.018"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "150jh9l7baddl2587m23qs2l0pb395qsx9bhsgdsnn6y9k4zgjik"; - }; - doCheck = true; - meta = { - homepage = https://github.com/dagolden/CPAN-Meta-YAML; - description = "Read and write a subset of YAML for CPAN Meta files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + CPANMetaYAML = null; # part of Perl 5.26 CPANPerlReleases = buildPerlPackage rec { name = "CPAN-Perl-Releases-3.74"; From 5342617b49072971cedd554975636086dcb54d7e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:12:35 +0000 Subject: [PATCH 072/992] [cpan2nix] perlPackages.CPANPerlReleases: 3.74 -> 3.76 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 05e1395f9b42..d9c2d776ed1b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2815,10 +2815,10 @@ let CPANMetaYAML = null; # part of Perl 5.26 CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.74"; + name = "CPAN-Perl-Releases-3.76"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0qdh79fl38cyq9kp2g2s934gl1nn5jd88rgmqarqcmja8xhpfcp3"; + sha256 = "0p9anb92sfi6cfr3ia8yvd3scn0bzwh2r6z8f6jrawjr8lilgahj"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; From 53fb0d493d892098f1acdbea48a5b35de20a4ebf Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:00 +0000 Subject: [PATCH 073/992] [cpan2nix] perlPackages.DigestMD5: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d9c2d776ed1b..59bcedd37e67 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4444,17 +4444,7 @@ let }; }; - DigestMD5 = buildPerlPackage { - name = "Digest-MD5-2.55"; - src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.55.tar.gz; - sha256 = "03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c"; - }; - meta = { - description = "Perl interface to the MD-5 algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + DigestMD5 = null; # part of Perl 5.26 DigestMD5File = buildPerlPackage { name = "Digest-MD5-File-0.08"; From 44599c23a4321caae981fa49500cddbdf2cd7e91 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:02 +0000 Subject: [PATCH 074/992] [cpan2nix] perlPackages.EmailMIMEContentType: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 59bcedd37e67..97eb4e5cb748 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4963,7 +4963,6 @@ let description = "Parse a MIME Content-Type Header"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ Encode ]; }; EmailMIMEEncodings = buildPerlPackage rec { From cc3e2fc39132729b050b1523399317190d778ae8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:40 +0000 Subject: [PATCH 075/992] [cpan2nix] perlPackages.ListMoreUtilsXS: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 97eb4e5cb748..a497dced0014 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8462,7 +8462,6 @@ let preConfigure = '' export LD=$CC ''; - propagatedBuildInputs = [ XSLoader ]; meta = { description = "Provide the stuff missing in List::Util in XS"; license = with stdenv.lib.licenses; [ asl20 ]; From 4b370f45c2033c64671b64e044fc7d84e8dc2448 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:42 +0000 Subject: [PATCH 076/992] [cpan2nix] perlPackages.LocaleMaketext: removed built-in --- pkgs/top-level/perl-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a497dced0014..db669dcfd2a4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8530,13 +8530,7 @@ let }; }; - LocaleMaketext = buildPerlPackage { - name = "Locale-Maketext-1.28"; - src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Locale-Maketext-1.28.tar.gz; - sha256 = "1sgpcnh9kqdnsizpwxzsyfv44id7gxsgkd9bmnhmj4g8hfs9712p"; - }; - }; + LocaleMaketext = null; # part of Perl 5.26 LocaleMaketextFuzzy = buildPerlPackage { name = "Locale-Maketext-Fuzzy-0.11"; From 5bd2bb1e0db9a14bf90a74ce71240f6a880cc3a9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:48 +0000 Subject: [PATCH 077/992] [cpan2nix] perlPackages.MathBigRat: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index db669dcfd2a4..8b78f28ffc85 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9198,7 +9198,6 @@ let url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; sha256 = "cea6c20afc6c10a3dc3b62a71df3f842dce13898443bd827242ff3f09f1f3d59"; }; - propagatedBuildInputs = [ MathBigInt ]; meta = { description = "Arbitrary big rational numbers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 2a2c9bff0f7e7368b983f1852e68a55dce46e658 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:52 +0000 Subject: [PATCH 078/992] [cpan2nix] perlPackages.ModuleCoreList: 5.20180820 -> 5.20180920 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b78f28ffc85..44a64e62c42e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9624,10 +9624,10 @@ let }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20180820"; + name = "Module-CoreList-5.20180920"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180820.tar.gz; - sha256 = "1ccs5mqcfxjv8bax2nfsg11b2vc3sqyapfapxyzrjhaa2fmdn54l"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180920.tar.gz; + sha256 = "00gkfkajvamb207xslqakwpzyjdhbyf14l0bs9ywcw8q44n7ghaf"; }; meta = { homepage = http://dev.perl.org/; From 0432ee463f9c03cd99e3af44ae2c132e84a82b43 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:53 +0000 Subject: [PATCH 079/992] [cpan2nix] perlPackages.ModuleLoadConditional: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 44a64e62c42e..a00f330390e0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9734,17 +9734,7 @@ let }; }; - ModuleLoadConditional = buildPerlPackage rec { - name = "Module-Load-Conditional-0.68"; - src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-Load-Conditional-0.68.tar.gz; - sha256 = "1zcq0s7q9bvk9wdv9ijfyddh3b8ck4n3w87rcx31lbsav5fba9vn"; - }; - meta = { - description = "Looking up module information / loading at runtime"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + ModuleLoadConditional = null; # part of Perl 5.26 ModuleManifest = buildPerlPackage { name = "Module-Manifest-1.09"; From fddc77f71f7c205f71904df5327cf9ca47a1208f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:53 +0000 Subject: [PATCH 080/992] [cpan2nix] perlPackages.ModuleMetadata: removed built-in --- pkgs/top-level/perl-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a00f330390e0..400ee1497fc7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9750,13 +9750,7 @@ let }; }; - ModuleMetadata = buildPerlPackage rec { - name = "Module-Metadata-1.000033"; - src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Module-Metadata-1.000033.tar.gz; - sha256 = "13pzydb22693l33rfx6drwbhjxj04q80ds4m2nn2sbmm95wwr5mw"; - }; - }; + ModuleMetadata = null; # part of Perl 5.26 ModulePath = buildPerlPackage rec { name = "Module-Path-0.19"; From ec1b5409fc9ec557e304ec5c5b8949b6a4051f7d Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:13:55 +0000 Subject: [PATCH 081/992] [cpan2nix] perlPackages.Mojolicious: cleanup --- pkgs/top-level/perl-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 400ee1497fc7..893d65f76ec0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9916,8 +9916,6 @@ let url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; sha256 = "b266fd32f12cca2504be012e785f34eb09c0a132df52be183ff5d494e87f0b98"; }; - buildInputs = [ ExtUtilsMakeMaker ]; - propagatedBuildInputs = [ IOSocketIP JSONPP PodSimple TimeLocal ]; meta = { homepage = https://mojolicious.org; description = "Real-time web framework"; From 93795465a02f753c7803c57ba6e972bb1cb8c5c7 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:14:10 +0000 Subject: [PATCH 082/992] [cpan2nix] perlPackages.PerlOSType: removed built-in --- pkgs/top-level/perl-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 893d65f76ec0..35e642a05869 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12099,13 +12099,7 @@ let doCheck = false; }; - PerlOSType = buildPerlPackage rec { - name = "Perl-OSType-1.010"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "1ch36kfjwm229xicb9k7b9fhisy58ihdr16vm8iwniymnna4kvg7"; - }; - }; + PerlOSType = null; # part of Perl 5.26 PerlTidy = buildPerlPackage rec { name = "Perl-Tidy-20180220"; From 85f063dacc951d88c863fa2f6a5b39d769f88b8f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:14:15 +0000 Subject: [PATCH 083/992] [cpan2nix] perlPackages.PodUsage: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 35e642a05869..3f09588e6387 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12884,17 +12884,7 @@ let }; }; - PodUsage = buildPerlPackage { - name = "Pod-Usage-1.69"; - src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Usage-1.69.tar.gz; - sha256 = "1a920c067b3c905b72291a76efcdf1935ba5423ab0187b9a5a63cfc930965132"; - }; - propagatedBuildInputs = [ podlators ]; - meta = { - description = "Pod::Usage extracts POD documentation and shows usage information"; - }; - }; + PodUsage = null; # part of Perl 5.26 PodWeaver = buildPerlPackage rec { name = "Pod-Weaver-4.015"; From fef6077d6c45eb9a2909c5734f8489af2ffa42ba Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:14:34 +0000 Subject: [PATCH 084/992] [cpan2nix] perlPackages.TermANSIColor: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3f09588e6387..1be0a336c941 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14472,17 +14472,7 @@ let }; }; - TermANSIColor = buildPerlPackage { - name = "Term-ANSIColor-4.06"; - src = fetchurl { - url = mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.06.tar.gz; - sha256 = "8161c7434b1984bde588d75f22c786c46cb6d35d264d58111db0b82537de4bad"; - }; - meta = { - description = "Color output using ANSI escape sequences"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + TermANSIColor = null; # part of Perl 5.26 TermCap = let version = "1.17"; in buildPerlPackage { name = "Term-Cap-${version}"; From a17d101d83dbbf976351667a996e1a324ff1578c Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:14:35 +0000 Subject: [PATCH 085/992] [cpan2nix] perlPackages.TermCap: removed built-in --- pkgs/top-level/perl-packages.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1be0a336c941..75cd1379e4a6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14474,18 +14474,7 @@ let TermANSIColor = null; # part of Perl 5.26 - TermCap = let version = "1.17"; in buildPerlPackage { - name = "Term-Cap-${version}"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JS/JSTOWE/Term-Cap-${version}.tar.gz"; - sha256 = "0qyicyk4aikw6w3fm8c4y6hd7ff70crkl6bf64qmiakbgxy9p6p7"; - }; - meta = { - inherit version; - description = "Perl termcap interface"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + TermCap = null; # part of Perl 5.26 TermEncoding = buildPerlPackage { name = "Term-Encoding-0.02"; From a400a6e3bb4193229b816caf88649c962e235561 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:14:57 +0000 Subject: [PATCH 086/992] [cpan2nix] perlPackages.ThreadSemaphore: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 75cd1379e4a6..5cd265dd58c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16544,17 +16544,7 @@ let }; }; - ThreadSemaphore = buildPerlPackage { - name = "Thread-Semaphore-2.13"; - src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.13.tar.gz; - sha256 = "e3fe2cc047575529c8ea4c168cef8fab2ec931729a1826ffca1ef63e7e45bc81"; - }; - meta = { - description = "Thread-safe semaphores"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + ThreadSemaphore = null; # part of Perl 5.26 Throwable = buildPerlPackage rec { name = "Throwable-0.200013"; From 8780d22f3dfcad76d414d0fb8cf8644f92acaebc Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:04 +0000 Subject: [PATCH 087/992] [cpan2nix] perlPackages.UnicodeNormalize: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5cd265dd58c6..c940e6b9f98d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16959,17 +16959,7 @@ let }; }; - UnicodeNormalize = buildPerlPackage rec { - name = "Unicode-Normalize-1.25"; - src = fetchurl { - url = "mirror://cpan/authors/id/K/KH/KHW/${name}.tar.gz"; - sha256 = "00b33a75d3b356ade2e09391ea2d32fac881671c18b1eb26b9ca31273d5b046c"; - }; - meta = { - description = "Unicode Normalization Forms"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + UnicodeNormalize = null; # part of Perl 5.26 UnicodeString = buildPerlPackage rec { name = "Unicode-String-2.10"; From 41790ecab6a0e0d2294b4a44081ab7d29c9a9164 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:06 +0000 Subject: [PATCH 088/992] [cpan2nix] perlPackages.WWWFormUrlEncoded: 0.24 -> 0.25 --- pkgs/top-level/perl-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c940e6b9f98d..eee5b64a3b56 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17203,12 +17203,11 @@ let }; WWWFormUrlEncoded = buildPerlModule rec { - name = "WWW-Form-UrlEncoded-0.24"; + name = "WWW-Form-UrlEncoded-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.24.tar.gz; - sha256 = "04fh54zgmrlhrmdaqs2yrwqmqwk9hd737z7rnbbd438l36skn7vd"; + url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.25.tar.gz; + sha256 = "0kh7qrskhbk4j253pr2q4vpn73q5k6fj517m3lnj8n755z9adxz1"; }; - buildInputs = [ JSON ]; meta = { description = "parser and builder for application/x-www-form-urlencoded"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From dde3ebf389708c1ea318cc3480fa94527d5e5b76 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:09 +0000 Subject: [PATCH 089/992] [cpan2nix] perlPackages.XSLoader: removed built-in --- pkgs/top-level/perl-packages.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eee5b64a3b56..d00170e48d5b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17707,17 +17707,7 @@ let }; }; - XSLoader = buildPerlPackage { - name = "XSLoader-0.24"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.24.tar.gz; - sha256 = "0pyqr12jsqagna75fm2gijfzw06wy1hrh5chn9hwnmcfddda66g8"; - }; - meta = { - description = "Dynamically load C libraries into Perl code"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; + XSLoader = null; # part of Perl 5.26 XSObjectMagic = buildPerlPackage rec { name = "XS-Object-Magic-0.04"; From dd4a0700edfcb910583b027a7dd37671765c9071 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:11 +0000 Subject: [PATCH 090/992] [cpan2nix] perlPackages.base: removed built-in --- pkgs/top-level/perl-packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d00170e48d5b..c691c36d6ab1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -709,13 +709,7 @@ let }; }; - base = buildPerlPackage { - name = "base-2.23"; - src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/base-2.23.tar.gz; - sha256 = "40f55841299a9fe6fab03cd098f94e9221fb516978e9ef40fd8ff2cbd6625dde"; - }; - }; + base = null; # part of Perl 5.26 BC = buildPerlPackage rec { name = "B-C-1.55"; From fa6238b39bb73f35f00e135332106d43b0eb65fa Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:48 +0000 Subject: [PATCH 091/992] [cpan2nix] perlPackages.NetDNS: 1.17 -> 1.18 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c691c36d6ab1..51cad63de5d0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11089,12 +11089,12 @@ let }; NetDNS = buildPerlPackage rec { - name = "Net-DNS-1.17"; + name = "Net-DNS-1.18"; src = fetchurl { url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; - sha256 = "9a79fd8fea1a708726c18d193ae4437479206ccb20ffa7f0971371e172e2c2e0"; + sha256 = "52ce1494fc9707fd5a60ed71db5cde727157b7f2363787d730d4d1bd9800a9d3"; }; - propagatedBuildInputs = [ DigestHMAC IOSocketIP ]; + propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; meta = { description = "Perl Interface to the Domain Name System"; From c239e0bebfe2227ca92d6f022716bed6f62df981 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:48 +0000 Subject: [PATCH 092/992] [cpan2nix] perlPackages.NetIDNEncode: 2.400 -> 2.401 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 51cad63de5d0..82754f700baa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11157,10 +11157,10 @@ let }; NetIDNEncode = buildPerlModule { - name = "Net-IDN-Encode-2.400"; + name = "Net-IDN-Encode-2.401"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz; - sha256 = "0a9knav5f9kjldrkxx1k47ivd3p23zkmi8aqgyhnxidhgasz1dlq"; + url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.401.tar.gz; + sha256 = "1b5hnlnaxnp9jzdk55dcfh4jviv9mv83y4plsr3hi7lkh06hwdyd"; }; buildInputs = [ TestNoWarnings ]; meta = { From 1da70e726f84be07fb0afed990160c705b3df2e5 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:15:50 +0000 Subject: [PATCH 093/992] [cpan2nix] perlPackages.SubInfo: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 82754f700baa..d4ae96a3ec53 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14041,7 +14041,6 @@ let url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; sha256 = "ea3056d696bdeff21a99d340d5570887d39a8cc47bff23adfc82df6758cdd0ea"; }; - buildInputs = [ TestSimple13 ]; propagatedBuildInputs = [ Importer ]; meta = { description = "Tool for inspecting subroutines"; From fb70dbb2827b9e2af22cc771ccd691ac1891732f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:16:04 +0000 Subject: [PATCH 094/992] [cpan2nix] perlPackages.CryptOpenSSLRSA: 0.30 -> 0.31 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d4ae96a3ec53..61b43c021457 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3051,10 +3051,10 @@ let }; CryptOpenSSLRSA = buildPerlPackage rec { - name = "Crypt-OpenSSL-RSA-0.30"; + name = "Crypt-OpenSSL-RSA-0.31"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.30.tar.gz; - sha256 = "23e13531397af102db4fd24bcf70137add7c85c23cca697c43aa71c2959a29ac"; + url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz; + sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436"; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; From a172229664b7438011648f3c355b00c1137725d9 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:16:39 +0000 Subject: [PATCH 095/992] [cpan2nix] perlPackages.TextBibTeX: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 61b43c021457..2229ca10ae98 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16012,7 +16012,6 @@ let description = "Interface to read and parse BibTeX files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ ScalarListUtils ]; }; TextBrew = buildPerlPackage rec { From fd686b947e6e4810a18ab73e4a455c16a32d77b8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:33 +0000 Subject: [PATCH 096/992] [cpan2nix] perlPackages.DataValidateDomain: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2229ca10ae98..f9824fda6aab 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3493,7 +3493,7 @@ let url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; sha256 = "4470f253b8d2720a4dd3fa3ae550995417c2269f3be7ff030e01afa04a3a9421"; }; - buildInputs = [ Test2Suite TestSimple13 ]; + buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ NetDomainTLD ]; meta = { description = "Domain and host name validation"; From d4d9eed5e6f73f4f5604f43790f5f8e94b032eb8 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:38 +0000 Subject: [PATCH 097/992] [cpan2nix] perlPackages.Test2PluginNoWarnings: cleanup --- pkgs/top-level/perl-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f9824fda6aab..4058d1ad6893 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14674,7 +14674,6 @@ let url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz; sha256 = "002qk6qsm0l6r2kaxywvc38w0yf0mlavgywq8li076pn6kcw3242"; }; - propagatedBuildInputs = [ TestSimple13 ]; buildInputs = [ IPCRun3 Test2Suite ]; meta = { description = "Fail if tests warn"; From 9adcdd61e9a6c7c2c077eca514df4cd43f3914cf Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:39 +0000 Subject: [PATCH 098/992] [cpan2nix] perlPackages.CookieBaker: 0.09 -> 0.10 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4058d1ad6893..98a2e57630cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2690,10 +2690,10 @@ let }; CookieBaker = buildPerlModule rec { - name = "Cookie-Baker-0.09"; + name = "Cookie-Baker-0.10"; src = fetchurl { url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; - sha256 = "be020a634162b319cab55b6e2bf10556a33a210a2eee8a2f1aa1b19b5e33aa4f"; + sha256 = "b42bad15b12da4cdc5c90c902faf3ad484281a42203fa4e7652866434f6fa4dd"; }; buildInputs = [ ModuleBuildTiny TestTime ]; propagatedBuildInputs = [ URI ]; From 2a38d70964f08808d437a55b27faf5ef384f5b3a Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:42 +0000 Subject: [PATCH 099/992] [cpan2nix] perlPackages.TestScript: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 98a2e57630cb..6ffa00d6014e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15663,7 +15663,7 @@ let buildInputs = [ Test2Suite ]; - propagatedBuildInputs = [ CaptureTiny ProbePerl TestSimple13 ]; + propagatedBuildInputs = [ CaptureTiny ProbePerl ]; }; TestSharedFork = buildPerlPackage rec { From e3eaacf78663b3b37da8fa637906a1083e54f30b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:46 +0000 Subject: [PATCH 100/992] [cpan2nix] perlPackages.ListAllUtils: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6ffa00d6014e..54f3a45ef1df 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8402,7 +8402,7 @@ let url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.14.tar.gz; sha256 = "e45aa65927ae1975a000cc2fed14274627fa5e2bd09bab826a5f2c41d17ef6cd"; }; - propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ScalarListUtils ]; + propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From f12f974404294809e946708fe6e3f07c10629e1e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:17:48 +0000 Subject: [PATCH 101/992] [cpan2nix] perlPackages.TestMost: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 54f3a45ef1df..205fb1c8a76a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15325,7 +15325,7 @@ let description = "Most commonly needed test functions and features"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ TestDeep TestDifferences TestException TestSimple13 TestWarn ]; + buildInputs = [ TestDeep TestDifferences TestException TestWarn ]; }; TestNeeds = buildPerlPackage rec { From d8418d75b588ada024dab2a5db8e827896d4038f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:24 +0000 Subject: [PATCH 102/992] [cpan2nix] perlPackages.Mouse: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 205fb1c8a76a..8f40dfd12dbd 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10799,7 +10799,7 @@ let url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.6.tar.gz; sha256 = "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l"; }; - buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ]; + buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; perlPreHook = "export LD=$CC"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector"; hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; From f7864bbab1411b0c4c882646327e50b00568eafe Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:30 +0000 Subject: [PATCH 103/992] [cpan2nix] perlPackages.XMLXPath: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8f40dfd12dbd..73342fafaa08 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17526,7 +17526,7 @@ let sha256 = "9e6ac67c2cead5f918a060b8b9ccdbdcaa6d610be8517bba42a96cd56748b512"; }; buildInputs = [ PathTiny ]; - propagatedBuildInputs = [ ScalarListUtils XMLParser ]; + propagatedBuildInputs = [ XMLParser ]; meta = { description = "Modules for parsing and evaluating XPath statements"; license = stdenv.lib.licenses.artistic2; From 93c904a369e5de1293c4ed5bb560daa631f65308 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:31 +0000 Subject: [PATCH 104/992] [cpan2nix] perlPackages.ArchiveTarWrapper: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 73342fafaa08..42d5057b7b54 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -511,7 +511,7 @@ let meta = { description = "API wrapper around the 'tar' utility"; }; - buildInputs = [ Dumbbench TestSimple13 ]; + buildInputs = [ Dumbbench ]; }; ArchiveZip = buildPerlPackage { From b70d37d67c44a89a093d79db4646777ea15ca02f Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:35 +0000 Subject: [PATCH 105/992] [cpan2nix] perlPackages.EmailSender: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 42d5057b7b54..46f93c714783 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5011,7 +5011,7 @@ let sha256 = "c412372938510283d8c850127895e09c2b670f892e1c3992fd54c0c1a9064f14"; }; buildInputs = [ CaptureTiny ]; - propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike ScalarListUtils SubExporter Throwable TryTiny libnet ]; + propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike SubExporter Throwable TryTiny ]; meta = { homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; From eea9f82e9c3586884e883182557464bfb29372ae Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:36 +0000 Subject: [PATCH 106/992] [cpan2nix] perlPackages.ParamsValidationCompiler: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 46f93c714783..2d4b23c31354 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11725,7 +11725,7 @@ let sha256 = "1jqn1l4m4i341g14kmjsf3a1kn7vv6z89cix0xjjgr1v70iywnyw"; }; propagatedBuildInputs = [ EvalClosure ExceptionClass ]; - buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestSimple13 TestWithoutModule ]; + buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestWithoutModule ]; meta = { description = "Build an optimized subroutine parameter validator once, use it forever"; license = with stdenv.lib.licenses; [ artistic2 ]; From 8674253b79c55f3d34584d034850dd63382b4392 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:18:58 +0000 Subject: [PATCH 107/992] [cpan2nix] perlPackages.Appperlbrew: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2d4b23c31354..8e8e6ab48a62 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -344,7 +344,7 @@ let sha256 = "0j21pcd82q9raz2hnh1qmsk7hsfzz9pzadvql6skdmhwshs9a5la"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; - propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodUsage locallib ]; + propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; preConfigure = '' patchShebangs . From 326138d201560a8febdc1ee9183d24f4310cf109 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:19:00 +0000 Subject: [PATCH 108/992] [cpan2nix] perlPackages.DateTimeLocale: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e8e6ab48a62..f235696a2c27 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3823,7 +3823,7 @@ let sha256 = "757b3915c6b2aac89462c52fed36543f27dfb66abc98c895523d2ab95da65f94"; }; buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ]; - propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler ScalarListUtils Specio namespaceautoclean ]; + propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ]; meta = { description = "Localization support for DateTime.pm"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From 4b4522d4d6528367c9cabacda5c6a5633cbf8197 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:19:11 +0000 Subject: [PATCH 109/992] [cpan2nix] perlPackages.Moose: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f235696a2c27..618b509ac13a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9980,7 +9980,7 @@ let sha256 = "973d0a35d9f39bf93bbc5206c25f5ec3651f96356f082d31873c0ac9a5c1cd82"; }; buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ]; - propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ScalarListUtils SubExporter ]; + propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS SubExporter ]; preConfigure = '' export LD=$CC ''; From 005f851d8577c4d84d3de06989c235714500d96e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:19:21 +0000 Subject: [PATCH 110/992] [cpan2nix] perlPackages.TestRoutine: cleanup --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 618b509ac13a..83e2cb684f19 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15521,7 +15521,7 @@ let sha256 = "0n6k310v2py787lkvhzrn8vndws9icdf8mighgl472k0x890xm5s"; }; buildInputs = [ TestAbortable TestFatal ]; - propagatedBuildInputs = [ Moose TestSimple13 namespaceautoclean ]; + propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; From 580f964503c938f51790aaa2d08ea89e28ca9329 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:20:00 +0000 Subject: [PATCH 111/992] [cpan2nix] perlPackages.CatalystRuntime: 5.90118 -> 5.90119 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 83e2cb684f19..b162c2e96140 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1317,10 +1317,10 @@ let }; CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90118"; + name = "Catalyst-Runtime-5.90119"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90118.tar.gz; - sha256 = "a3e979fc822f500d065e39a03d1883179bfdae77a8372cce0070efd1bf1e9a33"; + url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Runtime-5.90119.tar.gz; + sha256 = "19fff77c70a4fc8df2909db82629fda7f25d3e5d01f0152a145f8f8973ea87c7"; }; buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; From 46327afd1c4c988b8277566aef4340bf24f581c6 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 2 Oct 2018 01:26:29 +0000 Subject: [PATCH 112/992] perl-packages.nix: group aliases --- pkgs/top-level/perl-packages.nix | 48 +++++++++++--------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b162c2e96140..854e403f0c47 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -407,8 +407,6 @@ let }; }; - AttributeHandlers = null; # part of Perl 5.26 - AttributeParamsValidate = buildPerlPackage { name = "Attribute-Params-Validate-1.21"; src = fetchurl { @@ -709,8 +707,6 @@ let }; }; - base = null; # part of Perl 5.26 - BC = buildPerlPackage rec { name = "B-C-1.55"; src = fetchurl { @@ -2789,8 +2785,6 @@ let }; }; - CPANMeta = null; # part of Perl 5.26 - CPANMetaCheck = buildPerlPackage rec { name = "CPAN-Meta-Check-0.014"; src = fetchurl { @@ -2804,10 +2798,6 @@ let }; }; - CPANMetaRequirements = null; # part of Perl 5.26 - - CPANMetaYAML = null; # part of Perl 5.26 - CPANPerlReleases = buildPerlPackage rec { name = "CPAN-Perl-Releases-3.76"; src = fetchurl { @@ -4438,8 +4428,6 @@ let }; }; - DigestMD5 = null; # part of Perl 5.26 - DigestMD5File = buildPerlPackage { name = "Digest-MD5-File-0.08"; src = fetchurl { @@ -8524,8 +8512,6 @@ let }; }; - LocaleMaketext = null; # part of Perl 5.26 - LocaleMaketextFuzzy = buildPerlPackage { name = "Locale-Maketext-Fuzzy-0.11"; src = fetchurl { @@ -9728,8 +9714,6 @@ let }; }; - ModuleLoadConditional = null; # part of Perl 5.26 - ModuleManifest = buildPerlPackage { name = "Module-Manifest-1.09"; src = fetchurl { @@ -9744,8 +9728,6 @@ let }; }; - ModuleMetadata = null; # part of Perl 5.26 - ModulePath = buildPerlPackage rec { name = "Module-Path-0.19"; src = fetchurl { @@ -12093,8 +12075,6 @@ let doCheck = false; }; - PerlOSType = null; # part of Perl 5.26 - PerlTidy = buildPerlPackage rec { name = "Perl-Tidy-20180220"; src = fetchurl { @@ -12878,8 +12858,6 @@ let }; }; - PodUsage = null; # part of Perl 5.26 - PodWeaver = buildPerlPackage rec { name = "Pod-Weaver-4.015"; src = fetchurl { @@ -14465,10 +14443,6 @@ let }; }; - TermANSIColor = null; # part of Perl 5.26 - - TermCap = null; # part of Perl 5.26 - TermEncoding = buildPerlPackage { name = "Term-Encoding-0.02"; src = fetchurl { @@ -16535,8 +16509,6 @@ let }; }; - ThreadSemaphore = null; # part of Perl 5.26 - Throwable = buildPerlPackage rec { name = "Throwable-0.200013"; src = fetchurl { @@ -16950,8 +16922,6 @@ let }; }; - UnicodeNormalize = null; # part of Perl 5.26 - UnicodeString = buildPerlPackage rec { name = "Unicode-String-2.10"; src = fetchurl { @@ -17698,8 +17668,6 @@ let }; }; - XSLoader = null; # part of Perl 5.26 - XSObjectMagic = buildPerlPackage rec { name = "XS-Object-Magic-0.04"; src = fetchurl { @@ -17794,6 +17762,22 @@ let DigestSHA = null; "if" = null; TestSimple = null; + AttributeHandlers = null; # part of Perl 5.26 + base = null; # part of Perl 5.26 + CPANMeta = null; # part of Perl 5.26 + CPANMetaRequirements = null; # part of Perl 5.26 + CPANMetaYAML = null; # part of Perl 5.26 + DigestMD5 = null; # part of Perl 5.26 + LocaleMaketext = null; # part of Perl 5.26 + ModuleLoadConditional = null; # part of Perl 5.26 + ModuleMetadata = null; # part of Perl 5.26 + PerlOSType = null; # part of Perl 5.26 + PodUsage = null; # part of Perl 5.26 + TermANSIColor = null; # part of Perl 5.26 + TermCap = null; # part of Perl 5.26 + ThreadSemaphore = null; # part of Perl 5.26 + UnicodeNormalize = null; # part of Perl 5.26 + XSLoader = null; # part of Perl 5.26 ArchiveZip_1_53 = self.ArchiveZip; Autobox = self.autobox; From 19e7ae0fac348204ee6dedd85e9f1819e4ff4758 Mon Sep 17 00:00:00 2001 From: Red Davies Date: Tue, 2 Oct 2018 03:02:49 +0000 Subject: [PATCH 113/992] openspin: init at 2018-10-02 --- .../compilers/openspin/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/compilers/openspin/default.nix diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix new file mode 100644 index 000000000000..71bda3e03d96 --- /dev/null +++ b/pkgs/development/compilers/openspin/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "openspin-${version}"; + version = "unstable-2018-10-02"; + + src = fetchFromGitHub { + owner = "parallaxinc"; + repo = "OpenSpin"; + rev = "f3a587ed3e4f6a50b3c8d2022bbec5676afecedb"; + sha256 = "1knkbzdanb60cwp7mggymkhd0167lh2sb1c00d1vhw7s0s1rj96n"; + }; + + installPhase = '' + mkdir -p $out/bin + mv build/openspin $out/bin/openspin + ''; + + meta = with stdenv.lib; { + description = "Compiler for SPIN/PASM languages for Parallax Propeller MCU"; + homepage = https://github.com/parallaxinc/OpenSpin; + license = licenses.mit; + maintainers = [ maintainers.redvers ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd0bf1a76da8..d667b25e58be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6869,6 +6869,8 @@ with pkgs; openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; + openspin = callPackage ../development/compilers/openspin { }; + oraclejdk = pkgs.jdkdistro true false; oraclejdk8 = pkgs.oraclejdk8distro true false; From 3c94e4782f57ffe5d477cf4431f4aeee8d83c0f0 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 2 Oct 2018 00:34:42 +0900 Subject: [PATCH 114/992] linux_mptcp: 0.94 -> 0.94.1 Also introduce linux_mptcp_94 alias to prevent from overriding the wrong kernel when switching across branches. test --- pkgs/os-specific/linux/kernel/linux-mptcp.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 8014cb565267..7375daf61da5 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args: buildLinux (rec { - mptcpVersion = "0.94"; - modDirVersion = "4.14.24"; + mptcpVersion = "0.94.1"; + modDirVersion = "4.14.70"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; # autoModules= true; @@ -15,7 +15,7 @@ buildLinux (rec { owner = "multipath-tcp"; repo = "mptcp"; rev = "v${mptcpVersion}"; - sha256 = "01y3jf5awdxcv6vfpr30n0vaa8w1wgip0whiv88d610550299hkv"; + sha256 = "13mi672jr1x463kzig1hi9cpdi8x6nqdfd4bqlrjn8zca48f4ln4"; }; extraConfig = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b152a2e019ff..a76f5576de02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14067,8 +14067,8 @@ with pkgs; ]; }; - # linux mptcp is based on the 4.4 kernel - linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { + linux_mptcp = linux_mptcp_94; + linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.11" From 2125e07024ba75dda187e607739f13c4b9537415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Tue, 2 Oct 2018 09:22:57 +0200 Subject: [PATCH 115/992] slic3r-prusa3d: comments on why we apply some patches --- pkgs/applications/misc/slic3r/prusa3d.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 9f4036c3f967..f871b07b85c9 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -73,7 +73,15 @@ stdenv.mkDerivation rec { ]); prePatch = '' + # In nix ioctls.h isn't available from the standard kernel-headers package + # on other distributions. As the copy in glibc seems to be identical to the + # one in the kernel, we use that one instead. sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp + + # PERL_VENDORARCH and PERL_VENDORLIB aren't detected correctly by the build + # system, so we have to override them. Setting them as environment variables + # doesn't work though, so patching the paths directly in the CMakeLists.txt + # seems to be the easisest way. sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt ''; From ff0568380baf59e053ab1098f268b38be8bf22db Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 29 Sep 2018 20:55:28 -0500 Subject: [PATCH 116/992] coreutils: remove optionalString in postPatch no reason to make this part conditional --- pkgs/tools/misc/coreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 582f8d8f05f9..e94f255f7224 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; # The test tends to fail on btrfs and maybe other unusual filesystems. - postPatch = optionalString (!stdenv.hostPlatform.isDarwin) '' + postPatch = '' sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh From b068e220ff7b806e6015c3982853bf3deb8745e3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 29 Sep 2018 20:25:51 -0500 Subject: [PATCH 117/992] patch: use checkInputs instead of conditional This is more clear, to separate test dependencies. --- pkgs/tools/text/gnupatch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index e22850a63f01..238dba3a9f1e 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = stdenv.lib.optional doCheck ed; nativeBuildInputs = [ autoreconfHook ]; configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ @@ -31,6 +30,7 @@ stdenv.mkDerivation rec { ]; doCheck = stdenv.hostPlatform.libc != "musl"; # not cross; + checkInputs = [ed]; meta = { description = "GNU Patch, a program to apply differences to files"; From b85cb53c4d2c1ca2485f8bcc51a5a2cf041beaa6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Oct 2018 15:40:39 -0700 Subject: [PATCH 118/992] harfbuzz: 1.8.8 -> 1.9.0 (#47049) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/harfbuzz/versions --- 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 383f7f60f9bf..c45bc80fc394 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,7 +8,7 @@ }: let - version = "1.8.8"; + version = "1.9.0"; inherit (stdenv.lib) optional optionals optionalString; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "1ag3scnm1fcviqgx2p4858y433mr0ndqw6zccnccrqcr9mpcird8"; + sha256 = "004b4j812wgfv8pmcypyrlwrjfa6149lwpz5df6rnm5cy0msdv0i"; }; postPatch = '' From 2d759f2b0a67908b758473c2213c32a4f396b437 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Oct 2018 15:44:42 -0700 Subject: [PATCH 119/992] unbound: 1.7.3 -> 1.8.0 (#46938) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/unbound/versions --- pkgs/tools/networking/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index a009e76d9e0a..f26cef3e61d3 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.7.3"; + version = "1.8.0"; src = fetchurl { url = "https://unbound.net/downloads/${name}.tar.gz"; - sha256 = "c11de115d928a6b48b2165e0214402a7a7da313cd479203a7ce7a8b62cba602d"; + sha256 = "0gxqc4ynd2g1a5dwaazqh9n8injh49a7dz0l9bbxqgv47dnrvxvq"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB From bccd0faee40cbaf2839d71cfb48f3a27d0d8d015 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Oct 2018 02:11:17 +0200 Subject: [PATCH 120/992] nixos/thefuck: don't run thefuck on `environment.shellInit' The init script slightly differs depending on which shell is in use. So for bash it should be in the interactiveShellInit as well. In this case we don't need a mkIf as `bash` is enabled by default on NixOS. --- nixos/modules/programs/thefuck.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix index f4ae52934760..21ed6603c1bd 100644 --- a/nixos/modules/programs/thefuck.nix +++ b/nixos/modules/programs/thefuck.nix @@ -29,8 +29,8 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ thefuck ]; - environment.shellInit = initScript; + programs.bash.interactiveShellInit = initScript; programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript; programs.fish.interactiveShellInit = mkIf prg.fish.enable '' ${pkgs.thefuck}/bin/thefuck --alias | source From af08956950a3aa017d99fce8bb00ebbaa9e7b492 Mon Sep 17 00:00:00 2001 From: Free Potion <42352817+freepotion@users.noreply.github.com> Date: Wed, 3 Oct 2018 03:23:23 +0300 Subject: [PATCH 121/992] boohu: init at 0.10.0 --- pkgs/games/boohu/default.nix | 38 +++++++++++++++++++++++++++++++++ pkgs/games/boohu/deps.nix | 20 +++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 62 insertions(+) create mode 100644 pkgs/games/boohu/default.nix create mode 100644 pkgs/games/boohu/deps.nix diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix new file mode 100644 index 000000000000..6d4129edbd00 --- /dev/null +++ b/pkgs/games/boohu/default.nix @@ -0,0 +1,38 @@ +{stdenv, lib, fetchurl, buildGoPackage, ansiTag ? false}: + +buildGoPackage rec { + + name = if ansiTag then "boohu-ansi-${version}" else "boohu-${version}"; + version = "0.10.0"; + + goPackagePath = "git.tuxfamily.org/boohu/boohu.git"; + + src = fetchurl { + url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz"; + sha256 = "a4d1fc488cfeecbe0a5e9be1836d680951941014f926351692a8dbed9042eba6"; + }; + + goDeps = ./deps.nix; + + # If ansiTag is true, the "--tags ansi" will be passed + buildFlags = if ansiTag then "--tags ansi" else ""; + + # If ansiTag is true, binary output file name will be "boohu-ansi". + # Otherwise it will be "boohu". + postInstall = if ansiTag then "mv $bin/bin/boohu.git $bin/bin/boohu-ansi" + else "mv $bin/bin/boohu.git $bin/bin/boohu"; + + meta = with stdenv.lib; { + description = "A new roguelike game"; + longDescription = '' + Break Out Of Hareka's Underground (Boohu) is a roguelike game mainly + inspired from DCSS and its tavern, with some ideas from Brogue, but + aiming for very short games, almost no character building, and a + simplified inventory. + ''; + homepage = https://download.tuxfamily.org/boohu/index.html; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [freepotion]; + }; +} diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix new file mode 100644 index 000000000000..8b6b32811938 --- /dev/null +++ b/pkgs/games/boohu/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "b66b20ab708e289ff1eb3e218478302e6aec28ce"; + sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94a09120d7f7..e65d130dbc36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19808,6 +19808,10 @@ with pkgs; blobby = callPackage ../games/blobby { }; + boohu = callPackage ../games/boohu { }; + + boohu-ansi = callPackage ../games/boohu { ansiTag = true; }; + braincurses = callPackage ../games/braincurses { }; brogue = callPackage ../games/brogue { }; From ba02a2c3715e03329c143723c8c2c6b43fafd3a6 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 2 Oct 2018 22:53:48 -0400 Subject: [PATCH 122/992] Add Darwin as a supported platform --- .../libraries/science/math/mkl/default.nix | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 7412ecdba21d..930dcd87a635 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, writeText, fetchurl, rpm, cpio, openmp }: +{ stdenvNoCC, writeText, fetchurl, rpmextract, openmp, undmg }: stdenvNoCC.mkDerivation rec { name = "mkl-${version}"; @@ -6,24 +6,40 @@ stdenvNoCC.mkDerivation rec { date = "2019.0"; rel = "117"; - src = fetchurl { - url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_${version}.tgz"; - sha256 = "1bf7i54iqlf7x7fn8kqwmi06g30sxr6nq3ac0r871i6g0p3y47sf"; - }; + src = if stdenvNoCC.isDarwin + then + (fetchurl { + url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13565/m_mkl_${version}.dmg"; + sha256 = "1f1jppac7vqwn00hkws0p4njx38ajh0n25bsjyb5d7jcacwfvm02"; + }) + else + (fetchurl { + url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_${version}.tgz"; + sha256 = "1bf7i54iqlf7x7fn8kqwmi06g30sxr6nq3ac0r871i6g0p3y47sf"; + }); - buildInputs = [ rpm cpio ]; + buildInputs = if stdenvNoCC.isDarwin then [ undmg ] else [ rpmextract ]; propagatedBuildInputs = [ openmp ]; - buildPhase = '' - rpm2cpio rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm | cpio -idmv - rpm2cpio rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm | cpio -idmv - ''; + buildPhase = if stdenvNoCC.isDarwin then '' + for f in Contents/Resources/pkg/*.tgz; do + tar xzvf $f + done + '' else '' + rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm + rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm + '' ; - installPhase = '' - mkdir -p $out/lib - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/ - cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/ - cp license.txt $out/lib/ + installPhase = if stdenvNoCC.isDarwin then '' + mkdir -p $out/lib + cp -r compilers_and_libraries_${version}/mac/mkl/include $out/ + cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/ + '' else '' + mkdir -p $out/lib + cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/ + cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/ + cp license.txt $out/lib/ ''; # Per license agreement, do not modify the binary @@ -48,8 +64,8 @@ stdenvNoCC.mkDerivation rec { threading models. ''; homepage = https://software.intel.com/en-us/mkl; - license = licenses.issl; - platforms = [ "x86_64-linux" ]; + license = [ licenses.issl licenses.unfreeRedistributable ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bhipple ]; }; } From 1a3bd10f5a762524613b1d4eb96d277320bcaced Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 00:10:06 -0700 Subject: [PATCH 123/992] yoshimi: 1.5.8.2 -> 1.5.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/yoshimi/versions --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 65a3bbfdc011..d35c7b05a893 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.8.2"; + version = "1.5.9"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1kg7d6mnzdwzsqhrf7pmrf1hzgfpbpm5lv8xkaz32wiv391qrnxc"; + sha256 = "1nqwxwq6814m860zrh33r85vdyi2bgkvjg5372h3ngcdmxnb7wr0"; }; buildInputs = [ From db013c461841a1aeeb965522ecba34a301dc7a2b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 01:49:57 -0700 Subject: [PATCH 124/992] strongswan: 5.6.3 -> 5.7.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/strongswan/versions --- pkgs/tools/networking/strongswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index d176c08829e5..eac1ccb253fc 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "strongswan-${version}"; - version = "5.6.3"; + version = "5.7.1"; src = fetchurl { url = "https://download.strongswan.org/${name}.tar.bz2"; - sha256 = "095zg7h7qwsc456sqgwb1lhhk29ac3mk5z9gm6xja1pl061driy3"; + sha256 = "1v2b8lnqrkbc9hx3p2rw36xvphdy5ayy3dblm3kz98p24s8rqvq0"; }; dontPatchELF = true; From ced55630564bdc8abb69792aacdd5bd1d9f11e46 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 3 Oct 2018 12:59:07 +0200 Subject: [PATCH 125/992] opensm: 3.3.20 -> 3.3.21 Old git source repository was dead. Switched to GitHub --- pkgs/tools/networking/opensm/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index a053c82a8264..075ceff3555e 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, bison, flex, rdma-core }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }: stdenv.mkDerivation rec { name = "opensm-${version}"; - version = "3.3.20"; + version = "3.3.21"; - src = fetchgit { - url = git://git.openfabrics.org/~halr/opensm.git; - rev = name; - sha256 = "1hlrn5z32yd4w8bj4z6bsfv84pk178s4rnppbabyjqv1rg3c58wl"; + src = fetchFromGitHub { + owner = "linux-rdma"; + repo = "opensm"; + rev = "${version}"; + sha256 = "0iikw28vslxq3baq9qmmw08yay7l524wciz7dv7km09ylcbx23b7"; }; nativeBuildInputs = [ autoconf automake libtool bison flex ]; @@ -16,6 +17,8 @@ stdenv.mkDerivation rec { preConfigure = "bash ./autogen.sh"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Infiniband subnet manager"; homepage = https://www.openfabrics.org/; From 94f9b813c80340462e6ba2cc7b073803dc1004f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 04:14:01 -0700 Subject: [PATCH 126/992] pscircle: 1.0.0 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pscircle/versions --- pkgs/os-specific/linux/pscircle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index a334465fb71d..1efbd7bc2c9f 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pscircle-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitLab { owner = "mildlyparallel"; repo = "pscircle"; rev = "v${version}"; - sha256 = "188d0db62215pycmx2qfmbbjpmih03vigsz2j448zhsbyxapavv3"; + sha256 = "1sxdnhkcr26l29nk0zi1zkvkd7128xglfql47rdb1bx940vflgb6"; }; buildInputs = [ From 45d4712b712dbcd610fffeddfc2089e9fe933599 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 04:46:53 -0700 Subject: [PATCH 127/992] parallel: 20180822 -> 20180922 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/parallel/versions --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 11a9cd4ff87a..9da8b1c25522 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20180822"; + name = "parallel-20180922"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0jjs7fpvdjjb5v0j39a6k7hq9h5ap3db1j7vg1r2dq4swk23h9bm"; + sha256 = "07q7lzway2qf8mx6fb4q45jmirsc8pw6rgv03ifrp32jw3q8w1za"; }; nativeBuildInputs = [ makeWrapper ]; From 508c80c888aecf8493e1813212ef2959b037393a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 04:56:26 -0700 Subject: [PATCH 128/992] pcapfix: 1.1.2 -> 1.1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pcapfix/versions --- pkgs/tools/networking/pcapfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index 970844ea6d6d..5e3bf176b2c9 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcapfix-1.1.2"; + name = "pcapfix-1.1.3"; src = fetchurl { url = "https://f00l.de/pcapfix/${name}.tar.gz"; - sha256 = "0dl6pgqw6d8i5rhn6xwdx7sny16lpf771sn45c3p0l8z4mfzg6ay"; + sha256 = "0f9g6yh1dc7x1n28xs4lcwlk6sa3mpz0rbw0ddhajqidag2k07sr"; }; postPatch = ''sed -i "s|/usr|$out|" Makefile''; From 734cdd77b3e08947b20e17b0ade406808234caf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 05:26:46 -0700 Subject: [PATCH 129/992] packagekit: 1.1.10 -> 1.1.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/packagekit/versions --- pkgs/tools/package-management/packagekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 2acb39c0b732..5ba387a12f82 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.10"; + version = "1.1.11"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "PackageKit"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "11drd6ixx75q3w12am3z1npwllq1kxnhbxv0npng92c69kn291zs"; + sha256 = "0zr4b3ax8lcd3wkgj1cybs2cqf38br2nvl91qkw9g2jmzlq6bvic"; }; buildInputs = [ glib polkit python gobjectIntrospection vala_0_38 ] From 328144f5ade461e80467bc0b42cb0574fb17ae22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 06:00:44 -0700 Subject: [PATCH 130/992] nsd: 4.1.24 -> 4.1.25 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nsd/versions --- pkgs/servers/dns/nsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index ee09024dc0eb..5f330c4f06e2 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.24"; + name = "nsd-4.1.25"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "04ck8ia6xq1xqdk2g922262xywzd070pl4iad7c0lqclwk48gdjg"; + sha256 = "0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg"; }; prePatch = '' From ecd4fc5292f3a5bc5070a4dd4bb8f9cf7fa82fbf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 06:18:19 -0700 Subject: [PATCH 131/992] obs-studio: 22.0.2 -> 22.0.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/obs-studio/versions --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index cacad5a3e629..3bb8f31b9872 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -30,13 +30,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "22.0.2"; + version = "22.0.3"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "1bgp2lirpsbp54vvl3p345njlpgv0d78vac2aqwbl34wqx5sqdk0"; + sha256 = "0ri9qkqk3h71b1a5bwpjzqdr21bbmfqbykg48l779d20zln23n1i"; }; nativeBuildInputs = [ cmake From 2c54be7375f7e48a29439c383db07836229dcc01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 06:30:21 -0700 Subject: [PATCH 132/992] netsniff-ng: 0.6.4 -> 0.6.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/netsniff-ng/versions --- pkgs/tools/networking/netsniff-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 60f7b647eea5..8bebe973522b 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; - version = "0.6.4"; + version = "0.6.5"; # Upstream recommends and supports git src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; rev = "v${version}"; - sha256 = "0nip1gmzxq5kak41n0y0qzbhk2876fypk83q14ssy32fk49lxjly"; + sha256 = "0bcbdiik69g6jnravkkid8gxw2akg01i372msc5x1w9fh9wh2phw"; }; patches = [ ./glibc-2.26.patch ]; From aef6830d3e59d554dea2cb96c07326922cffe416 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 30 Sep 2018 12:56:02 +0200 Subject: [PATCH 133/992] rustc: 1.29.0 -> 1.29.1 From the changelog: - The standard library's `str::repeat` function contained an out of bounds write caused by an integer overflow. This has been fixed by deterministically panicking when an overflow happens. --- pkgs/development/compilers/rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 47415ac9177b..7d785093f9b3 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,11 +6,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.29.0"; - cargoVersion = "1.29.0"; + version = "1.29.1"; + cargoVersion = "1.29.1"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "1sb15znckj8pc8q3g7cq03pijnida6cg64yqmgiayxkzskzk9sx4"; + sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i"; }; in rec { rustc = callPackage ./rustc.nix { From 6ad43a0bce3603b25bcadb458d39701616d245f4 Mon Sep 17 00:00:00 2001 From: Edward Tate Date: Sun, 30 Sep 2018 16:03:35 +0200 Subject: [PATCH 134/992] buildRustPackage now correctly installs binaries to bin and libraries to lib. --- pkgs/build-support/rust/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 1d5de052f893..ec4514121c24 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -91,8 +91,10 @@ in stdenv.mkDerivation (args // { installPhase = args.installPhase or '' runHook preInstall - mkdir -p $out/bin - find target/release -maxdepth 1 -executable -type f -exec cp "{}" $out/bin \; + mkdir -p $out/bin $out/lib + find target/release -maxdepth 1 -type f -executable ! \( -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin + find target/release -maxdepth 1 -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib + rmdir --ignore-fail-on-non-empty $out/lib $out/bin runHook postInstall ''; From f8f932769700f617e8bf4771b0583283be41345f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 07:27:52 -0700 Subject: [PATCH 135/992] mkvtoolnix: 26.0.0 -> 27.0.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mkvtoolnix/versions --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 3f0fb0e8022c..7d9ce1ac453b 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "26.0.0"; + version = "27.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0dq0lbr6kzj455mv4z6a851n7ff3xlmsxklijiyp4drn1jf0q1pb"; + sha256 = "0pcf0bzs588p0a4j01jzcy5y9c4hiblz3kwfznn1sjcyxm552z6n"; }; nativeBuildInputs = [ From dbe2f0ba2371aaf2981dcd5e060e9a3a0e6e754a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 09:30:38 -0700 Subject: [PATCH 136/992] krita: 4.1.1 -> 4.1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/krita/versions --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 0abe90e0ba73..9aa80fc789c9 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.1.1"; + version = "4.1.3"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw"; + sha256 = "0d546dxs552z0pxnaka1jm7ksravw17f777wf593z0pl4ds8dgdx"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 6e58fb8309ed76ed7bc494400e4032a58e9b0f9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 10:03:27 -0700 Subject: [PATCH 137/992] libguestfs: 1.38.4 -> 1.38.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libguestfs/versions --- pkgs/development/libraries/libguestfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 6001946cb970..aad6365e4c2d 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -11,11 +11,11 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.38.4"; + version = "1.38.6"; src = fetchurl { url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; - sha256 = "1xsazw6yrbgmc647j8l896fzv534157sqmdzac09rxkxwiy0wm16"; + sha256 = "1v2mggx2jlaq4m3p5shc46gzf7vmaayha6r0nwdnyzd7x6q0is7p"; }; nativeBuildInputs = [ pkgconfig ]; From 997f9bfcc9ee3be0b682e4b41c2aa7818bcd101e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 10:11:49 -0700 Subject: [PATCH 138/992] libisoburn: 1.4.8 -> 1.5.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libisoburn/versions --- pkgs/development/libraries/libisoburn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index 6e7764176091..ce2028e805dc 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisoburn-${version}"; - version = "1.4.8"; + version = "1.5.0"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "19d53j17pn18vfxxqqlqwam5lm21ljyp8nai5434068g7x3m1kwi"; + sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs"; }; buildInputs = [ attr zlib libburn libisofs ]; From 6fb9152c7bd0c74adc83821de3772f6766a7d01d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 10:29:21 -0700 Subject: [PATCH 139/992] inadyn: 2.4 -> 2.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/inadyn/versions --- pkgs/tools/networking/inadyn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 8029415a98cf..47352d21c4a2 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "inadyn-${version}"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "1h24yavp1246zn5isypvxrilp6xj2266qr52w2r24qxicr8b320y"; + sha256 = "0izhynqfj4xafsrc653wym8arwps0qim203w8l0g5z9vzfxfnvqw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 0dd86a350d54a5bcdb6f8b969f18bd94e2275214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Tue, 2 Oct 2018 09:23:14 +0200 Subject: [PATCH 140/992] slic3r-prusa3d: 1.40.1 -> 1.41.0 --- pkgs/applications/misc/slic3r/prusa3d.nix | 36 ++++++++++++++++------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index f871b07b85c9..15517de3aed1 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, - glew, eigen, curl }: + glew, eigen, curl, gtest, nlopt, pcre, xorg }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { name = "Alien-wxWidgets-0.69"; @@ -33,22 +33,28 @@ let in stdenv.mkDerivation rec { name = "slic3r-prusa-edition-${version}"; - version = "1.40.1"; + version = "1.41.0"; enableParallelBuilding = true; - buildInputs = [ + nativeBuildInputs = [ cmake - curl - perl makeWrapper + ]; + + buildInputs = [ + curl eigen glew + pcre + perl tbb which Wx WxGLCanvas - ] ++ (with perlPackages; [ + xorg.libXdmcp + xorg.libpthreadstubs + ] ++ checkInputs ++ (with perlPackages; [ boost ClassXSAccessor EncodeLocale @@ -72,16 +78,24 @@ stdenv.mkDerivation rec { XMLSAX ]); + checkInputs = [ gtest ]; + + # The build system uses custom logic - defined in + # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - + # for finding the nlopt library, which doesn't pick up the package in the nix store. + # We need to set the path via the NLOPT environment variable instead. + NLOPT = "${nlopt}"; + prePatch = '' # In nix ioctls.h isn't available from the standard kernel-headers package # on other distributions. As the copy in glibc seems to be identical to the # one in the kernel, we use that one instead. sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp - # PERL_VENDORARCH and PERL_VENDORLIB aren't detected correctly by the build + # PERL_VENDORARCH and PERL_VENDORLIB aren't set correctly by the build # system, so we have to override them. Setting them as environment variables - # doesn't work though, so patching the paths directly in the CMakeLists.txt - # seems to be the easisest way. + # doesn't work though, so substituting the paths directly in CMakeLists.txt + # seems to be the easiest way. sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt ''; @@ -100,7 +114,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "Slic3r"; - sha256 = "022mdz8824wg68qwgd49gnplw7wn84hqw113xh8l25v3j1jb9zmc"; + sha256 = "1al60hrqbhl05dnsr99hzbmxmn26fyx19sc5zxv816x3q6px9n2d"; rev = "version_${version}"; }; @@ -108,7 +122,7 @@ stdenv.mkDerivation rec { description = "G-code generator for 3D printer"; homepage = https://github.com/prusa3d/Slic3r; license = licenses.agpl3; - platforms = platforms.linux; + platforms = subtractLists ["aarch64-linux"] platforms.linux; maintainers = with maintainers; [ tweber ]; }; } From bc39898d2e395f24033f233e94be7273ed63e727 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 11:02:30 -0700 Subject: [PATCH 141/992] help2man: 1.47.6 -> 1.47.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/help2man/versions --- pkgs/development/tools/misc/help2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 7e2dc49fe0f2..311b206fa910 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.6"; + name = "help2man-1.47.7"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0vz4dlrvy4vc6l7w0a7n668pfa0rdm73wr2gar58wqranyah46yr"; + sha256 = "03gckfr2980qn319c02vflq7d75vq2qdkxrw80kb9g84xn48wnsq"; }; nativeBuildInputs = [ gettext LocaleGettext ]; From add267531fc3e84978b1a75df7556e8a66d68b32 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 11:25:50 -0700 Subject: [PATCH 142/992] gnucash: 3.2 -> 3.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gnucash/versions --- pkgs/applications/office/gnucash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 63fda1e0e8be..683db389fedf 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { name = "gnucash-${version}"; - version = "3.2"; + version = "3.3"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "0li4b6pvlahgh5n9v91yxfgm972a1kky80xw3q1ggl4f2h6b1rb3"; + sha256 = "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3"; }; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; From bbf519200a946ccf1636e80e911c2812a8202d8b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 11:34:43 -0700 Subject: [PATCH 143/992] google-drive-ocamlfuse: 0.6.25 -> 0.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/google-drive-ocamlfuse/versions --- .../networking/google-drive-ocamlfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index ff099a909c75..abf67a3b0ac0 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; - version = "0.6.25"; + version = "0.7.0"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp"; + sha256 = "14r2y5blvid0640ixd0b4agpcfgkan5j9qdv3g0cn2q6ik39lfyl"; }; nativeBuildInputs = [ dune ]; From 136513655f92be4ef7e84b37f8465e0469ec208d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 11:41:55 -0700 Subject: [PATCH 144/992] hiredis: 0.13.3 -> 0.14.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hiredis/versions --- pkgs/development/libraries/hiredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 7ff8ed61cab3..0f68d7df2981 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hiredis-${version}"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "1qxiv61bsp6s847hhkxqj7vnbdlac089r2qdp3zgxhhckaflhb7r"; + sha256 = "0ik38lwpmm780jqrry95ckf6flmvd172444p3q8d1k9n99jwij9c"; }; PREFIX = "\${out}"; From d8b9bf558a21df7714f2106b21b95e3eb73adc13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 11:54:18 -0700 Subject: [PATCH 145/992] groonga: 8.0.6 -> 8.0.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/groonga/versions --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index c346d6bd37b7..861bd7fe5ed5 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.6"; + version = "8.0.7"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "1q00p02jprbsx2c6l3dnv2m04pzxlfag4j1pan0jlb4g3fvb20wf"; + sha256 = "040q525qdlxlypgs7jzklndshdvd5shzss67lcs6xhkbs0f977cc"; }; buildInputs = with stdenv.lib; From 5f91657ad10aec9776983bc6f927546b34755b04 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 3 Oct 2018 19:25:44 +0000 Subject: [PATCH 146/992] remove support for pre-5.26 Perl --- .../development/interpreters/perl/default.nix | 11 +- .../interpreters/perl/no-sys-dirs.patch | 250 ------------------ pkgs/development/libraries/hspell/default.nix | 2 +- .../perl-modules/generic/default.nix | 4 +- pkgs/servers/monitoring/munin/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 10 +- 6 files changed, 15 insertions(+), 264 deletions(-) delete mode 100644 pkgs/development/interpreters/perl/no-sys-dirs.patch diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index f2b900412081..cd8b2f263ddd 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -40,16 +40,15 @@ let disallowedReferences = [ stdenv.cc ]; patches = - [ ] - # Do not look in /usr etc. for dependencies. - ++ optional (versionOlder version "5.26") ./no-sys-dirs.patch - ++ optional (versionAtLeast version "5.26") ./no-sys-dirs-5.26.patch - ++ optional (versionAtLeast version "5.24") ( + [ + # Do not look in /usr etc. for dependencies. + ./no-sys-dirs-5.26.patch # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 - fetchurlBoot { + (fetchurlBoot { url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch"; sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0"; }) + ] ++ optional stdenv.isSunOS ./ld-shared.patch ++ optional stdenv.isDarwin ./cpp-precomp.patch ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch diff --git a/pkgs/development/interpreters/perl/no-sys-dirs.patch b/pkgs/development/interpreters/perl/no-sys-dirs.patch deleted file mode 100644 index 1793273a76f9..000000000000 --- a/pkgs/development/interpreters/perl/no-sys-dirs.patch +++ /dev/null @@ -1,250 +0,0 @@ -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure ---- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 -+++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 -@@ -106,15 +106,7 @@ - fi - - : Proper PATH setting --paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' --paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" --paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" --paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" --paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" --paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" --paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" --paths="$paths /sbin /usr/sbin /usr/libexec" --paths="$paths /system/gnu_library/bin" -+paths='' - - for p in $paths - do -@@ -1337,8 +1329,7 @@ - archname='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" --locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" -+locincpth="" - : - : no include file wanted by default - inclwanted='' -@@ -1349,17 +1340,12 @@ - - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 --xlibpth='/usr/lib/386 /lib/386' -+xlibpth='' - : Possible local library directories to search. --loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" --loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" -+loclibpth="" - - : general looking path for locating libraries --glibpth="/lib /usr/lib $xlibpth" --glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" --test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" --test -f /shlib/libc.so && glibpth="/shlib $glibpth" --test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" -+glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -@@ -1391,8 +1377,6 @@ - libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. --glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` --glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - -@@ -2446,7 +2430,6 @@ - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` --pth="$pth $sysroot/lib $sysroot/usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in -@@ -4936,7 +4919,7 @@ - : Set private lib path - case "$plibpth" in - '') if ./mips; then -- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" -+ plibpth="$incpath/usr/lib" - fi;; - esac - case "$libpth" in -@@ -8600,13 +8583,8 @@ - echo " " - case "$sysman" in - '') -- syspath='/usr/share/man/man1 /usr/man/man1' -- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -- syspath="$syspath /usr/man/u_man/man1" -- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -- sysman=`./loc . /usr/man/man1 $syspath` -+ syspath='' -+ sysman='' - ;; - esac - if $test -d "$sysman"; then -@@ -19900,9 +19878,10 @@ - case "$full_ar" in - '') full_ar=$ar ;; - esac -+full_ar=ar - - : Store the full pathname to the sed program for use in the C program --full_sed=$sed -+full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -Only in perl-5.20.0/: Configure.orig -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL ---- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 -+++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 -@@ -126,11 +126,7 @@ - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -- } elsif ($^O eq 'linux' && -- $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i -- # might be using, say, Intel's icc -- ) { -+ } elsif (0) { - # When cross-compiling we may store a path for gcc's "sysroot" option: - my $sysroot = $Config{sysroot} || ''; - # Some Linuxes have weird errno.hs which generate -Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh ---- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 -+++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 -@@ -119,21 +119,21 @@ - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -- libpth="/usr/lib/aout /usr/local/lib /usr/lib" -- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" -+ libpth="" -+ glibpth="" - fi - lddlflags='-Bshareable' - else -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi - cccdlflags='-DPIC -fPIC' - ;; - *) -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - cccdlflags='-DPIC -fPIC' -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh ---- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 -+++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 -@@ -150,25 +150,6 @@ - ;; - esac - --# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries --# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us --# where to look. We don't want gcc's own libraries, however, so we --# filter those out. --# This could be conditional on Unbuntu, but other distributions may --# follow suit, and this scheme seems to work even on rather old gcc's. --# This unconditionally uses gcc because even if the user is using another --# compiler, we still need to find the math library and friends, and I don't --# know how other compilers will cope with that situation. --# Morever, if the user has their own gcc earlier in $PATH than the system gcc, --# we don't want its libraries. So we try to prefer the system gcc --# Still, as an escape hatch, allow Configure command line overrides to --# plibpth to bypass this check. --if [ -x /usr/bin/gcc ] ; then -- gcc=/usr/bin/gcc --else -- gcc=gcc --fi -- - case "$plibpth" in - '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | - cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` -@@ -178,32 +159,6 @@ - ;; - esac - --case "$libc" in --'') --# If you have glibc, then report the version for ./myconfig bug reporting. --# (Configure doesn't need to know the specific version since it just uses --# gcc to load the library for all tests.) --# We don't use __GLIBC__ and __GLIBC_MINOR__ because they --# are insufficiently precise to distinguish things like --# libc-2.0.6 and libc-2.0.7. -- for p in $plibpth -- do -- for trylib in libc.so.6 libc.so -- do -- if $test -e $p/$trylib; then -- libc=`ls -l $p/$trylib | awk '{print $NF}'` -- if $test "X$libc" != X; then -- break -- fi -- fi -- done -- if $test "X$libc" != X; then -- break -- fi -- done -- ;; --esac -- - # Are we using ELF? Thanks to Kenneth Albanowski - # for this test. - cat >try.c <<'EOM' -@@ -367,33 +322,6 @@ - ;; - esac - --# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than --# true libraries. The scripts cause binding against static --# version of -lgdbm which is a bad idea. So if we have 'nm' --# make sure it can read the file --# NI-S 2003/08/07 --case "$nm" in -- '') ;; -- *) -- for p in $plibpth -- do -- if $test -r $p/libndbm.so; then -- if $nm $p/libndbm.so >/dev/null 2>&1 ; then -- echo 'Your shared -lndbm seems to be a real library.' -- _libndbm_real=1 -- break -- fi -- fi -- done -- if $test "X$_libndbm_real" = X; then -- echo 'Your shared -lndbm is not a real library.' -- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` -- shift -- libswanted="$*" -- fi -- ;; --esac -- - # Linux on Synology. - if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then - # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 20dda589b9cc..874d492f19dc 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.1"; }; - PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1"; + PERL_USE_UNSAFE_INC = "1"; src = fetchurl { url = "${meta.homepage}${name}.tar.gz"; diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 1d7e6d17ffb7..a44c7ac6568b 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation ( # current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC - PERL_USE_UNSAFE_INC = lib.optionalString (lib.versionAtLeast (lib.getVersion perl) "5.26") "1"; + PERL_USE_UNSAFE_INC = "1"; meta.homepage = "https://metacpan.org/release/${(builtins.parseDrvName name).name}"; } @@ -33,7 +33,7 @@ stdenv.mkDerivation ( ) // { - name = "perl${lib.getVersion perl}-${name}"; + name = "perl${perl.version}-${name}"; builder = ./builder.sh; nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ]; inherit perl; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 2fec42edff33..72d5f124c63d 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; # needs to find a local perl module during build - PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1"; + PERL_USE_UNSAFE_INC = "1"; # TODO: tests are failing http://munin-monitoring.org/ticket/1390#comment:1 # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94a801e4e816..2d01fa234b59 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7,6 +7,8 @@ {config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}: +# cpan2nix assumes that perl-packages.nix will be used only with perl 5.26 or above +assert stdenv.lib.versionAtLeast perl.version "5.26"; let inherit (stdenv.lib) maintainers; self = _self // overrides; @@ -1857,7 +1859,7 @@ let url = "mirror://cpan/authors/id/J/JS/JSWARTZ/${name}.tar.gz"; sha256 = "c7f1a2b3570a8fede484e933f89ba1729e0abd05935791d146c522dd120ee851"; }; - preConfigure = stdenv.lib.optionalString (stdenv.lib.versionAtLeast perl.version "5.26") '' + preConfigure = '' # fix error 'Unescaped left brace in regex is illegal here in regex' substituteInPlace lib/CHI/t/Driver/Subcache/l1_cache.pm --replace 'qr/CHI stats: {' 'qr/CHI stats: \{' ''; @@ -2095,7 +2097,7 @@ let url = "mirror://cpan/authors/id/E/EV/EVO/${name}.tar.gz"; sha256 = "0ricb0mn0i06ngfhq5y035yx8i7ahlx83yyqwixqmv6hg4p79b5c"; }; - preConfigure = stdenv.lib.optionalString (stdenv.lib.versionAtLeast perl.version "5.26") '' + preConfigure = '' # fix error 'Unescaped left brace in regex is illegal here in regex' substituteInPlace tests/xemulator/class_methodmaker/Test.pm --replace 's/(TEST\s{)/$1/g' 's/(TEST\s\{)/$1/g' ''; @@ -14825,7 +14827,7 @@ let meta = { description = "Aggregate C<*.t> tests to make them run faster"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.lib.versionAtLeast perl.version "5.26"; # This module only works with Test::More version < 1.3, but you have 1.302133 + broken = true; # This module only works with Test::More version < 1.3, but you have 1.302133 }; }; @@ -16951,7 +16953,7 @@ let meta = { description = "Turns ref() into a multimethod"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - broken = stdenv.lib.versionAtLeast perl.version "5.26"; # 'OP {aka struct op}' has no member named 'op_sibling' + broken = true; # 'OP {aka struct op}' has no member named 'op_sibling' }; }; From cddea0fdc0bb612e55b55f5cd5ff11993a80c146 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 12:33:14 -0700 Subject: [PATCH 147/992] cl: 1.2.3 -> 1.2.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cl/versions --- pkgs/development/libraries/cl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 7cb75d8de0f3..1890d2b25a0d 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { - version = "1.2.3"; + version = "1.2.4"; name = "cl-${version}"; src = fetchFromGitHub { owner = "tonyrog"; repo = "cl"; rev = "cl-${version}"; - sha256 = "1dk0k03z0ipxvrnn0kihph135hriw96jpnd31lbq44k6ckh6bm03"; + sha256 = "1gwkjl305a0231hz3k0w448dsgbgdriaq764sizs5qfn59nzvinz"; }; buildInputs = [ erlang rebar opencl-headers ocl-icd ]; From fc2a97dea9e94157b13c0afd8f246250ee71773b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 13:00:39 -0700 Subject: [PATCH 148/992] dico: 2.6 -> 2.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dico/versions --- pkgs/servers/dico/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index 76a3f51caa2e..0e4c392c7a3e 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -2,11 +2,11 @@ , guile, python, pcre, libffi, groff }: stdenv.mkDerivation rec { - name = "dico-2.6"; + name = "dico-2.7"; src = fetchurl { url = "mirror://gnu/dico/${name}.tar.xz"; - sha256 = "0zmi041gv5nd5fmyzgdrgrsy2pvjaq9p8dvvhxwi842hiyng5b7i"; + sha256 = "0dg4aacnmlf3ljssd7dwh8z5644xzq8k1501mbsx8nz8p8a9mbsq"; }; hardeningDisable = [ "format" ]; From 8a7cf66ed0ad36dc271ca61d1127501a26158d06 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 3 Oct 2018 20:34:04 +0000 Subject: [PATCH 149/992] remove support for pre-5.26 Perl --- pkgs/development/interpreters/perl/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index cd8b2f263ddd..6caf423aa35c 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -50,8 +50,7 @@ let }) ] ++ optional stdenv.isSunOS ./ld-shared.patch - ++ optional stdenv.isDarwin ./cpp-precomp.patch - ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch + ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] ++ optional crossCompiling ./MakeMaker-cross.patch; postPatch = '' From 6b143f9002b576bee9b58d7560d889c7c1430408 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 13:53:55 -0700 Subject: [PATCH 150/992] cpp-hocon: 0.1.7 -> 0.2.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cpp-hocon/versions --- pkgs/development/libraries/cpp-hocon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 1f4b43db16c3..f08077a9a3cf 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { - sha256 = "0mfpz349c3arihvngw1a1gfhwlcw6wiwyc44bghjx1q109w7wm1m"; + sha256 = "084vsn080z8mp5s54jaq0qdwlx0p62nbw1i0rffkag477h8vq68i"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; From c9c9f18f93152e5862800dbb7babf5896b1f6918 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 15:45:54 -0700 Subject: [PATCH 151/992] audacity: 2.2.2 -> 2.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/audacity/versions --- pkgs/applications/audio/audacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 1989fd1400d4..fc32eb799cf9 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.2"; + version = "2.3.0"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km"; + sha256 = "0pi7ksm8hfvwbn580z4kkc55sbaylrrr7v08s04dmdgfvil7y4ip"; }; preConfigure = /* we prefer system-wide libs */ '' From 40ea9c71435fee58d1b09dbf61b1256e2fc8ba62 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 15:53:06 -0700 Subject: [PATCH 152/992] alfred: 2018.2 -> 2018.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alfred/versions --- pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index cc632db160f2..605334e12a10 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2018.2"; + ver = "2018.3"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0640p9zy1511pl30i5yybqa0s1yqz83291vw1z22jrcsq57rrgib"; + sha256 = "06lbyac0w48jkxpji9pgkxnwcrwbzs2dwzfgw2vfr1lix6ivhrb2"; }; nativeBuildInputs = [ pkgconfig ]; From 3b32efff7ed3c19ea636e627d1b24df4d2340603 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 4 Oct 2018 02:26:00 +0200 Subject: [PATCH 153/992] WIP liquidsoap update --- pkgs/tools/audio/liquidsoap/full.nix | 40 +++++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index eb544fc693e4..7d3b899048f7 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -4,10 +4,12 @@ , libsamplerate, libmad, taglib, lame, libogg , libvorbis, speex, libtheora, libopus, fdk_aac , faad2, flac, ladspaH, ffmpeg, frei0r, dssi -, }: +, autoconf, automake, libtool +}: let - version = "1.1.1"; + pname = "liquidsoap"; + version = "1.3.4"; packageFilters = map (p: "-e '/ocaml-${p}/d'" ) [ "gstreamer" "shine" "aacplus" "schroedinger" @@ -15,16 +17,39 @@ let ]; in stdenv.mkDerivation { - name = "liquidsoap-full-${version}"; + name = "${pname}-full-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/savonet/liquidsoap/${version}/liquidsoap-${version}-full.tar.gz"; - sha256 = "1w1grgja5yibph90vsxj7ffkpz1sgzmr54jj52s8889dpy609wqa"; + url = "https://github.com/savonet/${pname}/releases/download/${version}/${pname}-${version}-full.tar.bz2"; + sha256 = "11l1h42sljfxcdhddc8klya4bk99j7a1pndwnzvscb04pvmfmlk0"; }; - preConfigure = "sed ${toString packageFilters} PACKAGES.default > PACKAGES"; + preConfigure = /* we prefer system-wide libs */ '' + sed -i "s|gsed|sed|" Makefile + make bootstrap + # autoreconf -vi # use system libraries + + sed ${toString packageFilters} PACKAGES.default > PACKAGES + ''; + configureFlags = [ "--localstatedir=/var" ]; + # liquidsoap only looks for lame and ffmpeg at runtime, so we need to link them in manually + NIX_LDFLAGS = [ + # # LAME + # # "-lmp3lame" + # # ffmpeg + # "-lavcodec" + # "-lavdevice" + # "-lavfilter" + # "-lavformat" + "-lavresample" + # "-lavutil" + # "-lpostproc" + # "-lswresample" + "-lswscale" + ]; + buildInputs = [ which ocamlPackages.ocaml ocamlPackages.findlib pkgconfig libao portaudio alsaLib libpulseaudio libjack2 @@ -33,8 +58,11 @@ stdenv.mkDerivation { faad2 flac ladspaH ffmpeg frei0r dssi ocamlPackages.xmlm ocamlPackages.ocaml_pcre ocamlPackages.camomile + # autoconf automake libtool ]; + hardeningDisable = [ "format" "fortify" ]; + meta = with stdenv.lib; { description = "Swiss-army knife for multimedia streaming"; homepage = http://liquidsoap.fm/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 827e430a7282..fcf20c6e0cab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3582,7 +3582,7 @@ with pkgs; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg_2; - ocamlPackages = ocaml-ng.ocamlPackages_4_02; + # ocamlPackages = ocaml-ng.ocamlPackages_4_03; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; From 3b685ee5171416ef322f244187ec9bee01faa358 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 13 Sep 2018 17:43:31 +0200 Subject: [PATCH 154/992] xpra: modernize Port to Python 3 and GTK+ 3. --- pkgs/tools/X11/xpra/default.nix | 64 +++++++++++++++-------------- pkgs/tools/X11/xpra/fix-paths.patch | 33 +++++++++++++++ 2 files changed, 66 insertions(+), 31 deletions(-) create mode 100644 pkgs/tools/X11/xpra/fix-paths.patch diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 915144daa908..4df793c5b166 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, callPackage, python2Packages, pkgconfig -, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk -, makeWrapper, xorgserver, getopt, xauth, utillinux, which +{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig +, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk +, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which , ffmpeg, x264, libvpx, libwebp , libfakeXinerama , gst_all_1, pulseaudio, gobjectIntrospection @@ -9,7 +9,7 @@ with lib; let - inherit (python2Packages) cython buildPythonApplication; + inherit (python3.pkgs) cython buildPythonApplication; xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { @@ -21,7 +21,14 @@ in buildPythonApplication rec { sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"; }; - nativeBuildInputs = [ pkgconfig ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit (xorg) xkeyboardconfig; + }) + ]; + + nativeBuildInputs = [ pkgconfig gobjectIntrospection wrapGAppsHook ]; buildInputs = [ cython @@ -30,11 +37,10 @@ in buildPythonApplication rec { xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage xorg.libXrandr xorg.libxkbfile - pango cairo gdk_pixbuf atk gtk2 glib + pango cairo gdk_pixbuf atk gtk3 glib ffmpeg libvpx x264 libwebp - gobjectIntrospection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -42,38 +48,34 @@ in buildPythonApplication rec { gst_all_1.gst-libav pam - - makeWrapper ]; - propagatedBuildInputs = with python2Packages; [ - pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python - netifaces numpy websockify pygobject3 gst-python pam + propagatedBuildInputs = with python3.pkgs; [ + pillow rencode pycrypto cryptography pycups lz4 dbus-python + netifaces numpy websockify pygobject3 pycairo gst-python pam ]; - preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" - substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so" - substituteInPlace xpra/x11/bindings/keyboard_bindings.pyx --replace "/usr/share/X11/xkb" "${xorg.xkeyboardconfig}/share/X11/xkb" - ''; - setupPyBuildFlags = ["--with-Xdummy" "--without-strict"]; + NIX_CFLAGS_COMPILE = [ + # error: 'import_cairo' defined but not used + "-Wno-error=unused-function" + ]; - postInstall = '' - wrapProgram $out/bin/xpra \ - --set XPRA_INSTALL_PREFIX "$out" \ - --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ - --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ + setupPyBuildFlags = [ + "--with-Xdummy" + "--without-strict" + "--with-gtk3" + "--without-gtk2" + ]; + + preFixup = '' + gappsWrapperArgs+=( + --set XPRA_INSTALL_PREFIX "$out" + --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]} + ) ''; - preCheck = "exit 0"; - - #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though - #postFixup = '' - # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra - # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra - #''; + doCheck = false; passthru = { inherit xf86videodummy; }; diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch new file mode 100644 index 000000000000..c50ec28c35e2 --- /dev/null +++ b/pkgs/tools/X11/xpra/fix-paths.patch @@ -0,0 +1,33 @@ +--- a/setup.py ++++ b/setup.py +@@ -1885,7 +1885,7 @@ + if OSX: + pycairo = "py3cairo" + else: +- pycairo = "pycairo" ++ pycairo = "py3cairo" + cython_add(Extension("xpra.client.gtk3.cairo_workaround", + ["xpra/client/gtk3/cairo_workaround.pyx"], + **pkgconfig(pycairo) +--- a/xpra/client/gtk3/cairo_workaround.pyx ++++ b/xpra/client/gtk3/cairo_workaround.pyx +@@ -65,7 +65,7 @@ + void cairo_surface_flush (cairo_surface_t *surface) + void cairo_surface_mark_dirty (cairo_surface_t *surface) + +-cdef extern from "pycairo/pycairo.h": ++cdef extern from "py3cairo.h": + ctypedef struct Pycairo_CAPI_t: + pass + ctypedef struct PycairoSurface: +--- a/xpra/x11/bindings/keyboard_bindings.pyx ++++ b/xpra/x11/bindings/keyboard_bindings.pyx +@@ -19,7 +19,7 @@ + + DEF PATH_MAX = 1024 + DEF DFLT_XKB_RULES_FILE = "base" +-DEF DFLT_XKB_CONFIG_ROOT = "/usr/share/X11/xkb" ++DEF DFLT_XKB_CONFIG_ROOT = "@xkeyboardconfig@/share/X11/xkb" + + ################################### + # Headers, python magic From d4d87b049ba127df57bdb03bc9d960fac964a5a1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 13 Sep 2018 17:45:42 +0200 Subject: [PATCH 155/992] xpraGtk3: point to xpra xpra now uses GTK 3 --- pkgs/tools/X11/xpra/gtk3.nix | 79 --------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 pkgs/tools/X11/xpra/gtk3.nix diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix deleted file mode 100644 index ceba4269e808..000000000000 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl, buildPythonApplication -, python, cython, pkgconfig -, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection -, makeWrapper, xorgserver, getopt, xauth, utillinux, which, fontsConf -, ffmpeg, x264, libvpx, libwebp -, libfakeXinerama, pam }: - -buildPythonApplication rec { - name = "xpra-${version}"; - version = "2.2.5"; - - src = fetchurl { - url = "https://xpra.org/src/${name}.tar.xz"; - sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"; - }; - - patchPhase = '' - substituteInPlace setup.py --replace 'pycairo' 'py3cairo' - substituteInPlace xpra/client/gtk3/cairo_workaround.pyx --replace 'pycairo/pycairo.h' 'py3cairo.h' - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto - xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto - xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage - xorg.libXrandr xorg.libxkbfile - - pango cairo gdk_pixbuf atk gtk3 glib gobjectIntrospection - - ffmpeg libvpx x264 libwebp - - makeWrapper - - pam - ]; - - propagatedBuildInputs = [ - pygobject3 pycairo cython - ]; - - preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)" - substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so" - ''; - setupPyBuildFlags = [ "--without-strict" "--with-gtk3" "--without-gtk2" "--with-Xdummy" ]; - - preInstall = '' - # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix - ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out - sed -i '/ = data_files/d' setup.py - ''; - - postInstall = '' - wrapProgram $out/bin/xpra \ - --set FONTCONFIG_FILE "${fontsConf}" \ - --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ - --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]} - ''; - - preCheck = "exit 0"; - doInstallCheck = false; - - #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though - #postFixup = '' - # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra - # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra - #''; - - - meta = with stdenv.lib; { - homepage = http://xpra.org/; - downloadPage = "https://xpra.org/src/"; - downloadURLRegexp = "xpra-.*[.]tar[.]xz$"; - description = "Persistent remote applications for X"; - platforms = platforms.linux; - license = licenses.gpl2; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92a0f2b45709..114902af920f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -310,6 +310,7 @@ mapAliases ({ xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 + xpraGtk3 = xpra; # added 2018-09-13 youtubeDL = youtube-dl; # added 2014-10-26 # added 2017-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 827e430a7282..330498375e05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19681,8 +19681,6 @@ with pkgs; xpra = callPackage ../tools/X11/xpra { }; libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { }; - #TODO: 'pil' is not available for python3, yet - xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; }; xrectsel = callPackage ../tools/X11/xrectsel { }; From 7b7186d07b1ceeee0763411ca855e7f2a374b19c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 4 Oct 2018 04:35:27 +0200 Subject: [PATCH 156/992] tambura: init at 1.0 --- pkgs/applications/audio/tambura/default.nix | 34 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/audio/tambura/default.nix diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix new file mode 100644 index 000000000000..a739d72898e2 --- /dev/null +++ b/pkgs/applications/audio/tambura/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + pname = "Tambura"; + name = "${pname}-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "olilarkin"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + buildPhase = '' + faust2jaqt -vec -time -t 99999 ${pname}.dsp + faust2lv2 -vec -time -gui -t 99999 ${pname}.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp ${pname} $out/bin/ + mkdir -p $out/lib/lv2 + cp -r ${pname}.lv2/ $out/lib/lv2 + ''; + + meta = with stdenv.lib; { + description = "A FAUST patch inspired by the Indian Tambura/Tanpura - a four string drone instrument, known for its unique rich harmonic timbre"; + homepage = https://github.com/olilarkin/Tambura; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 827e430a7282..f8b7f1a57ecb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18929,6 +18929,8 @@ with pkgs; gconf = gnome2.GConf; }; + tambura = callPackage ../applications/audio/tambura { }; + teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; From 3768c3a62d4f7468c20302ecc28b5281b3e990b2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 21:44:10 -0700 Subject: [PATCH 157/992] aubio: 0.4.6 -> 0.4.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/aubio/versions --- pkgs/development/libraries/aubio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index adcb86cedf84..8c8fe25f5000 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "aubio-0.4.6"; + name = "aubio-0.4.7"; src = fetchurl { url = "https://aubio.org/pub/${name}.tar.bz2"; - sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx"; + sha256 = "0hd0kzfmr46am00ygxar8alrldv92c5azqy701iilfmbqpz4mvfb"; }; nativeBuildInputs = [ pkgconfig python ]; From e5c5eae9288ffe81dca1b8493cb34304811430ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 23:16:00 -0700 Subject: [PATCH 158/992] buildbot-worker: 1.3.0 -> 1.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/buildbot-worker/versions --- pkgs/development/tools/build-managers/buildbot/worker.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index cffcb594a0d2..4fabad9d3701 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "1.3.0"; + version = "1.4.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1l9iqyqn9yln6ln6dhfkngzx92a61v1cf5ahqj4ax663i02yq7fh"; + sha256 = "12zvf4c39b6s4g1f2w407q8kkw602m88rc1ggi4w9pkw3bwbxrgy"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; From 0b82df8dbe8540eb8a3acc7ff093ea872ae131a8 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 4 Oct 2018 02:24:21 +0000 Subject: [PATCH 159/992] Convert entire mkl package to a fixed-output derivation --- .../libraries/science/math/mkl/default.nix | 36 +++++++++++++------ pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 930dcd87a635..37814047f975 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,20 @@ -{ stdenvNoCC, writeText, fetchurl, rpmextract, openmp, undmg }: +{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg }: +/* + Some (but not all) mkl functions require openmp, but Intel does not add these + to SO_NEEDED and instructs users to put openmp on their LD_LIBRARY_PATH. If + you are using mkl and your library/application is using some of the functions + that require openmp, add a setupHook like this to your package: + + setupHook = writeText "setup-hook.sh" '' + addOpenmp() { + addToSearchPath LD_LIBRARY_PATH ${openmp}/lib + } + addEnvHooks "$targetOffset" addOpenmp + ''; + + We do not add the setup hook here, because avoiding it allows this large + package to be a fixed-output derivation with better cache efficiency. + */ stdenvNoCC.mkDerivation rec { name = "mkl-${version}"; @@ -19,7 +35,6 @@ stdenvNoCC.mkDerivation rec { }); buildInputs = if stdenvNoCC.isDarwin then [ undmg ] else [ rpmextract ]; - propagatedBuildInputs = [ openmp ]; buildPhase = if stdenvNoCC.isDarwin then '' for f in Contents/Resources/pkg/*.tgz; do @@ -28,7 +43,7 @@ stdenvNoCC.mkDerivation rec { '' else '' rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm - '' ; + ''; installPhase = if stdenvNoCC.isDarwin then '' mkdir -p $out/lib @@ -46,14 +61,13 @@ stdenvNoCC.mkDerivation rec { dontStrip = true; dontPatchELF = true; - # Some mkl calls require openmp, but Intel does not add these to SO_NEEDED and - # instructs users to put openmp on their LD_LIBRARY_PATH. - setupHook = writeText "setup-hook.sh" '' - addOpenmp() { - addToSearchPath LD_LIBRARY_PATH ${openmp}/lib - } - addEnvHooks "$targetOffset" addOpenmp - ''; + # Since these are unmodified binaries from Intel, they do not depend on stdenv + # and we can make them fixed-output derivations for cache efficiency. + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = if stdenvNoCC.isDarwin + then "1224dln7n8px1rk8biiggf77wjhxh8mzw0hd8zlyjm8i6j8w7i12" + else "0d8ai0wi8drp071acqkm1wv6vyg12010y843y56zzi1pql81xqvx"; meta = with stdenvNoCC.lib; { description = "Intel Math Kernel Library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9eb92364af2..cba1fa778d68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20858,9 +20858,7 @@ with pkgs; m4rie = callPackage ../development/libraries/science/math/m4rie { }; - mkl = callPackage ../development/libraries/science/math/mkl { - inherit (llvmPackages) openmp; - }; + mkl = callPackage ../development/libraries/science/math/mkl { }; nasc = callPackage ../applications/science/math/nasc { }; From 1bc29400c665acf77b628f7fe1d076225e4ae478 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Oct 2018 01:03:53 +0200 Subject: [PATCH 160/992] FIL-plugins: init at 0.3.0 --- .../audio/FIL-plugins/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/audio/FIL-plugins/default.nix diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix new file mode 100644 index 000000000000..b9322c37df00 --- /dev/null +++ b/pkgs/applications/audio/FIL-plugins/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, ladspaH +}: + +stdenv.mkDerivation rec { + name = "FIL-plugins-${version}"; + version = "0.3.0"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw"; + }; + + buildInputs = [ ladspaH ]; + + patchPhase = '' + sed -i 's@/usr/bin/install@install@g' Makefile + sed -i 's@/bin/rm@rm@g' Makefile + sed -i 's@/usr/lib/ladspa@$(out)/lib/ladspa@g' Makefile + ''; + + preInstall="mkdir -p $out/lib/ladspa"; + + meta = { + description = ''a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed''; + longDescription = '' + Each section has an active/bypass switch, frequency, bandwidth and gain controls. + There is also a global bypass switch and gain control. + The 2nd order resonant filters are implemented using a Mitra-Regalia style lattice filter. + All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises. + This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use. + ''; + version = "${version}"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77c4e3972bef..072b873d703e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16424,6 +16424,8 @@ with pkgs; fig2dev = callPackage ../applications/graphics/fig2dev { }; + FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; + flacon = callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; From 8d37a5a99afc12ab21dfc9456d30bfdc9ce1a1d9 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Oct 2018 02:38:33 +0200 Subject: [PATCH 161/992] eteroj.lv2: init at 0.4.0 --- .../applications/audio/eteroj.lv2/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/eteroj.lv2/default.nix diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix new file mode 100644 index 000000000000..28e4879efdc0 --- /dev/null +++ b/pkgs/applications/audio/eteroj.lv2/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuv, lv2 }: + +stdenv.mkDerivation rec { + pname = "eteroj.lv2"; + version = "0.4.0"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "OpenMusicKontrollers"; + repo = pname; + rev = version; + sha256 = "0lzdk7hlz3vqgshrfpj0izjad1fmsnzk2vxqrry70xgz8xglvnmn"; + }; + + buildInputs = [ libuv lv2 ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; + homepage = https://open-music-kontrollers.ch/lv2/eteroj; + license = licenses.artistic2; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77c4e3972bef..4e5b5505ffca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16375,6 +16375,8 @@ with pkgs; eterm = callPackage ../applications/misc/eterm { }; + eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; + etherape = callPackage ../applications/networking/sniffers/etherape { }; evilvte = callPackage ../applications/misc/evilvte { From 4babe7f799e826a040869728a0be56c68071c0ea Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Fri, 5 Oct 2018 01:28:42 -0400 Subject: [PATCH 162/992] haskell: re-enable aarch64, but disable parallel builds on that arch. This is a workaround for unreliable parallel Haskell builds on aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449 --- pkgs/development/compilers/ghc/8.2.1-binary.nix | 3 +-- pkgs/development/compilers/ghc/8.2.2.nix | 3 ++- pkgs/development/compilers/ghc/8.4.3.nix | 3 ++- pkgs/development/compilers/ghc/8.6.1.nix | 3 ++- pkgs/development/haskell-modules/generic-builder.nix | 4 +++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index bfb9c4cd6164..6caeaf20f64c 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -169,6 +169,5 @@ stdenv.mkDerivation rec { }; meta.license = stdenv.lib.licenses.bsd3; - # AArch64 should work in theory but eventually some builds start segfaulting - meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" /* "aarch64-linux" */]; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"]; } diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index b548b05339e4..8c3012f881c6 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -88,7 +88,8 @@ stdenv.mkDerivation (rec { sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; }; - enableParallelBuilding = true; + # https://ghc.haskell.org/trac/ghc/ticket/15449 + enableParallelBuilding = !buildPlatform.isAarch64; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index e43f9a57d0a4..7cd7494df050 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -90,7 +90,8 @@ stdenv.mkDerivation (rec { sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf"; }; - enableParallelBuilding = true; + # https://ghc.haskell.org/trac/ghc/ticket/15449 + enableParallelBuilding = !buildPlatform.isAarch64; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 62ea39791b90..a2be9d255713 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -86,7 +86,8 @@ stdenv.mkDerivation (rec { sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c"; }; - enableParallelBuilding = true; + # https://ghc.haskell.org/trac/ghc/ticket/15449 + enableParallelBuilding = !buildPlatform.isAarch64; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a3426f4e249d..4c17581f9d51 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -48,7 +48,9 @@ in # We cannot enable -j parallelism for libraries because GHC is far more # likely to generate a non-determistic library ID in that case. Further # details are at . -, enableParallelBuilding ? (stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version +# +# Currently disabled for aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449. +, enableParallelBuilding ? ((stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version) && !(stdenv.buildPlatform.isAarch64) , maintainers ? [] , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) From 858b263bf0f9844d6924c0af4ffc690af2fb4496 Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Fri, 5 Oct 2018 13:14:45 +0700 Subject: [PATCH 163/992] nixos: correct improper uses of mkEnableOption, clarify service descriptions Several service definitions used `mkEnableOption` with text starting with "Whether to", which produced funny option descriptions like "Whether to enable Whether to run the rspamd daemon..". This commit corrects this, and adds short descriptions of services to affected service definitions. --- nixos/modules/config/krb5/default.nix | 2 +- nixos/modules/services/mail/rspamd.nix | 2 +- nixos/modules/services/networking/pptpd.nix | 2 +- nixos/modules/services/networking/xl2tpd.nix | 2 +- nixos/modules/services/networking/xrdp.nix | 2 +- nixos/modules/services/system/saslauthd.nix | 2 +- nixos/modules/virtualisation/xe-guest-utilities.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix index c22e99a0a2f1..87021a27d34f 100644 --- a/nixos/modules/config/krb5/default.nix +++ b/nixos/modules/config/krb5/default.nix @@ -79,7 +79,7 @@ in { options = { krb5 = { - enable = mkEnableOption "Whether to enable Kerberos V."; + enable = mkEnableOption "building krb5.conf, configuration file for Kerberos V"; kerberos = mkOption { type = types.package; diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index bba11796a3d3..ff01a5dee53d 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -159,7 +159,7 @@ in services.rspamd = { - enable = mkEnableOption "Whether to run the rspamd daemon."; + enable = mkEnableOption "rspamd, the Rapid spam filtering system"; debug = mkOption { type = types.bool; diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix index 56a612b91052..d8b9e8f8341a 100644 --- a/nixos/modules/services/networking/pptpd.nix +++ b/nixos/modules/services/networking/pptpd.nix @@ -5,7 +5,7 @@ with lib; { options = { services.pptpd = { - enable = mkEnableOption "Whether pptpd should be run on startup."; + enable = mkEnableOption "pptpd, the Point-to-Point Tunneling Protocol daemon"; serverIp = mkOption { type = types.string; diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix index 46111a76af80..d0a3ed7bb5e0 100644 --- a/nixos/modules/services/networking/xl2tpd.nix +++ b/nixos/modules/services/networking/xl2tpd.nix @@ -5,7 +5,7 @@ with lib; { options = { services.xl2tpd = { - enable = mkEnableOption "Whether xl2tpd should be run on startup."; + enable = mkEnableOption "xl2tpd, the Layer 2 Tunnelling Protocol Daemon"; serverIp = mkOption { type = types.string; diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index 61f22a366a02..9ed3025e47d4 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -36,7 +36,7 @@ in services.xrdp = { - enable = mkEnableOption "Whether xrdp should be run on startup."; + enable = mkEnableOption "xrdp, the Remote Desktop Protocol server"; package = mkOption { type = types.package; diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix index c8ddca9a0db6..8fcf4fb91fc4 100644 --- a/nixos/modules/services/system/saslauthd.nix +++ b/nixos/modules/services/system/saslauthd.nix @@ -16,7 +16,7 @@ in services.saslauthd = { - enable = mkEnableOption "Whether to enable the Cyrus SASL authentication daemon."; + enable = mkEnableOption "saslauthd, the Cyrus SASL authentication daemon"; package = mkOption { default = pkgs.cyrus_sasl.bin; diff --git a/nixos/modules/virtualisation/xe-guest-utilities.nix b/nixos/modules/virtualisation/xe-guest-utilities.nix index d703353858c0..675cf9297371 100644 --- a/nixos/modules/virtualisation/xe-guest-utilities.nix +++ b/nixos/modules/virtualisation/xe-guest-utilities.nix @@ -5,7 +5,7 @@ let in { options = { services.xe-guest-utilities = { - enable = mkEnableOption "Whether to enable the Xen guest utilities daemon."; + enable = mkEnableOption "the Xen guest utilities daemon"; }; }; config = mkIf cfg.enable { From 3fea6319f96db7075476491ac9185de44af1a8b9 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 5 Oct 2018 09:49:57 +0000 Subject: [PATCH 164/992] numactl: drop musl patch musl support was added upstream in v2.0.12 in https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b --- pkgs/os-specific/linux/numactl/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index bf21f92bd66d..3c02cf2bb889 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -13,11 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - url = https://git.alpinelinux.org/cgit/aports/plain/testing/numactl/musl.patch?id=0592b128c71c3e70d493bc7a13caed0d7fae91dd; - sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v"; - }); - postPatch = '' patchShebangs test ''; From 071d72a72287cc3ed39a8bcea478d9858529555f Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 5 Oct 2018 14:05:25 +0200 Subject: [PATCH 165/992] scribus: 1.4.6 -> 1.4.7 --- pkgs/applications/office/scribus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index ac1bf18e9999..76bf7ac6893e 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -5,11 +5,11 @@ let pythonEnv = python2.withPackages(ps: [ps.tkinter]); in stdenv.mkDerivation rec { - name = "scribus-1.4.6"; + name = "scribus-1.4.7"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; - sha256 = "16m1g38dig37ag0zxjx3wk1rxx9xxzjqfc7prj89rp4y1m83dqr1"; + sha256 = "1v2ziq3k0yjz35nk5plcbc1jpi53p9v1cq1z3spch9lwlns3bls2"; }; enableParallelBuilding = true; From 3624bb536244ea99f9f9a6d18ff00bbe4a5204af Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Fri, 5 Oct 2018 15:42:15 +0200 Subject: [PATCH 166/992] nixos-container: Force container to talk to host nix-daemon When logging into a container by using nixos-container root-login all nix-related commands in the container would fail, as they tried to modify the nix db and nix store, which are mounted read-only in the container. We want nixos-container to not try to modify the nix store at all, but instead delegate any build commands to the nix daemon of the host operating system. This already works for non-root users inside a nixos-container, as it doesn't 'own' the nix-store, and thus defaults to talking to the daemon socket at /nix/var/nix/daemon-socket/, which is bind-mounted to the host daemon-socket, causing all nix commands to be delegated to the host. However, when we are the root user inside the container, we have the same uid as the nix store owner, eventhough it's not actually the same root user (due to user namespaces). Nix gets confused, and is convinced it's running in single-user mode, and tries to modify the nix store directly instead. By setting `NIX_REMOTE=daemon` in `/etc/profile`, we force nix to operate in multi-user mode, so that it will talk to the host daemon instead, which will modify the nix store for the container. This fixes #40355 --- nixos/modules/virtualisation/container-config.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index 5e368acd6d8b..561db7cabcfb 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -22,6 +22,13 @@ with lib; # Not supported in systemd-nspawn containers. security.audit.enable = false; + # Make sure that root user in container will talk to host nix-daemon + environment.etc."profile".text = '' + export NIX_REMOTE=daemon + ''; + + + }; } From bb31835b1d2d1933a6c1d2cb196491ba1efa9233 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Fri, 5 Oct 2018 15:48:41 +0200 Subject: [PATCH 167/992] Revert "Revert "Revert "doc: Update section about imperative containers""" nixos-container can now execute nix commands again inside the container This reverts commit 9622cd3b38ddbc7faa4cac2a48dbd70bd99570d0. --- .../administration/imperative-containers.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index fa380477f6cb..9bb62bc2ece9 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -73,7 +73,8 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux - To change the configuration of the container, you can edit + There are several ways to change the configuration of the container. First, + on the host, you can edit /var/lib/container/name/etc/nixos/configuration.nix, and run @@ -86,7 +87,8 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux = true; = "foo@example.org"; = [ 80 ]; - ' +' + # curl http://$(nixos-container show-ip foo)/ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… @@ -95,13 +97,11 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux - Note that in previous versions of NixOS (17.09 and earlier) one could also - use all nix-related commands (like nixos-rebuild switch) - from inside the container. However, since the release of Nix 2.0 this is not - supported anymore. Supporting Nix commands inside the container might be - possible again in future versions. See - the github - issue for tracking progress on this issue. + Alternatively, you can change the configuration from within the container + itself by running nixos-rebuild switch inside the + container. Note that the container by default does not have a copy of the + NixOS channel, so you should run nix-channel --update + first. From 2ed17db8cdeb8e6385f8ac1153e862183813f244 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 5 Oct 2018 17:00:20 +0000 Subject: [PATCH 168/992] slurm: add lz4 dependency Slurm looks for lz4 by default, and if it finds it can improve its compression techniques --- pkgs/servers/computing/slurm/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index ba0e57bb2be8..afb39ac9fb3e 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl , ncurses, mysql, gtk2, lua, hwloc, numactl -, readline, freeipmi, libssh2, xorg +, readline, freeipmi, libssh2, xorg, lz4 # enable internal X11 support via libssh2 , enableX11 ? true }: @@ -35,15 +35,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ curl python munge perl pam openssl - mysql.connector-c ncurses gtk2 + mysql.connector-c ncurses gtk2 lz4 lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; configureFlags = with stdenv.lib; - [ "--with-munge=${munge}" - "--with-ssl=${openssl.dev}" + [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" - "--with-freeipmi=${freeipmi}" + "--with-lz4=${lz4}" + "--with-munge=${munge}" + "--with-ssl=${openssl.dev}" "--sysconfdir=/etc/slurm" ] ++ (optional (gtk2 == null) "--disable-gtktest") ++ (optional enableX11 "--with-libssh2=${libssh2.dev}"); From 11f1b22b4b5bb01ff25b3d64bd780c39ce1353cf Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Fri, 5 Oct 2018 20:18:22 +0200 Subject: [PATCH 169/992] packer: 1.2.5 -> 1.3.1 --- pkgs/development/tools/packer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 851c6f01b20f..25ec443be42b 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "packer-${version}"; - version = "1.2.5"; + version = "1.3.1"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0wbf0iqfqphwy2snspf34j16ar4ghk0f1zsw8n8vj8gviiivlr7p"; + sha256 = "0aif4ilzfv8qyqk4mn525r38xw2w34ryknzd2vrg6mcjcarm8myq"; }; meta = with stdenv.lib; { From 6dc9e7d2a9dd80759bea5357acc4c71d2d98fbbd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Oct 2018 15:10:04 -0500 Subject: [PATCH 170/992] mesa: 18.2.1 -> 18.2.2 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aca9a237b0c7..ff45162c5a89 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "18.2.1"; + version = "18.2.2"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0mhhr1id11s1fbdxbvr4a81xjh1nsznpra9dl36bv2hq7mpxqdln"; + sha256 = "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3"; }; prePatch = "patchShebangs ."; From 13883ff4bce838c91dd318e62195804afcdccf1a Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 5 Oct 2018 17:01:30 -0400 Subject: [PATCH 171/992] systemd-wait: init at 0.1+2018-10-05 --- .../linux/systemd-wait/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/systemd-wait/default.nix diff --git a/pkgs/os-specific/linux/systemd-wait/default.nix b/pkgs/os-specific/linux/systemd-wait/default.nix new file mode 100644 index 000000000000..114f4c2444e6 --- /dev/null +++ b/pkgs/os-specific/linux/systemd-wait/default.nix @@ -0,0 +1,25 @@ +{ python3Packages, fetchFromGitHub, lib }: + +python3Packages.buildPythonApplication rec { + pname = "systemd-wait"; + version = "0.1+2018-10-05"; + + src = fetchFromGitHub { + owner = "Stebalien"; + repo = pname; + rev = "bbb58dd4584cc08ad20c3888edb7628f28aee3c7"; + sha256 = "1l8rd0wzf3m7fk0g1c8wc0csdisdfac0filhixpgp0ck9ignayq5"; + }; + + propagatedBuildInputs = with python3Packages; [ + dbus-python pygobject3 + ]; + + meta = { + homepage = https://github.com/Stebalien/systemd-wait; + license = lib.licenses.gpl3; + description = "Wait for a systemd unit to enter a specific state"; + maintainers = [ lib.maintainers.benley ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1a04e636997..2d57ae3bb915 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1539,7 +1539,7 @@ with pkgs; riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { conf = config.riot-web.conf or null; }; - + roundcube = callPackage ../servers/roundcube { }; rsbep = callPackage ../tools/backup/rsbep { }; @@ -14746,6 +14746,8 @@ with pkgs; ''; })); + systemd-wait = callPackages ../os-specific/linux/systemd-wait { }; + sysvinit = callPackage ../os-specific/linux/sysvinit { }; sysvtools = sysvinit.override { From 9289920193616488c0d146770dd6e98e9e4c482e Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Fri, 5 Oct 2018 17:45:13 -0700 Subject: [PATCH 172/992] webkitgtk222x: init at 2.22.2 --- pkgs/development/libraries/webkitgtk/2.22.nix | 83 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++ 2 files changed, 90 insertions(+) create mode 100644 pkgs/development/libraries/webkitgtk/2.22.nix diff --git a/pkgs/development/libraries/webkitgtk/2.22.nix b/pkgs/development/libraries/webkitgtk/2.22.nix new file mode 100644 index 000000000000..7eae5819daf1 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.22.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja +, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt +, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit +, libidn, libedit, readline, libGLU_combined, libintl +, enableGeoLocation ? true, geoclue2, sqlite +, enableGtk2Plugins ? false, gtk2 ? null +, gst-plugins-base, gst-plugins-bad, woff2 +}: + +assert enableGeoLocation -> geoclue2 != null; +assert enableGtk2Plugins -> gtk2 != null; +assert stdenv.isDarwin -> !enableGtk2Plugins; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.22.2"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = https://webkitgtk.org/; + license = licenses.bsd2; + platforms = platforms.linux; + hydraPlatforms = []; + maintainers = with maintainers; [ ]; + }; + + src = fetchurl { + url = "https://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l"; + }; + + patches = optionals stdenv.isDarwin [ + ## TODO add necessary patches for Darwin + ]; + + postPatch = '' + patchShebangs . + ''; + + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=0" + "-DENABLE_INTROSPECTION=ON" + ] + ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" + ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" + ++ optionals stdenv.isDarwin [ + "-DUSE_SYSTEM_MALLOC=ON" + "-DUSE_ACCELERATE=0" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_VIDEO=ON" + "-DENABLE_QUARTZ_TARGET=ON" + "-DENABLE_X11_TARGET=OFF" + "-DENABLE_OPENGL=OFF" + "-DENABLE_WEB_AUDIO=OFF" + "-DENABLE_WEBGL=OFF" + "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + "-DENABLE_GTKDOC=OFF" + ]; + + nativeBuildInputs = [ + cmake ninja perl python2 ruby bison gperf + pkgconfig gettext gobjectIntrospection + ]; + + buildInputs = [ + libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core + ] ++ optional enableGeoLocation geoclue2 + ++ optional enableGtk2Plugins gtk2 + ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ]) + ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] + ++ optional stdenv.isLinux wayland; + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab5508ef7331..a8b96bd5a29e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12541,6 +12541,13 @@ with pkgs; stdenv = overrideCC stdenv gcc6; }; + webkitgtk222x = callPackage ../development/libraries/webkitgtk/2.22.nix { + harfbuzz = harfbuzzFull; + inherit (gst_all_1) gst-plugins-base gst-plugins-bad; + stdenv = overrideCC stdenv gcc6; + }; + + webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { withGtk2 = true; enableIntrospection = false; From 50e947f5296576e557b2fd197f0e3b492c33a230 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 6 Oct 2018 00:59:31 -0400 Subject: [PATCH 173/992] lib/systems: use correct config for armv7l-hf-multiplatform --- lib/systems/examples.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index c2ee829529dc..8ba03a63fd8d 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -28,7 +28,7 @@ rec { }; armv7l-hf-multiplatform = rec { - config = "armv7a-unknown-linux-gnueabihf"; + config = "armv7l-unknown-linux-gnueabihf"; platform = platforms.armv7l-hf-multiplatform; }; From 47fb4859a5a06d61e4d97d4ddcd5b849c1c7b3eb Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 6 Oct 2018 10:56:53 +0200 Subject: [PATCH 174/992] abcde: 2.8.1 -> 2.9.2 Fixes #41789. --- pkgs/applications/audio/abcde/abcde.patch | 30 -------------------- pkgs/applications/audio/abcde/default.nix | 34 +++++++++++------------ 2 files changed, 16 insertions(+), 48 deletions(-) delete mode 100644 pkgs/applications/audio/abcde/abcde.patch diff --git a/pkgs/applications/audio/abcde/abcde.patch b/pkgs/applications/audio/abcde/abcde.patch deleted file mode 100644 index ae187043e6c5..000000000000 --- a/pkgs/applications/audio/abcde/abcde.patch +++ /dev/null @@ -1,30 +0,0 @@ -Two changes: - -* Add an alias for `which', so abcde can find things in store -* Choose the right CDROM reader syntax for `cd-paranoia' - ---- abcde-2.5.4/abcde~ 2012-09-18 06:09:31.000000000 -0700 -+++ abcde-2.5.4/abcde 2012-10-27 00:08:48.000862364 -0700 -@@ -17,6 +17,11 @@ - - VERSION='2.5.4' - -+which () -+{ -+ type -P $1 -+} -+ - usage () - { - echo "This is abcde v$VERSION." -@@ -3497,6 +3502,10 @@ - for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do - if new_checkexec $DEFAULT_CDROMREADER; then - CDROMREADERSYNTAX=$DEFAULT_CDROMREADER -+ case "$DEFAULT_CDROMREADER" in -+ cd-paranoia) CDROMREADERSYNTAX=cdparanoia;; -+ *) CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;; -+ esac - break - fi - done diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 7f2080c6fd63..58e8ecc4fcab 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -3,60 +3,58 @@ , perl, MusicBrainz, MusicBrainzDiscID , makeWrapper }: -let version = "2.8.1"; +let version = "2.9.2"; in stdenv.mkDerivation { name = "abcde-${version}"; src = fetchurl { url = "https://abcde.einval.com/download/abcde-${version}.tar.gz"; - sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774"; + sha256 = "13c5yvp87ckqgha160ym5rdr1a4divgvyqbjh0yb6ffclip6qd9l"; }; # FIXME: This package does not support `distmp3', `eject', etc. - patches = [ ./abcde.patch ]; - configurePhase = '' sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ; s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \ "Makefile"; - # We use `cd-paranoia' from GNU libcdio, which contains a hyphen - # in its name, unlike Xiph's cdparanoia. - sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g ; - s|^[[:blank:]]*DEFAULT_CDROMREADERS=.*$|DEFAULT_CDROMREADERS=\"cd-paranoia cdda2wav\"|g" \ - "abcde" + echo 'CDPARANOIA=${libcdio-paranoia}/bin/cd-paranoia' >>abcde.conf + echo CDROMREADERSYNTAX=cdparanoia >>abcde.conf substituteInPlace "abcde" \ --replace "/etc/abcde.conf" "$out/etc/abcde.conf" - ''; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ perl MusicBrainz MusicBrainzDiscID ]; + buildInputs = [ perl MusicBrainz MusicBrainzDiscID ]; installFlags = [ "sysconfdir=$(out)/etc" ]; postFixup = '' for cmd in abcde cddb-tool abcde-musicbrainz-tool; do - wrapProgram "$out/bin/$cmd" --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} + wrapProgram "$out/bin/$cmd" \ + --prefix PERL5LIB : "$PERL5LIB" \ + --prefix PATH ":" ${stdenv.lib.makeBinPath [ + "$out" which libcdio-paranoia cddiscid wget + vorbis-tools id3v2 eyeD3 lame flac glyr + ]} done ''; - meta = { + meta = with stdenv.lib; { homepage = http://abcde.einval.com/wiki/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ gebner ]; description = "Command-line audio CD ripper"; - longDescription = '' abcde is a front-end command-line utility (actually, a shell script) that grabs tracks off a CD, encodes them to Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack) format, and tags them, all in one go. ''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } From 011f1c739647c0b6947d028c217e4a98466c26d2 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sat, 6 Oct 2018 11:33:47 +0100 Subject: [PATCH 175/992] sewer: init at 0.6.0 sewer is an ACME client which supports DNS challenges with support for various DNS servers. --- pkgs/tools/admin/sewer/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/admin/sewer/default.nix diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix new file mode 100644 index 000000000000..5410d0c833df --- /dev/null +++ b/pkgs/tools/admin/sewer/default.nix @@ -0,0 +1,26 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "sewer"; + version = "0.6.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "180slmc2zk4mvjqp25ks0j8kd63ai4y77ds5icm7qd7av865rryp"; + }; + + propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ]; + + postPatch = '' + # The README has non-ascii characters which makes setup.py crash. + sed -i 's/[\d128-\d255]//g' README.md + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/komuw/sewer; + description = "ACME client"; + license = licenses.mit; + maintainers = with maintainers; [ kevincox ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0f2356264a3..3f2b04c4cfd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5214,6 +5214,8 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; + sewer = callPackage ../tools/admin/sewer { }; + screenfetch = callPackage ../tools/misc/screenfetch { }; sg3_utils = callPackage ../tools/system/sg3_utils { }; From b5a2181899abffea26ea6c4484e88eef9d99bf41 Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 6 Oct 2018 14:07:36 +0000 Subject: [PATCH 176/992] solvespace: 2.3-20170808 -> 2.3-20180906 --- pkgs/applications/graphics/solvespace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index a1d0316631fa..2e413839f00b 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -3,12 +3,12 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "solvespace-2.3-20170808"; - rev = "16540b1b2c540a4b44500ac02aaa4493bccfba7e"; + name = "solvespace-2.3-20180906"; + rev = "258545a334098cf25c1c9f4cd59b778dfe0b0d29"; src = fetchgit { url = https://github.com/solvespace/solvespace; inherit rev; - sha256 = "1z10i21xf3yagd984lp1hwasnsizx2s3faq3wdzzjngrikr2zn70"; + sha256 = "1wimh6l0zpk0vywcsd2minijjf6g550z8i3l8lpmfnl5przymc2v"; fetchSubmodules = true; }; From 0bcbb978795bab0f1a45accc211b8b0e349f1cdb Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 5 Oct 2018 23:07:56 +0200 Subject: [PATCH 177/992] vault: 0.11.1 -> 0.11.2 changelog: https://github.com/hashicorp/vault/blob/v0.11.2/CHANGELOG.md --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index a0f7d0f6287f..597047a679bb 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -11,13 +11,13 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1ydnb9z6rd5ck6wza5ir6927xq375i1a9zh5p2xanp29ly6ijiiz"; + sha256 = "0lckpfp1yw6rfq2cardsp2qjiajg706qjk98cycrlsa5nr2csafa"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; From 4af38a251652a4ed67b1a98836230ce7fdbf6d56 Mon Sep 17 00:00:00 2001 From: Chris Hodapp Date: Sat, 6 Oct 2018 11:08:47 -0400 Subject: [PATCH 178/992] gdal: Add libxml2 to build --- pkgs/development/libraries/gdal/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 1fe3bcf6cede..642063220b2c 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat -, libiconv +, libiconv, libxml2 , netcdfSupport ? true, netcdf, hdf5, curl }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite - libspatialite poppler hdf4 qhull giflib expat ] + libspatialite poppler hdf4 qhull giflib expat libxml2 ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { "--with-proj=${proj}" # optional "--with-geos=${geos}/bin/geos-config"# optional "--with-hdf4=${hdf4.dev}" # optional + "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; From f0e5a51c98dd1b4c010251cf624f3556597d834d Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Fri, 5 Oct 2018 17:52:24 -0700 Subject: [PATCH 179/992] astroid: 0.13 -> 0.14 --- .../networking/mailreaders/astroid/default.nix | 17 ++++++----------- .../mailreaders/astroid/run_tests.diff | 10 ---------- 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/astroid/run_tests.diff diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 0cb07b8ce755..8dd23df7749c 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,36 +1,31 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk222x , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable , makeWrapper, python3, python3Packages , vim ? vim_configurable.override { features = "normal"; gui = "auto"; } +, ronn }: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "105x5g44hng3fi03h67j3an53088148jbq8726nmcp0zs0cy9gac"; + sha256 = "1wkv1icsx3g3gq485dnvcdhr9srrjgz4ws1i1krcw9n61bj7gxh8"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas + buildInputs = [ gnome3.gtkmm gmime3 webkitgtk222x libsass gnome3.libpeas python3 python3Packages.pygobject3 notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); - patches = [ - # TODO: remove when https://github.com/astroidmail/astroid/pull/531 - # is released - ./run_tests.diff - ]; - postPatch = '' sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc sed -i "s~ -geom 10x10~~g" src/config.cc diff --git a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff b/pkgs/applications/networking/mailreaders/astroid/run_tests.diff deleted file mode 100644 index 21b466741ce1..000000000000 --- a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/tests/run_test.sh b/tests/run_test.sh -index f2ea7d7..927c61d 100755 ---- a/tests/run_test.sh -+++ b/tests/run_test.sh -@@ -1,4 +1,4 @@ --#! /bin/bash -+#! /usr/bin/env bash - # - # Set up environment and run test specified on command line - From f7cd362ae495365251c1ad48fdced79c68920fa4 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Sat, 6 Oct 2018 12:21:05 -0500 Subject: [PATCH 180/992] gnupg20: set version variable to fix gnupg1compat Presently, gnupg1compat only works with gnupg22. Without this change, the error ``` error: attribute 'version' missing, at .../nixpkgs/pkgs/tools/security/gnupg/1compat.nix:4:26 ``` is emitted when evaluating ``` pkgs.gnupg1compat.override { gnupg = pkgs.gnupg20; }' ``` --- pkgs/tools/security/gnupg/20.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 9404cb1d0655..6ae2bbc436ed 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -12,7 +12,8 @@ with stdenv.lib; assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.0.30"; + name = "gnupg-${version}"; + version = "2.0.30"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; From a959bd928a7557cb74f2e830fcd04749174798e6 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 6 Oct 2018 20:39:20 +0200 Subject: [PATCH 181/992] maintainers: add pacien --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 737431effaca..ba87e16a7d4c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3120,6 +3120,11 @@ github = "oyren"; name = "Moritz Scheuren"; }; + pacien = { + email = "b4gx3q.nixpkgs@pacien.net"; + github = "pacien"; + name = "Pacien Tran-Girard"; + }; paholg = { email = "paho@paholg.com"; github = "paholg"; From 0b13e8a3413274064ecfbd7d3d66f128912e12c0 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 6 Oct 2018 21:43:32 +0300 Subject: [PATCH 182/992] midisheetmusic: init at 2.6 --- .../audio/midisheetmusic/default.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/applications/audio/midisheetmusic/default.nix diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix new file mode 100644 index 000000000000..26962ad9cc85 --- /dev/null +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl +, mono, dotnetPackages, makeWrapper +, gtk2, cups, timidity }: + +let + version = "2.6"; +in stdenv.mkDerivation { + name = "midisheetmusic"; + + src = fetchurl { + url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz"; + sha256 = "05c6zskj50g29f51lx8fvgzsi3f31z01zj6ssjjrgr7jfs7ak70p"; + }; + + checkInputs = (with dotnetPackages; [ NUnitConsole ]); + nativeBuildInputs = [ mono makeWrapper ]; + + buildPhase = '' + for i in Classes/MidiPlayer.cs Classes/MidiSheetMusic.cs + do + substituteInPlace $i --replace "/usr/bin/timidity" "${timidity}/bin/timidity" + done + + ./build.sh + ''; + + # include missing file with unit tests for building + # switch from mono nunit dll to standalone dll otherwise mono compiler barks + # run via nunit3 console, because mono nunit console wants access $HOME + checkPhase = '' + substituteInPlace UnitTestDLL.csproj \ + --replace "" '' \ + --replace nunit.framework.dll "${dotnetPackages.NUnit}/lib/dotnet/NUnit/nunit.framework.dll" + ./build_unit_test.sh + nunit3-console bin/Debug/UnitTest.dll + ''; + + # 2 tests of 47 are still failing + doCheck = false; + + installPhase = '' + mkdir -p $out/share/applications $out/share/pixmaps $out/bin + + cp deb/midisheetmusic.desktop $out/share/applications + cp NotePair.png $out/share/pixmaps/midisheetmusic.png + cp bin/Debug/MidiSheetMusic.exe $out/bin/.MidiSheetMusic.exe + + makeWrapper ${mono}/bin/mono $out/bin/midisheetmusic.mono.exe \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ gtk2 cups ]} \ + --add-flags $out/bin/.MidiSheetMusic.exe + ''; + + meta = with stdenv.lib; { + description = "Convert MIDI Files to Piano Sheet Music for two hands"; + homepage = http://midisheetmusic.com; + license = licenses.gpl2; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c403077dbb9b..b0e68b00cd45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4052,6 +4052,8 @@ with pkgs; mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; + mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; mimeo = callPackage ../tools/misc/mimeo { }; From 3115f8dffb427f64c5ab12ed51cc173980a4a1c9 Mon Sep 17 00:00:00 2001 From: Ji-Haeng Huh Date: Sat, 6 Oct 2018 17:03:22 +0900 Subject: [PATCH 183/992] tinyemu: init at 2018-09-23 --- .../virtualization/tinyemu/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/virtualization/tinyemu/default.nix diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix new file mode 100644 index 000000000000..a8f113307251 --- /dev/null +++ b/pkgs/applications/virtualization/tinyemu/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, openssl, curl, SDL }: + +stdenv.mkDerivation rec { + name = "tinyemu-${version}"; + version = "2018-09-23"; + src = fetchurl { + url = "https://bellard.org/tinyemu/${name}.tar.gz"; + sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v"; + }; + buildInputs = [ openssl curl SDL ]; + makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; + preInstall = '' + mkdir -p "$out/bin" + ''; + meta = { + homepage = https://bellard.org/tinyemu/; + description = "A system emulator for the RISC-V and x86 architectures"; + longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete."; + license = with stdenv.lib.licenses; [ mit bsd2 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jhhuh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c403077dbb9b..42a643b91598 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5597,6 +5597,8 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyproxy = callPackage ../tools/networking/tinyproxy {}; tio = callPackage ../tools/misc/tio { }; From 4af5457ebb10fe2fb1c10498b0ca307cf6298d92 Mon Sep 17 00:00:00 2001 From: pmahoney Date: Sat, 6 Oct 2018 13:56:21 -0500 Subject: [PATCH 184/992] jsonnet: fix on darwin (#47939) Build on darwin fails when using emscripten to build the js library. Disabling this is unsatisfying, but gets the jsonnet binary building again. --- pkgs/development/compilers/jsonnet/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index 4a520471f867..f363c6fdb5ee 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, emscripten }: +{ stdenv, lib, fetchFromGitHub, emscripten +, enableJsonnetJs ? !stdenv.isDarwin +}: let version = "0.11.2"; in @@ -13,16 +15,17 @@ stdenv.mkDerivation { sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym"; }; - buildInputs = [ emscripten ]; + buildInputs = if enableJsonnetJs then [ emscripten ] else [ ]; enableParallelBuilding = true; - makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache'' ''all'']; + makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache''] ++ + (if enableJsonnetJs then ["all"] else ["jsonnet" "libjsonnet.so" "libjsonnet++.so"]); installPhase = '' mkdir -p $out/bin $out/lib $out/share/ cp jsonnet $out/bin/ - cp libjsonnet.so $out/lib/ + cp libjsonnet*.so $out/lib/ cp -a doc $out/share/doc cp -a include $out/include ''; From 1e237142964793c9c3d55faaa3a8cdbe3315c855 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Sat, 6 Oct 2018 13:26:35 -0500 Subject: [PATCH 185/992] gnupg1compat: reintroduce symlinks, only when actually needed --- pkgs/tools/security/gnupg/1compat.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index eadfbe230b3f..371a7ca67afd 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -4,14 +4,22 @@ stdenv.mkDerivation { name = "gnupg1compat-${gnupg.version}"; builder = writeScript "gnupg1compat-builder" '' + PATH=${coreutils}/bin # First symlink all top-level dirs - ${coreutils}/bin/mkdir -p $out - ${coreutils}/bin/ln -s "${gnupg}/"* $out + mkdir -p $out + ln -s "${gnupg}/"* $out # Replace bin with directory and symlink it contents - ${coreutils}/bin/rm $out/bin - ${coreutils}/bin/mkdir -p $out/bin - ${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin + rm $out/bin + mkdir -p $out/bin + ln -s "${gnupg}/bin/"* $out/bin + + # Add symlinks for any executables that end in 2 and lack any non-*2 version + for f in $out/bin/*2; do + [[ -x $f ]] || continue # ignore failed globs and non-executable files + [[ -e ''${f%2} ]] && continue # ignore commands that already have non-*2 versions + ln -s -- "''${f##*/}" "''${f%2}" + done ''; meta = gnupg.meta // { From 5deee7672c675e5dc1ea631b28deed72af8ae2f5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 6 Oct 2018 14:40:09 -0500 Subject: [PATCH 186/992] netbsd: support cross compilation Separates build and host packages to get cross compilation working. --- pkgs/os-specific/bsd/netbsd/default.nix | 80 ++++++++++++++++++------- 1 file changed, 60 insertions(+), 20 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 3e1d1f01aa0d..f9a614d32336 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -2,6 +2,9 @@ , yacc, flex, libressl, bash, less, writeText }: let + inherit (lib) optionalString replaceStrings; + inherit (stdenv) hostPlatform; + fetchNetBSD = path: version: sha256: fetchcvs { cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; module = "src/${path}"; @@ -9,20 +12,52 @@ let tag = "netbsd-${builtins.replaceStrings ["."] ["-"] version}-RELEASE"; }; + # Needed to support cross correctly. Splicing only happens when we + # do callPackage, but sense everything is here, it needs to be done + # by hand. All native build inputs should come from here. + nbBuildPackages = buildPackages.netbsd; + + MACHINE_ARCH = { + "i686" = "i386"; + }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name; + + MACHINE = { + "x86_64" = "amd64"; + "aarch64" = "evbarm64"; + "i686" = "i386"; + }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name; + netBSDDerivation = attrs: stdenv.mkDerivation ((rec { - name = "bsd-${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; + name = "netbsd-${attrs.pname or (baseNameOf attrs.path)}-${attrs.version}"; src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; setOutputFlags = false; - nativeBuildInputs = [ makeMinimal mandoc groff install stat - yacc flex tsort lorder ]; - buildInputs = [ compat ]; + nativeBuildInputs = [ yacc flex mandoc groff + nbBuildPackages.makeMinimal + nbBuildPackages.stat + nbBuildPackages.install + nbBuildPackages.tsort + nbBuildPackages.lorder ]; + buildInputs = [ nbPackages.compat ]; installFlags = [ "includes" ]; + # TODO: eventually move this to a make.conf + makeFlags = [ + "MACHINE=${MACHINE}" + "MACHINE_ARCH=${MACHINE_ARCH}" + + "AR=${stdenv.cc.targetPrefix}ar" + "CC=${stdenv.cc.targetPrefix}cc" + "CPP=${stdenv.cc.targetPrefix}cpp" + "CXX=${stdenv.cc.targetPrefix}c++" + "LD=${stdenv.cc.targetPrefix}ld" + "STRIP=${stdenv.cc.targetPrefix}strip" + ] ++ (attrs.makeFlags or []); # Definitions passed to share/mk/*.mk. Should be pretty simple - # eventually maybe move it to a configure script. + # TODO: don’t rely on DESTDIR, instead use prefix DESTDIR = "$(out)"; TOOLDIR = "$(out)"; USETOOLS = "never"; @@ -30,10 +65,9 @@ let NOGCCERROR = "yes"; LEX = "flex"; MKUNPRIVED = "yes"; - HOST_SH = "${bash}/bin/sh"; + HOST_SH = "${buildPackages.bash}/bin/sh"; OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - MACHINE_ARCH = stdenv.hostPlatform.parsed.cpu.name; - MACHINE_CPU = stdenv.hostPlatform.parsed.cpu.name; + RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp"; INSTALL_FILE = "install -U -c"; INSTALL_DIR = "xinstall -U -d"; @@ -85,7 +119,7 @@ let # NetBSD makefiles should be able to detect this # but without they end up using gcc on Darwin stdenv preConfigure = '' - export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} + export HAVE_${if stdenv.cc.isClang then "LLVM" else "GCC"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))} # Parallel building. Needs the space. export makeFlags+=" -j $NIX_BUILD_CORES" @@ -128,7 +162,9 @@ let platforms = platforms.unix; license = licenses.bsd2; }; - }) // attrs); + }) // (removeAttrs attrs ["makeFlags"])); + + nbPackages = rec { ## ## BOOTSTRAPPING @@ -165,7 +201,7 @@ let extraPaths = [ make.src ] ++ make.extraPaths; }; - compat = netBSDDerivation rec { + compat = if hostPlatform.isNetBSD then null else netBSDDerivation rec { path = "tools/compat"; sha256 = "050449lq5gpxqsripdqip5ks49g5ypjga188nd3ss8dg1zf7ydz3"; version = "8.0"; @@ -176,7 +212,7 @@ let ]; # override defaults to prevent infinite recursion - nativeBuildInputs = [ makeMinimal ]; + nativeBuildInputs = [ nbBuildPackages.makeMinimal ]; buildInputs = [ zlib ]; # temporarily use gnuinstall for bootstrapping @@ -234,7 +270,7 @@ let # HACK to ensure parent directories exist. This emulates GNU # install’s -D option. No alternative seems to exist in BSD install. install = let binstall = writeText "binstall" '' - #!/bin/sh + #!${stdenv.shell} for last in $@; do true; done mkdir -p $(dirname $last) xinstall "$@" @@ -243,7 +279,7 @@ let version = "8.0"; sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = [ mtree.src make.src ]; - nativeBuildInputs = [ makeMinimal mandoc groff ]; + nativeBuildInputs = [ nbBuildPackages.makeMinimal mandoc groff ]; buildInputs = [ compat fts ]; installPhase = '' runHook preInstall @@ -294,21 +330,24 @@ let path = "usr.bin/stat"; version = "8.0"; sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh"; - nativeBuildInputs = [ makeMinimal mandoc groff install ]; + nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install + mandoc groff ]; }; tsort = netBSDDerivation { path = "usr.bin/tsort"; version = "8.0"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; - nativeBuildInputs = [ makeMinimal mandoc groff install ]; + nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install + mandoc groff ]; }; lorder = netBSDDerivation { path = "usr.bin/lorder"; version = "8.0"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; - nativeBuildInputs = [ makeMinimal mandoc groff install ]; + nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install + mandoc groff ]; }; ## ## END BOOTSTRAPPING @@ -345,6 +384,8 @@ let --replace '-Wl,-rpath,''${SHLIBDIR}' "" substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ + --replace /bin/rm rm '' + lib.optionalString stdenv.isDarwin '' substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ --replace '-Wl,--fatal-warnings' "" \ @@ -390,9 +431,6 @@ let ''; }; -in rec { - inherit compat install netBSDDerivation fts; - getent = netBSDDerivation { path = "usr.bin/getent"; sha256 = "1ylhw4dnpyrmcy8n5kjcxywm8qc9p124dqnm17x4magiqx1kh9iz"; @@ -612,4 +650,6 @@ in rec { patches = [ ./locale.patch ]; }; -} + }; + +in nbPackages From d8bcd2c3d8f0bb346ed899ee1a971de488d4178b Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sat, 6 Oct 2018 19:48:43 +0000 Subject: [PATCH 187/992] nixos/bash: Use `escapeShellArg` for shell aliases This patch uses the library function `lib.escapeShellArg` to improve the handling of shell aliases in the NixOS module `bash`, copying the corresponding change made to the `zsh` module in commit 1e211a70cbdaf230a18ea4cb67a959039d5c2ddb (for which GitHub pull request #47471 was filed). This patch resolves GitHub issue #16973. This change presumably also should be copied to the `fish` module, but I don't know `fish` syntax so that won't be done by me. GitHub: Close NixOS/nixpkgs#16973. --- nixos/modules/programs/bash/bash.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 424e1506b4c5..f664e2225550 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -33,7 +33,7 @@ let ''; bashAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases + mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases ); in From 2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 6 Oct 2018 17:04:04 -0400 Subject: [PATCH 188/992] Add zlib; swap to lz4.dev --- pkgs/servers/computing/slurm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index afb39ac9fb3e..e016c5860f74 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl -, python, munge, perl, pam, openssl +, python, munge, perl, pam, openssl, zlib , ncurses, mysql, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg, lz4 # enable internal X11 support via libssh2 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - curl python munge perl pam openssl + curl python munge perl pam openssl zlib mysql.connector-c ncurses gtk2 lz4 lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; @@ -42,9 +42,10 @@ stdenv.mkDerivation rec { configureFlags = with stdenv.lib; [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" - "--with-lz4=${lz4}" + "--with-lz4=${lz4.dev}" "--with-munge=${munge}" "--with-ssl=${openssl.dev}" + "--with-zlib=${zlib}" "--sysconfdir=/etc/slurm" ] ++ (optional (gtk2 == null) "--disable-gtktest") ++ (optional enableX11 "--with-libssh2=${libssh2.dev}"); From 0cfc923813f803c7a169d257ce856173a2387ffc Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 6 Oct 2018 23:53:06 +0200 Subject: [PATCH 189/992] borgbackup: patch bug that allowed for exceeding quotas See also https://github.com/borgbackup/borg/issues/4093 for this. --- pkgs/tools/backup/borg/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index fe2f771c7227..72f6cd03e038 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }: +{ stdenv, fetchpatch, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }: python3Packages.buildPythonApplication rec { pname = "borgbackup"; @@ -9,6 +9,15 @@ python3Packages.buildPythonApplication rec { sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc"; }; + patches = [ + # Workarounds for https://github.com/borgbackup/borg/issues/4093 + # Can be deleted when 1.1.8 comes out + (fetchpatch { + url = "https://github.com/borgbackup/borg/commit/975cc33206e0e3644626fb7204c34d2157715b61.patch"; + sha256 = "0b7apaixpa7bk0sy7g5ycm98cjpkg5gkwcgm7m37xj35lzxdlxhc"; + }) + ]; + nativeBuildInputs = with python3Packages; [ # For building documentation: sphinx guzzle_sphinx_theme From c477d6658c47fcd62b897819d9ae1aa535071ad0 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 7 Oct 2018 11:35:55 +0900 Subject: [PATCH 190/992] nixos/prometheus-snmp-exporter: fix command line argument format --- .../services/monitoring/prometheus/exporters/snmp.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index 404cd0a1896b..0d9194124325 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -60,10 +60,10 @@ in DynamicUser = true; ExecStart = '' ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \ - -config.file ${configFile} \ - -log.format ${cfg.logFormat} \ - -log.level ${cfg.logLevel} \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --config.file=${configFile} \ + --log.format=${cfg.logFormat} \ + --log.level=${cfg.logLevel} \ + --web.listen-address=${cfg.listenAddress}:${toString cfg.port} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; From c2c534e8ce894a335467f18b25f2aa23eff71c51 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 6 Oct 2018 23:34:24 -0300 Subject: [PATCH 191/992] Oroborus: small fixes --- pkgs/applications/window-managers/oroborus/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 13eef1c045a4..2681d31ccb1e 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { version = "2.0.20"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ]; + buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext + libXft libXpm libXrandr libXrender xextproto libXinerama ]; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; From 3807a94545d9016b9d53e3bb9c5acaba05d27f2d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 6 Oct 2018 23:34:43 -0300 Subject: [PATCH 192/992] pekwm: small fixes --- pkgs/applications/window-managers/pekwm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index bdf914fbd751..b2677218e856 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { appear as they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - homepage = https://www.pekwm.org; + homepage = http://www.pekwm.org; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; From b1e72d746529777c8130a96427d9d1708b2ca6b2 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 6 Oct 2018 23:35:10 -0300 Subject: [PATCH 193/992] libtap: small fixes --- pkgs/development/libraries/libtap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index 2671199ab0e0..99e0ab0a4767 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -14,16 +14,16 @@ stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ cmake perl ]; - meta = { + meta = with stdenv.lib; { description = "A library to implement a test protocol"; longDescription = '' libtap is a library to implement the Test Anything Protocol for C originally created by Nik Clayton. This is a maintenance branch by Shlomi Fish. ''; - homepage = http://www.shlomifish.org/open-source/projects/libtap/; + homepage = https://www.shlomifish.org/open-source/projects/libtap/; license = licenses.bsd3; maintainers = [ maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } From f65adf629291127b9877763201b9e5207754e550 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 6 Oct 2018 23:35:41 -0300 Subject: [PATCH 194/992] higan: small fixes --- pkgs/misc/emulators/higan/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index fbe44c6540b3..18db78d82ad5 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include ' -i higan/fc/ppu/ppu.cpp"; buildInputs = - [ p7zip pkgconfig libX11 libXv udev libGLU_combined SDL libao openal libpulseaudio gtk2 gtksourceview ]; + [ p7zip pkgconfig libX11 libXv udev libGLU_combined + SDL libao openal libpulseaudio gtk2 gtksourceview ]; unpackPhase = '' 7z x $src @@ -75,7 +76,7 @@ stdenv.mkDerivation rec { - NEC's PC Engine, SuperGrafx; - Bandai's WonderSwan, WonderSwan Color. ''; - homepage = https://byuu.org/higan/; + homepage = https://byuu.org/emulation/higan/; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; From adf095d222c982c0167b91e12ecb3d68114e1f0e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 6 Oct 2018 23:35:57 -0300 Subject: [PATCH 195/992] guile-reader: small fixes --- pkgs/development/guile-modules/guile-reader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 010c523507fd..35bcd7bfc2f3 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "token readers" of a standard Scheme readers. For example, it is used to implement Skribilo's R5RS-derived document syntax. ''; - homepage = https://www.gnu.org/software/guile-reader; + homepage = https://www.nongnu.org/guile-reader/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.gnu; From 65eb3e38e8842d1110a531ade7b09e890429367c Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 6 Oct 2018 23:29:44 -0400 Subject: [PATCH 196/992] nano: 3.0 -> 3.1 --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 9c50d8e8b78e..36c400a74faa 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "3.0"; + version = "3.1"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0"; + sha256 = "17kinzyv6vwgyx2d0ym1kp65qbf7kxzwpyg21ic1rijv1aj2rh0l"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; From 82b2b9135a331ea786d6c00df3c8e6df3d551159 Mon Sep 17 00:00:00 2001 From: Alex Leferry 2 Date: Sun, 7 Oct 2018 11:20:53 +0200 Subject: [PATCH 197/992] cool-retro-term: Fix link to home page --- pkgs/applications/misc/cool-retro-term/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index f4ad3a1c5382..c9cc2d6db424 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { feel of the old cathode tube screens. It has been designed to be eye-candy, customizable, and reasonably lightweight. ''; - homepage = https://github.com/Swordifish90/cool-retro-term; + homepage = https://github.com/Swordfish90/cool-retro-term; license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; From a9a88b0942c0bbc0b1dc6db22e2608e75c8446c7 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 6 Oct 2018 18:30:44 +0200 Subject: [PATCH 198/992] vdirsyncer: fix build due to #47709 --- pkgs/tools/misc/vdirsyncer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 0655264cc542..c273ef879682 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -41,7 +41,7 @@ in pythonPackages.buildPythonApplication rec { preBuild = '' mkdir -p rust/target/release - ln -s ${native}/bin/libvdirsyncer_rustext* rust/target/release/ + ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/ ''; LC_ALL = "en_US.utf8"; From 226f31b3a2e5e76302a89cc3617171848b60294c Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 7 Oct 2018 12:46:15 +0200 Subject: [PATCH 199/992] ja2-stracciatella: fix build due to #47709 --- pkgs/games/ja2-stracciatella/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 0e5702d46146..5dbab979272c 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ./remove-rust-buildstep.patch ]; preConfigure = '' - sed -i -e 's|rust-stracciatella|${libstracciatella}/bin/libstracciatella.so|g' CMakeLists.txt + sed -i -e 's|rust-stracciatella|${libstracciatella}/lib/libstracciatella.so|g' CMakeLists.txt cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") ''; From 99c8dc4a11c780a67d4443510b3de173b5380d88 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 7 Oct 2018 13:10:50 +0200 Subject: [PATCH 200/992] charybdis service: bin/charybdis-ircd -> bin/charybdis --- nixos/modules/services/networking/charybdis.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix index 6d57faa9ac2b..3d02dc8d1375 100644 --- a/nixos/modules/services/networking/charybdis.nix +++ b/nixos/modules/services/networking/charybdis.nix @@ -90,7 +90,7 @@ in BANDB_DBPATH = "${cfg.statedir}/ban.db"; }; serviceConfig = { - ExecStart = "${charybdis}/bin/charybdis-ircd -foreground -logfile /dev/stdout -configfile ${configFile}"; + ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}"; Group = cfg.group; User = cfg.user; PermissionsStartOnly = true; # preStart needs to run with root permissions From a01cab05c626f17632edb3776f16fabb89afc106 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 7 Oct 2018 14:08:16 +0200 Subject: [PATCH 201/992] haskellPackages.arbtt: unbreak with jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 409f159387fd..7dc7ba425e10 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1153,4 +1153,7 @@ self: super: { }); xmonad-extras = doJailbreak super.xmonad-extras; + + arbtt = doJailbreak super.arbtt; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 096be6d9418e6ead24db1a56738d8a3086c298c5 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 7 Oct 2018 16:45:05 +0200 Subject: [PATCH 202/992] haskellPackages.shell-conduit: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 409f159387fd..1f270ce1e158 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -103,18 +103,12 @@ self: super: { }; # Fix test trying to access /home directory - shell-conduit = (overrideCabal super.shell-conduit (drv: { + shell-conduit = overrideCabal super.shell-conduit (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo # see: https://github.com/psibi/shell-conduit/issues/12 doCheck = !pkgs.stdenv.isDarwin; - })).overrideScope (self: super: { - # shell-conduit doesn't build with conduit 1.3 - # see https://github.com/psibi/shell-conduit/issues/15 - conduit = self.conduit_1_2_13_1; - conduit-extra = self.conduit-extra_1_2_3_2; - resourcet = self.resourcet_1_1_11; }); # https://github.com/froozen/kademlia/issues/2 From 250485cb60ef1de0727ab2c20d4d5815f4ed72db Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Oct 2018 17:28:11 +0200 Subject: [PATCH 203/992] aeolus: 0.9.5 -> 0.9.7 --- pkgs/applications/audio/aeolus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index 68a9bb63e2e0..7b80b32331bc 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "aeolus-${version}"; - version = "0.9.5"; + version = "0.9.7"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; - sha256 = "0wfp8ihldyq2dhdyy7ld7z0zzfvnwam1dvbxnpd9d6xgc4k3j4nv"; + sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k"; }; buildInputs = [ From d6860f40b447ab82fc6f2ae6fc1dda57203bac1a Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Oct 2018 17:32:38 +0200 Subject: [PATCH 204/992] tetraproc: 0.8.2 -> 0.8.6 --- pkgs/applications/audio/tetraproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index 535d53d99eeb..257963de256f 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "tetraproc-${version}"; - version = "0.8.2"; + version = "0.8.6"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; - sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv"; + sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7"; }; nativeBuildInputs = [ makeWrapper ]; From 4fd0f592afec641f439c7ba53d2f46e90ca9a579 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Oct 2018 17:33:10 +0200 Subject: [PATCH 205/992] zita-alsa-pcmi: 0.2.0 -> 0.3.2 --- .../libraries/audio/zita-alsa-pcmi/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index e3c0f0394772..320fc41f76c5 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "zita-alsa-pcmi-${version}"; - version = "0.2.0"; + version = "0.3.2"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; - sha256 = "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9"; + sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s"; }; buildInputs = [ alsaLib ]; buildPhase = '' - cd libs + cd source make PREFIX="$out" # create lib link for building apps @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { # apps cd ../apps - CXXFLAGS+=" -I../libs" \ - LDFLAGS+=" -L../libs" \ + CXXFLAGS+=" -I../source" \ + LDFLAGS+=" -L../source" \ make PREFIX="$out" ''; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { mkdir "$out/include" mkdir "$out/bin" - cd ../libs + cd ../source - # libs + # source install -Dm755 libzita-alsa-pcmi.so.$version \ "$out/lib/libzita-alsa-pcmi.so.$version" @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { install -Dm755 ../apps/alsa_delay \ "$out/bin/alsa_delay" install -Dm755 ../apps/alsa_loopback \ - "$out/bin/alsa_delay" + "$out/bin/alsa_loopback" ''; meta = { From 395b5f6a4bc6aedac2ac96561de193061e7d2975 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Oct 2018 17:34:00 +0200 Subject: [PATCH 206/992] zita-convolver: 4.0.0 -> 4.0.3 --- pkgs/development/libraries/audio/zita-convolver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 11a06d4f39ac..4fc5c12ccc4c 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "zita-convolver-${version}"; - version = "4.0.0"; + version = "4.0.3"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; - sha256 = "0fx7f48ls0rlndqrmd4k7ifpnml39yxzc2f0n6xyysypgn06y673"; + sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs"; }; buildInputs = [ fftwFloat ]; patchPhase = '' - cd libs + cd source sed -e "s@ldconfig@@" -i Makefile ''; From 123cb978d3e8aba2709e63966df39564b77fa71e Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Oct 2018 17:35:03 +0200 Subject: [PATCH 207/992] zita-resampler: 1.6.0 -> 1.6.2 --- pkgs/development/libraries/audio/zita-resampler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 00a0a5082137..e9cccab39f02 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "zita-resampler-${version}"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; - sha256 = "1w48lp99jn4wh687cvbnbnjgaraqzkb4bgir16cp504x55v8v20h"; + sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3"; }; makeFlags = [ @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; patchPhase = '' - cd libs + cd source sed -e "s@ldconfig@@" -i Makefile ''; From c1949a3449740e1ca72d0080714d2f28d7b83cf0 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Oct 2018 17:35:56 +0200 Subject: [PATCH 208/992] libclthreads: 2.4.0 -> 2.4.2 --- .../libraries/libclthreads/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index 6d37eb19c712..a2f6858a05c9 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -2,20 +2,17 @@ stdenv.mkDerivation rec { name = "libclthreads-${version}"; - version = "2.4.0"; + version = "2.4.2"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; - sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6"; + sha256 = "0cbs1w89q8wfjrrhvxf6xk0y02nkjl5hd0yb692c8ma01i6b2nf6"; }; patchPhase = '' - # Fix hardcoded paths to executables - sed -e "s@/usr/bin/install@install@" -i ./Makefile - sed -e "s@/sbin/ldconfig@ldconfig@" -i ./Makefile - - # Remove useless symlink: /lib64 -> /lib - sed -e '/ln -sf \$(CLTHREADS_MIN) \$(PREFIX)\/\$(LIBDIR)\/\$(CLTHREADS_SO)/d' -i ./Makefile + cd source + # don't run ldconfig: + sed -e "/ldconfig/d" -i ./Makefile ''; makeFlags = [ @@ -24,12 +21,13 @@ stdenv.mkDerivation rec { ]; preInstall = '' - # The Makefile does not create the include directory + # The Makefile does not create the include and lib directories mkdir -p $out/include + mkdir -p $out/lib ''; postInstall = '' - ln -s $out/lib/libclthreads.so.${version} $out/lib/libclthreads.so + ln $out/lib/libclthreads.so $out/lib/libclthreads.so.2 ''; meta = with stdenv.lib; { From 9affe6ca47746385cd106a551e3516665663bdfe Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Oct 2018 17:36:36 +0200 Subject: [PATCH 209/992] libclxclient: 3.9.0 -> 3.9.2 --- .../libraries/libclxclient/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index ce67a8efa80e..6e6ca647fc0f 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -1,20 +1,28 @@ -{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg }: +{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }: stdenv.mkDerivation rec { name = "libclxclient-${version}"; - version = "3.9.0"; + version = "3.9.2"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; - sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; + sha256 = "10bq6fy8d3pr1x2x3xx9qhf2hdxrwdgvg843a2y6lx70y1jfj0c5"; }; buildInputs = [ libclthreads libX11 libXft xorg.xproto ]; + nativeBuildInputs = [ pkgconfig ]; + NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft.dev}/include"; patchPhase = '' - sed -e "s@ldconfig@@" -i Makefile + cd source + # use pkg-config instead of pkgcon: + sed -e 's/pkgconf/pkg-config/g' -i ./Makefile + # don't run ldconfig: + sed -e "/ldconfig/d" -i ./Makefile + # make sure it can find clxclient.h: + sed -e 's//"clxclient.h"/' -i ./enumip.cc ''; makeFlags = [ From cd71e1036b874e6c132ee008a4fea356dc10a245 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 7 Oct 2018 18:47:15 +0200 Subject: [PATCH 210/992] zimreader: add license See https://phabricator.wikimedia.org/source/openzim/browse/master/zimreader/COPYING --- pkgs/tools/text/zimreader/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 4271bf095a14..fbd9bc3fa20a 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool to serve ZIM files using HTTP"; homepage = http://git.wikimedia.org/log/openzim; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ robbinch juliendehos ]; platforms = [ "x86_64-linux" ]; }; From fdec2e16bc29a58f61f304fd91a21b0e466ea277 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 7 Oct 2018 18:51:24 +0200 Subject: [PATCH 211/992] wolfssl: add license --- pkgs/development/libraries/wolfssl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 30291a180226..8f57a0bf1b71 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; platforms = platforms.all; + license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ mcmtroffaes ]; }; } From 241a13cc70329a47da5c6436b927fa4dc616d072 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 7 Oct 2018 18:55:00 +0200 Subject: [PATCH 212/992] wego: add license --- pkgs/applications/misc/wego/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index b61566af6b2c..7a09a8045770 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -14,4 +14,8 @@ buildGoPackage rec { }; goDeps = ./deps.nix; + + meta = { + license = stdenv.lib.licenses.isc; + }; } From 59da2351883489099ccfd4af4129d9f0e329a046 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 7 Oct 2018 18:56:48 +0200 Subject: [PATCH 213/992] tnt: add license See "Disclaimer" at https://math.nist.gov/tnt/download.html --- pkgs/development/libraries/tnt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 23ef997e5ce1..229e4cfaa6c0 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://math.nist.gov/tnt/; description = "Template Numerical Toolkit: C++ headers for array and matrices"; + license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.unix; }; } From aba5390bc59d3ceae1178c7f98e8ab85301ff9c8 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 7 Oct 2018 19:02:01 +0200 Subject: [PATCH 214/992] sipcmd: add license --- pkgs/applications/networking/sipcmd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/sipcmd/default.nix b/pkgs/applications/networking/sipcmd/default.nix index 4c8a90137bd0..a36c2286956b 100644 --- a/pkgs/applications/networking/sipcmd/default.nix +++ b/pkgs/applications/networking/sipcmd/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/tmakkonen/sipcmd; description = "The command line SIP/H.323/RTP softphone"; platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl2; }; } From 346f1c8b63e26864b8156e8a7e30aaa9a0dc011c Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 7 Oct 2018 19:04:06 +0200 Subject: [PATCH 215/992] rlog: add license See https://code.google.com/archive/p/rlog/ --- pkgs/development/libraries/rlog/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix index f96addffb1ae..f8268b5eb7cd 100644 --- a/pkgs/development/libraries/rlog/default.nix +++ b/pkgs/development/libraries/rlog/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation { homepage = http://www.arg0.net/rlog; description = "A C++ logging library used in encfs"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl3; }; } From f41c55b2ca34ba8d6ad78ba8fc29d30a0075892f Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 25 Sep 2018 22:06:53 -0400 Subject: [PATCH 216/992] vtable-dumper: init at 1.2 --- .../tools/misc/vtable-dumper/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/misc/vtable-dumper/default.nix diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix new file mode 100644 index 000000000000..e806a7796386 --- /dev/null +++ b/pkgs/development/tools/misc/vtable-dumper/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, libelf }: + +stdenv.mkDerivation rec { + name = "vtable-dumper-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "lvc"; + repo = "vtable-dumper"; + rev = version; + sha256 = "0sl7lnjr2l4c2f7qaazvpwpzsp4gckkvccfam88wcq9f7j9xxbyp"; + }; + + buildInputs = [ libelf ]; + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/lvc/vtable-dumper; + description = "A tool to list content of virtual tables in a C++ shared library"; + license = licenses.lgpl21; + maintainers = [ maintainers.bhipple ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15c4a5944a16..469ab09c53b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8909,6 +8909,8 @@ with pkgs; pythonPackages = python3Packages; }; + vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; + watson-ruby = callPackage ../development/tools/misc/watson-ruby {}; xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; From cc07807b5bdaa20acd2b4fb59097edd0cd15b14e Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 25 Sep 2018 22:38:07 -0400 Subject: [PATCH 217/992] abi-dumper: init at 1.1 --- .../tools/misc/abi-dumper/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/misc/abi-dumper/default.nix diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix new file mode 100644 index 000000000000..047cd466baac --- /dev/null +++ b/pkgs/development/tools/misc/abi-dumper/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }: + +stdenv.mkDerivation rec { + name = "abi-dumper-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "lvc"; + repo = "abi-dumper"; + rev = version; + sha256 = "1byhw132aj7a5a5zh5s3pnjlrhdk4cz6xd5irp1y08jl980qba5j"; + }; + + patchPhase = '' + substituteInPlace abi-dumper.pl \ + --replace eu-readelf ${elfutils}/bin/eu-readelf \ + --replace vtable-dumper ${vtable-dumper}/bin/vtable-dumper \ + --replace '"ctags"' '"${ctags}/bin/ctags"' + ''; + + buildInputs = [ elfutils ctags perl vtable-dumper ]; + + preBuild = "mkdir -p $out"; + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/lvc/abi-dumper; + description = "Dump ABI of an ELF object containing DWARF debug info"; + license = licenses.lgpl21; + maintainers = [ maintainers.bhipple ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 469ab09c53b3..f2026c2b7ed8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7960,6 +7960,8 @@ with pkgs; ### DEVELOPMENT / TOOLS + abi-dumper = callPackage ../development/tools/misc/abi-dumper { }; + activator = throw '' Typesafe Activator was removed in 2017-05-08 as the actual package reaches end of life. @@ -7968,13 +7970,13 @@ with pkgs; for more information. ''; + adtool = callPackage ../tools/admin/adtool { }; + inherit (callPackage ../development/tools/alloy { }) alloy4 alloy5 alloy; - adtool = callPackage ../tools/admin/adtool { }; - augeas = callPackage ../tools/system/augeas { }; inherit (callPackages ../tools/admin/ansible {}) From 8d42787c61e149f58e708a641a6e9ffc017efece Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 25 Sep 2018 22:45:15 -0400 Subject: [PATCH 218/992] abi-compliance-checker: init at 2.3 --- .../misc/abi-compliance-checker/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/misc/abi-compliance-checker/default.nix diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix new file mode 100644 index 000000000000..db0e41d27ab3 --- /dev/null +++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }: + +stdenv.mkDerivation rec { + name = "abi-compliance-checker-${version}"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "lvc"; + repo = "abi-compliance-checker"; + rev = version; + sha256 = "1f1f9j2nf9j83sfl2ljadch99v6ha8rq8xm7ax5akc05hjpyckij"; + }; + + buildInputs = [ binutils ctags perl ]; + propagatedBuildInputs = [ abi-dumper ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://lvc.github.io/abi-compliance-checker; + description = "A tool for checking backward API/ABI compatibility of a C/C++ library"; + license = licenses.lgpl21; + maintainers = [ maintainers.bhipple ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2026c2b7ed8..1195ba9863cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7960,6 +7960,8 @@ with pkgs; ### DEVELOPMENT / TOOLS + abi-compliance-checker = callPackage ../development/tools/misc/abi-compliance-checker { }; + abi-dumper = callPackage ../development/tools/misc/abi-dumper { }; activator = throw '' From 64d0676fe1cafc47d710f0e62ff1139814e314ad Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 7 Oct 2018 22:14:19 +0200 Subject: [PATCH 219/992] buildRustPackage: fix regex for separating lib and bin E.g. exa was wrongly put into /lib, as it matches .*.a but not .*\.a --- pkgs/build-support/rust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index ec4514121c24..5fdcf520440e 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -92,8 +92,8 @@ in stdenv.mkDerivation (args // { installPhase = args.installPhase or '' runHook preInstall mkdir -p $out/bin $out/lib - find target/release -maxdepth 1 -type f -executable ! \( -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin - find target/release -maxdepth 1 -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib + find target/release -maxdepth 1 -type f -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin + find target/release -maxdepth 1 -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib rmdir --ignore-fail-on-non-empty $out/lib $out/bin runHook postInstall ''; From f81fe9d978c2b4eeea8cf628cebccdf57fb40060 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 9 Jun 2018 01:35:34 +0200 Subject: [PATCH 220/992] uhub: re-enable sqlite plugin --- pkgs/servers/uhub/default.nix | 1 + pkgs/servers/uhub/plugin-dir.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 87d0a0ee4553..297e064d7caf 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { "mod_welcome" "mod_logging" "mod_auth_simple" + "mod_auth_sqlite" "mod_chat_history" "mod_chat_only" "mod_topic" diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch index 01cbcbb31cf3..d29d600425ff 100644 --- a/pkgs/servers/uhub/plugin-dir.patch +++ b/pkgs/servers/uhub/plugin-dir.patch @@ -7,7 +7,7 @@ - install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_history_sqlite mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL ) - install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL ) + -+ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads ) ++ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads ) + + foreach( PLUGIN ${PLUGINS} ) + install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL ) From 6cc84ed1e484bec93d8de0478f92a9b602f947a5 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 6 Oct 2018 20:40:33 +0200 Subject: [PATCH 221/992] howl: init at 0.5.3 --- pkgs/applications/editors/howl/default.nix | 40 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/editors/howl/default.nix diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix new file mode 100644 index 000000000000..8f75eda7ef70 --- /dev/null +++ b/pkgs/applications/editors/howl/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk3, librsvg }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "howl-${version}"; + version = "0.5.3"; + + # Use the release tarball containing pre-downloaded dependencies sources + src = fetchurl { + url = "https://github.com/howl-editor/howl/releases/download/0.5.3/howl-0.5.3.tgz"; + sha256 = "0gnc8vr5h8mwapbcqc1zr9la62rb633awyqgy8q7pwjpiy85a03v"; + }; + + sourceRoot = "./howl-${version}/src"; + + # The Makefile uses "/usr/local" if not explicitly overridden + installFlags = [ "PREFIX=$(out)" ]; + + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ gtk3 librsvg ]; + enableParallelBuilding = true; + + # Required for the program to properly load its SVG assets + postInstall = '' + wrapProgram $out/bin/howl \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + meta = { + homepage = https://howl.io/; + description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; + license = licenses.mit; + maintainers = with maintainers; [ pacien ]; + + # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c403077dbb9b..5bfc0a544d69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17022,6 +17022,8 @@ with pkgs; gtk = gtk3; }; + howl = callPackage ../applications/editors/howl { }; + ht = callPackage ../applications/editors/ht { }; hubstaff = callPackage ../applications/misc/hubstaff { }; From 92a77c32baa6c0f7cbb12213c27f8961bca9bb67 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 8 Oct 2018 00:53:16 +0200 Subject: [PATCH 222/992] uhub: use official upstream sources the project changed the code repository to github --- pkgs/servers/uhub/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 297e064d7caf..456f73dc52ed 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, sqlite, pkgconfig, systemd +{ stdenv, fetchurl, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd , tlsSupport ? false }: assert tlsSupport -> openssl != null; @@ -7,9 +7,11 @@ stdenv.mkDerivation rec { name = "uhub-${version}"; version = "0.5.0"; - src = fetchurl { - url = "https://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2"; - sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5"; + src = fetchFromGitHub { + owner = "janvidar"; + repo = "uhub"; + rev = version; + sha256 = "0zdbxfvw7apmfhqgsfkfp4pn9iflzwdn0zwvzymm5inswfc00pxg"; }; nativeBuildInputs = [ pkgconfig ]; From 0329e26f895aeb6bf405014b70c96a582f861eaf Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 7 Oct 2018 16:09:51 -0700 Subject: [PATCH 223/992] vips: fetch from GitHub and build directly from source This used to build from what the README calls a "pre-baked tarball". --- pkgs/tools/graphics/vips/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 735d2565b045..489442e4c2a4 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,24 +1,34 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, expat, +{ stdenv, pkgconfig, glib, libxml2, expat, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, ApplicationServices, - python27, libpng ? null + python27, libpng ? null, + fetchFromGitHub, + autoreconfHook, + gtk-doc, + gobjectIntrospection, }: stdenv.mkDerivation rec { name = "vips-${version}"; version = "8.7.0"; - src = fetchurl { - url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz"; - sha256 = "16086hdg6m44llz69fkp1n0ckjb7zhl6i2bg0wwllrchznikwiy4"; + src = fetchFromGitHub { + owner = "libvips"; + repo = "libvips"; + rev = "v${version}"; + sha256 = "1dwcpmpqbgb9lkajnqv50mrsn97mxbxpq6b5aya7fgfkgdnrs9sw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobjectIntrospection ]; buildInputs = [ glib libxml2 fftw orc lcms imagemagick openexr libtiff libjpeg libgsf libexif python27 libpng expat ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices; + autoreconfPhase = '' + ./autogen.sh + ''; + meta = with stdenv.lib; { homepage = http://www.vips.ecs.soton.ac.uk; description = "Image processing system for large images"; From 641cb61ef78c63222a6543e54dd9edb476529044 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sun, 7 Oct 2018 20:04:59 -0400 Subject: [PATCH 224/992] jsonnet: skip building the website (#47981) The emscripten build of jsonnet is only used in the interactive demo found on jsonnet.org, and I don't think we need to include the whole website in our package. This reduces the transitive closure from ~100mb to ~32mb, and the build duration from ~8 minutes to ~20 seconds on my machine. --- .../development/compilers/jsonnet/default.nix | 23 ++++++++----------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index f363c6fdb5ee..15eec4134acf 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,12 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, emscripten -, enableJsonnetJs ? !stdenv.isDarwin -}: +{ stdenv, lib, fetchFromGitHub }: -let version = "0.11.2"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "jsonnet-${version}"; - version = version; + version = "0.11.2"; src = fetchFromGitHub { rev = "v${version}"; @@ -15,19 +11,18 @@ stdenv.mkDerivation { sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym"; }; - buildInputs = if enableJsonnetJs then [ emscripten ] else [ ]; - enableParallelBuilding = true; - makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache''] ++ - (if enableJsonnetJs then ["all"] else ["jsonnet" "libjsonnet.so" "libjsonnet++.so"]); + makeFlags = [ + "jsonnet" + "libjsonnet.so" + ]; installPhase = '' - mkdir -p $out/bin $out/lib $out/share/ + mkdir -p $out/bin $out/lib $out/include cp jsonnet $out/bin/ cp libjsonnet*.so $out/lib/ - cp -a doc $out/share/doc - cp -a include $out/include + cp -a include/*.h $out/include/ ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15c4a5944a16..bf1f1caa27c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10110,9 +10110,7 @@ with pkgs; jsoncpp = callPackage ../development/libraries/jsoncpp { }; - jsonnet = callPackage ../development/compilers/jsonnet { - emscripten = emscripten.override {python=python2;}; - }; + jsonnet = callPackage ../development/compilers/jsonnet { }; jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { }; From fb0b3ac7217d2f71536cd726cf089d8011178c4d Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Mon, 8 Oct 2018 09:28:53 +0900 Subject: [PATCH 225/992] nixos/fish: use 'escapeShellArg' for shell aliases --- nixos/modules/programs/fish.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index c3f742acde2e..5948fe11f92b 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -9,7 +9,7 @@ let cfg = config.programs.fish; fishAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k} '${v}'") cfg.shellAliases + mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") cfg.shellAliases ); in From 9a904b3a0880e73eb351d3214d1a3f6d09c75600 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 7 Oct 2018 17:21:30 -0500 Subject: [PATCH 226/992] nheko: 0.6.1 -> 0.6.2 --- .../networking/instant-messengers/nheko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 810720baa7ca..0d34a0a43628 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "00jigca7kcqwm57qalz7ifz9p6v7p3pnamjvpkxjjix2rm9wmg2q"; + sha256 = "014k68mmw3ys7ldgj96kkr1i1lyv2nk89wndkqznsizcr3097fn5"; }; # If, on Darwin, you encounter the error From de25f785e5739b8be708842d11aac9b8396f8af9 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 7 Oct 2018 20:31:33 -0400 Subject: [PATCH 227/992] linux_rpi: 1.20180817 -> 1.20180919 --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index d95c2caa2cf0..096b3ecde22a 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.14.62"; - tag = "1.20180817"; + modDirVersion = "4.14.70"; + tag = "1.20180919"; in lib.overrideDerivation (buildLinux (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ lib.overrideDerivation (buildLinux (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "17k7c9hcp834qmlpllag8jc6xhym9wkr5lck1vr0y2wlcxccwnaz"; + sha256 = "1zjvzk6rhrn3ngc012gjq3v7lxn8hy89ljb7fqwld5g7py9lkf0b"; }; defconfig = { From ec1aa05a27bc3c9d68b4c448edd9964b21cc923f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 7 Oct 2018 20:32:38 -0400 Subject: [PATCH 228/992] raspberrypifw: 1.20180817 -> 1.20180919 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 11a5074cff2c..db1091e349dc 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.20180817"; + version = "1.20180919"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0cjlgs7y0x7wjvbz6046017yb9r9wkjrxksvlnc6i9mgdjcryqqm"; + sha256 = "0aw5fzz7kr18cc4phdn81g45swkpaf4022sgi72pq2q6zzqnrdg4"; }; installPhase = '' From 964ae43b53e689d4b8dd77dcba5dffada875b6b2 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 7 Oct 2018 20:33:30 -0400 Subject: [PATCH 229/992] raspberrypi-tools: 2018-02-05 -> 2018-10-03 --- pkgs/os-specific/linux/firmware/raspberrypi/tools.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 91e6e7f4cc59..4685f6757179 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-tools-${version}"; - version = "2018-02-05"; + version = "2018-10-03"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "a343dcad1dae4e93f4bfb99496697e207f91027e"; - sha256 = "1z4qrwjb7x3a45mx978q8vyhnx068sgzhymm4z0ayhckji4ngal1"; + rev = "de4a7f2e3c391e2d3bc76af31864270e7802d9ac"; + sha256 = "0w96xa98ngdk9m6wv185w8waa7wm2hkn2bhxz52zd477hchzrxlg"; }; patches = [ ./tools-dont-install-sysv-init-scripts.patch ]; From 7a86c6760a758e3305e668249bd8ddf88c457529 Mon Sep 17 00:00:00 2001 From: Brandon Elam Barker Date: Thu, 20 Sep 2018 21:36:21 +0000 Subject: [PATCH 230/992] plan9port: 2016-04-18 -> 2018-09-20 --- pkgs/tools/system/plan9port/builder.sh | 3 ++- pkgs/tools/system/plan9port/default.nix | 30 ++++++++++++++++------- pkgs/tools/system/plan9port/fontsrv.patch | 14 ----------- 3 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 pkgs/tools/system/plan9port/fontsrv.patch diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 6085e6f841ac..7729bae897c0 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -5,7 +5,8 @@ export PLAN9_TARGET=$PLAN9 configurePhase() { - echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include -I${freetype_dev}/include\" > LOCAL.config + echo CFLAGS=\"-I${fontconfig_dev}/include -I${xproto_exp}/include -I${xextproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config + echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xproto_exp}/lib -L${xextproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> LOCAL.config echo X11=\"${libXt_dev}/include\" >> LOCAL.config for f in `grep -l -r /usr/local/plan9`; do diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index dc588e54aea8..c71c70b57a7a 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -2,24 +2,23 @@ , xproto ? null , xextproto ? null , libXext ? null +, zlib ? null # For building web manuals , perl ? null , samChordingSupport ? true #from 9front }: stdenv.mkDerivation rec { - name = "plan9port-2016-04-18"; + name = "plan9port-2018-09-20"; src = fetchgit { # Latest, same as on github, google code is old - url = "https://plan9port.googlesource.com/plan9"; - rev = "35d43924484b88b9816e40d2f6bff4547f3eec47"; - sha256 = "1dvg580rkav09fra2gnrzh271b4fw6bgqfv4ib7ds5k3j55ahcdc"; + url = "https://github.com/9fans/plan9port.git"; + rev = "a82a8b6368274d77d42f526e379b74e79c137e26"; + sha256 = "1icywcnqv0dz1mkm7giakii536nycp0ajxnmzkx4944dxsmhcwq1"; }; - patches = [ - ./fontsrv.patch - ] ++ stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ]; + patches = stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ]; postPatch = '' #hardcoded path @@ -59,11 +58,24 @@ stdenv.mkDerivation rec { homepage = http://swtch.com/plan9port/; description = "Plan 9 from User Space"; license = licenses.lpl-102; - maintainers = with maintainers; [ ftrvxmtrx kovirobi ]; + maintainers = with maintainers; [ bbarker ftrvxmtrx kovirobi ]; platforms = platforms.unix; }; - + + libX11_dev = libX11.dev; libXt_dev = libXt.dev; + libXext_dev = libXext.dev; fontconfig_dev = fontconfig.dev; freetype_dev = freetype.dev; + zlib_dev = zlib.dev; + + xproto_exp = xproto; + xextproto_exp = xextproto; + libX11_exp = libX11; + libXt_exp = libXt; + libXext_exp = libXext; + freetype_exp = freetype; + zlib_exp = zlib; + + fontconfig_lib = fontconfig.lib; } diff --git a/pkgs/tools/system/plan9port/fontsrv.patch b/pkgs/tools/system/plan9port/fontsrv.patch deleted file mode 100644 index 49fd9c04231b..000000000000 --- a/pkgs/tools/system/plan9port/fontsrv.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -r dc0640f14d07 src/cmd/mkfile ---- a/src/cmd/mkfile Tue Mar 25 23:23:10 2014 -0400 -+++ b/src/cmd/mkfile Mon Apr 14 22:36:05 2014 +0530 -@@ -4,8 +4,8 @@ - - <$PLAN9/src/mkmany - --BUGGERED='CVS|faces|factotum|fontsrv|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer' --DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` $FONTSRV -+BUGGERED='CVS|faces|factotum|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer' -+DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` - - <$PLAN9/src/mkdirs - From 95d307ab14876c3675e030d2c5307186bcbbebd3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 8 Oct 2018 10:36:07 +0800 Subject: [PATCH 231/992] xdiff: 4.0.1.2017062 -> 5.0b1 - version bump only --- pkgs/development/tools/misc/xxdiff/tip.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index 844758c0f065..1424b8fe1974 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }: stdenv.mkDerivation rec { - name = "xxdiff-4.0.1.20170623"; + name = "xxdiff-5.0b1"; src = fetchFromBitbucket { owner = "blais"; From 1d8aa40898787100a6e06ed6dd26a6eaa6c4a470 Mon Sep 17 00:00:00 2001 From: Marica Odagaki Date: Wed, 26 Sep 2018 20:08:20 -0800 Subject: [PATCH 232/992] aws-env: init at 0.4 --- pkgs/tools/admin/aws-env/default.nix | 26 ++++++++++++++++++++++++++ pkgs/tools/admin/aws-env/deps.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/tools/admin/aws-env/default.nix create mode 100644 pkgs/tools/admin/aws-env/deps.nix diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/tools/admin/aws-env/default.nix new file mode 100644 index 000000000000..19f149b02274 --- /dev/null +++ b/pkgs/tools/admin/aws-env/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, lib }: + +buildGoPackage rec { + pname = "aws-env"; + version = "0.4"; + name = "${pname}-${version}"; + rev = "v${version}"; + + goPackagePath = "github.com/Droplr/aws-env"; + + src = fetchFromGitHub { + owner = "Droplr"; + repo = pname; + inherit rev; + sha256 = "0pw1qz1nn0ig90p8d8c1qcwsdz0m9w63ib07carhh86gw55425j7"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Secure way to handle environment variables in Docker and envfile with AWS Parameter Store"; + homepage = "https://github.com/Droplr/aws-env"; + license = licenses.mit; + maintainers = with maintainers; [ srhb ]; + }; +} diff --git a/pkgs/tools/admin/aws-env/deps.nix b/pkgs/tools/admin/aws-env/deps.nix new file mode 100644 index 000000000000..891a6ecb5962 --- /dev/null +++ b/pkgs/tools/admin/aws-env/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "5f03c87445c9dcd6aa831a76a77170919265aa97"; + sha256 = "146rwinw2x4r0f2pixv62b7mmhvnnfvvjmfaj6dqjxrhp0imcxdi"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae61bafd3601..ae46a38ad57e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -583,6 +583,8 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; + aws-env = callPackage ../tools/admin/aws-env { }; + aws-okta = callPackage ../tools/security/aws-okta { }; aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; From 38c510c879a964cd1a381705d7898d90449a06c9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 6 Oct 2018 14:42:54 -0500 Subject: [PATCH 233/992] netbsd: misc cleanups --- pkgs/os-specific/bsd/netbsd/default.nix | 322 ++++++++---------------- 1 file changed, 110 insertions(+), 212 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index f9a614d32336..c53b7e50b9f3 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -69,6 +69,9 @@ let OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp"; + MKPIC = if stdenv.isDarwin then "no" else "yes"; + MKRELRO = if stdenv.isDarwin then "no" else "yes"; + INSTALL_FILE = "install -U -c"; INSTALL_DIR = "xinstall -U -d"; INSTALL_LINK = "install -U -l h"; @@ -164,6 +167,100 @@ let }; }) // (removeAttrs attrs ["makeFlags"])); + libutil = netBSDDerivation { + path = "lib/libutil"; + version = "8.0"; + sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; + extraPaths = [ + (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") + ]; + }; + + libc = netBSDDerivation { + path = "lib/libc"; + version = "8.0"; + sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; + extraPaths = [ + (fetchNetBSD "common/lib/libc" "8.0" "1kbhj0vxixvdy9fvsr5y70ri4mlkmim1v9m98sqjlzc1vdiqfqc8") + ]; + }; + + make = netBSDDerivation { + path = "usr.bin/make"; + sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c"; + version = "8.0"; + postPatch = '' + # make needs this to pick up our sys make files + export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" + + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ + --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ + --replace '-Wl,-rpath,''${SHLIBDIR}' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ + --replace /bin/rm rm + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ + --replace '-Wl,--fatal-warnings' "" \ + --replace '-Wl,--warn-shared-textrel' "" + substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ + --replace '-Wl,--whole-archive' "" \ + --replace '-Wl,--no-whole-archive' "" \ + --replace '-Wl,--warn-shared-textrel' "" \ + --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ + --replace '-Wl,-rpath,''${SHLIBDIR}' "" + ''; + postInstall = '' + make -C $NETBSDSRCDIR/share/mk FILESDIR=/share/mk install + ''; + extraPaths = [ + (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") + ]; + }; + + libcurses = netBSDDerivation { + path = "lib/libcurses"; + version = "8.0"; + sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; + buildInputs = [ nbPackages.libterminfo ]; + makeFlags = [ "INCSDIR=/include" ]; + NIX_CFLAGS_COMPILE = [ + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + "-D__warn_references(a,b)=" + ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; + propagatedBuildInputs = [ nbPackages.compat ]; + MKDOC = "no"; # missing vfontedpr + postPatch = '' + substituteInPlace printw.c \ + --replace "funopen2(win, NULL, winwrite, NULL, NULL, NULL)" NULL \ + --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' + substituteInPlace scanw.c \ + --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' + ''; + }; + + libedit = netBSDDerivation { + path = "lib/libedit"; + buildInputs = [ nbPackages.libterminfo libcurses ]; + propagatedBuildInputs = [ nbPackages.compat ]; + makeFlags = [ "INCSDIR=/include" ]; + postPatch = '' + sed -i '1i #undef bool_t' el.h + substituteInPlace config.h \ + --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" + ''; + NIX_CFLAGS_COMPILE = [ + "-D__noinline=" + "-D__scanflike(a,b)=" + "-D__va_list=va_list" + ]; + version = "8.0"; + sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; + }; + nbPackages = rec { ## @@ -245,7 +342,12 @@ let install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h install -D $NETBSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h - + install -D $NETBSDSRCDIR/include/nl_types.h $out/include/nl_types.h + install -D $NETBSDSRCDIR/include/stringlist.h $out/include/stringlist.h + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/include/ssp + touch $out/include/ssp/ssp.h + '' + '' mkdir -p $out/lib/pkgconfig substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \ --subst-var-by out $out \ @@ -353,82 +455,17 @@ let ## END BOOTSTRAPPING ## - libutil = netBSDDerivation { - path = "lib/libutil"; - version = "8.0"; - sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; - extraPaths = [ - (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831") - ]; - }; - - libc = netBSDDerivation { - path = "lib/libc"; - version = "8.0"; - sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3"; - extraPaths = [ - (fetchNetBSD "common/lib/libc" "8.0" "1kbhj0vxixvdy9fvsr5y70ri4mlkmim1v9m98sqjlzc1vdiqfqc8") - ]; - }; - - make = netBSDDerivation { - path = "usr.bin/make"; - sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c"; - version = "8.0"; - postPatch = '' - # make needs this to pick up our sys make files - export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" - - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \ - --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \ - --replace '-Wl,-rpath,''${SHLIBDIR}' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB=' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \ - --replace /bin/rm rm - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \ - --replace '-Wl,--fatal-warnings' "" \ - --replace '-Wl,--warn-shared-textrel' "" - substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \ - --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \ - --replace '-Wl,--whole-archive' "" \ - --replace '-Wl,--no-whole-archive' "" \ - --replace '-Wl,--warn-shared-textrel' "" \ - --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \ - --replace '-Wl,-rpath,''${SHLIBDIR}' "" - ''; - postInstall = '' - (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install) - ''; - extraPaths = [ - (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs") - ]; - }; - mtree = netBSDDerivation { path = "usr.sbin/mtree"; version = "8.0"; sha256 = "0hanmzm8bgwz2bhsinmsgfmgy6nbdhprwmgwbyjm6bl17vgn7vid"; + extraPaths = [ mknod.src ]; }; - who = netBSDDerivation { - path = "usr.bin/who"; + mknod = netBSDDerivation { + path = "sbin/mknod"; version = "8.0"; - sha256 = "0ll76rbblps9hqmncxvw5qx0hhwfz678g70vgfyng8ahxz27rhd9"; - postPatch = lib.optionalString stdenv.isLinux '' - substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ - --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \ - --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ - --replace "timespeccmp(&st.st_mtimespec, &utmpxtime, >)" "st.st_mtimespec.tv_sec == utmpxtime.tv_sec ? st.st_mtimespec.tv_nsec > utmpxtime.tv_nsec : st.st_mtimespec.tv_sec > utmpxtime.tv_sec" - '' + '' - substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \ - --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \ - --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" \ - --replace "timespecclear(&utmpxtime)" "utmpxtime.tv_sec = utmpxtime.tv_nsec = 0" - ''; + sha256 = "0vq66v0hj0r4z2r2z2d3l3c5vh48pvcdmddc8bhm8hzq2civ5df2"; }; getent = netBSDDerivation { @@ -451,135 +488,17 @@ let makeFlags = [ "BINDIR=/share" ]; }; - games = netBSDDerivation { - path = "games"; - sha256 = "1vb4ahmiywgd3q3lzwb34mdd7agdlhsmw077alddkqinvyyxq1jz"; - version = "8.0"; - makeFlags = [ "BINDIR=/bin" - "SCRIPTSDIR=/bin" ]; - postPatch = '' - sed -i '1i #include ' adventure/save.c - - for f in $(find . -name pathnames.h); do - substituteInPlace $f \ - --replace /usr/share/games $out/share/games \ - --replace /usr/games $out/bin \ - --replace /usr/libexec $out/libexec \ - --replace /usr/bin/more ${less}/bin/less \ - --replace /usr/share/dict ${dict}/share/dict - done - substituteInPlace boggle/boggle/bog.h \ - --replace /usr/share/games $out/share/games - substituteInPlace ching/ching/ching.sh \ - --replace /usr/share $out/share \ - --replace /usr/libexec $out/libexec - substituteInPlace hunt/huntd/driver.c \ - --replace "(void) setpgrp(getpid(), getpid());" "" - - # Disable some games that don't build. They should be possible - # to build but need to look at how to implement stuff in - # Linux. macOS is missing gettime. TODO try to get these - # working. - disableGame() { - substituteInPlace Makefile --replace $1 "" - } - - disableGame atc - disableGame dm - disableGame dab - disableGame sail - disableGame trek - ${lib.optionalString stdenv.isLinux "disableGame boggle"} - ${lib.optionalString stdenv.isLinux "disableGame hunt"} - ${lib.optionalString stdenv.isLinux "disableGame larn"} - ${lib.optionalString stdenv.isLinux "disableGame phantasia"} - ${lib.optionalString stdenv.isLinux "disableGame rogue"} - ${lib.optionalString stdenv.isDarwin "disableGame adventure"} - ${lib.optionalString stdenv.isDarwin "disableGame factor"} - ${lib.optionalString stdenv.isDarwin "disableGame gomoku"} - ${lib.optionalString stdenv.isDarwin "disableGame mille"} - ''; - - # HACK strfile needs to be installed first & in the path. The - # Makefile should do this for us but haven't gotten it to work - preBuild = '' - (cd fortune/strfile && make && make BINDIR=/bin install) - export PATH=$out/bin:$PATH - ''; - - postInstall = '' - substituteInPlace $out/usr/share/games/quiz.db/index \ - --replace /usr $out - ''; - - NIX_CFLAGS_COMPILE = [ - "-D__noinline=" - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - "-DOXTABS=XTABS" - "-DRANDOM_MAX=RAND_MAX" - "-DINFTIM=-1" - (lib.optionalString stdenv.hostPlatform.isMusl "-include sys/ttydefaults.h -include sys/file.h") - "-DBE32TOH(x)=((void)0)" - "-DBE64TOH(x)=((void)0)" - "-D__c99inline=__inline" - ]; - - buildInputs = [ compat libcurses libterminfo libressl ]; - extraPaths = [ dict.src who.src ]; - }; - - finger = netBSDDerivation { - path = "usr.bin/finger"; - sha256 = "1mbxjdzcbx7xsbn3x1qm1cd0kna07yh61wqxmrrphjhl5gv13ra3"; - version = "8.0"; - NIX_CFLAGS_COMPILE = [ - (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP") - (if stdenv.isDarwin then "-DSUPPORT_UTMPX" else "-USUPPORT_UTMPX") - ]; - postPatch = '' - NIX_CFLAGS_COMPILE+=" -I$NETBSDSRCDIR/include" - - substituteInPlace extern.h \ - --replace psort _psort - - ${who.postPatch} - ''; - extraPaths = [ who.src ] - ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "8.0" "05690fzz0825p2bq0sfyb01mxwd0wa06qryqgqkwpqk9y2xzc7px"); - }; - fingerd = netBSDDerivation { path = "libexec/fingerd"; sha256 = "0blcahhgyj1lm0mimrbvgmq3wkjvqk5wy85sdvbs99zxg7da1190"; version = "8.0"; }; - libedit = netBSDDerivation { - path = "lib/libedit"; - buildInputs = [ libterminfo libcurses ]; - propagatedBuildInputs = [ compat ]; - makeFlags = [ "INCSDIR=/include" ]; - postPatch = '' - sed -i '1i #undef bool_t' el.h - substituteInPlace config.h \ - --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" "" - ''; - NIX_CFLAGS_COMPILE = [ - "-D__noinline=" - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - ]; - version = "8.0"; - sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd"; - }; - libterminfo = netBSDDerivation { path = "lib/libterminfo"; version = "8.0"; sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r"; buildInputs = [ compat tic nbperf ]; - MKPIC = if stdenv.isDarwin then "no" else "yes"; makeFlags = [ "INCSDIR=/include" ]; postPatch = '' substituteInPlace term.c --replace /usr/share $out/share @@ -587,36 +506,14 @@ let ''; postInstall = '' - (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install) + make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share + make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share install ''; extraPaths = [ (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm") ]; }; - libcurses = netBSDDerivation { - path = "lib/libcurses"; - version = "8.0"; - sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs"; - buildInputs = [ libterminfo ]; - makeFlags = [ "INCSDIR=/include" ]; - NIX_CFLAGS_COMPILE = [ - "-D__scanflike(a,b)=" - "-D__va_list=va_list" - "-D__warn_references(a,b)=" - ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; - propagatedBuildInputs = [ compat ]; - MKDOC = "no"; # missing vfontedpr - MKPIC = if stdenv.isDarwin then "no" else "yes"; - postPatch = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace printw.c \ - --replace "funopen2(win, NULL, winwrite, NULL, NULL, NULL)" NULL \ - --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));' - substituteInPlace scanw.c \ - --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));' - ''; - }; - nbperf = netBSDDerivation { path = "usr.bin/nbperf"; version = "8.0"; @@ -648,6 +545,7 @@ let version = "8.0"; sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; patches = [ ./locale.patch ]; + NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; }; }; From d2866f5afadf89df93a99755fbf8a98a339e5602 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 8 Oct 2018 12:45:51 +0800 Subject: [PATCH 234/992] gcalcli: use python3 i/o python2 so we can drop our overrides --- pkgs/applications/misc/gcalcli/default.nix | 38 +++------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 25ea9ef06b84..ac8d082513b2 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -1,38 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, python2 +{ stdenv, lib, fetchFromGitHub, python3 , libnotify ? null }: -let - py = python2.override { - packageOverrides = self: super: { - google_api_python_client = super.google_api_python_client.overridePythonAttrs (oldAttrs: rec { - version = "1.5.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig"; - }; - }); +with python3.pkgs; - oauth2client = super.oauth2client.overridePythonAttrs (oldAttrs: rec { - version = "1.4.12"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; - }; - }); - - uritemplate = super.uritemplate.overridePythonAttrs (oldAttrs: rec { - version = "0.6"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3"; - }; - # there are no checks in this version - doCheck = false; - }); - }; - }; - -in with py.pkgs; buildPythonApplication rec { +buildPythonApplication rec { version = "4.0.0a4"; name = "gcalcli-${version}"; @@ -45,7 +16,6 @@ in with py.pkgs; buildPythonApplication rec { propagatedBuildInputs = [ dateutil gflags httplib2 parsedatetime six vobject - # overridden google_api_python_client oauth2client uritemplate ] ++ lib.optional (!isPy3k) futures; @@ -59,8 +29,8 @@ in with py.pkgs; buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = https://github.com/insanum/gcalcli; description = "CLI for Google Calendar"; + homepage = https://github.com/insanum/gcalcli; license = licenses.mit; maintainers = with maintainers; [ nocoolnametom ]; inherit version; From bdaedbe38ce73f874004afdb49658caaaf014b35 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 Sep 2018 15:28:36 +0000 Subject: [PATCH 235/992] ocamlPackages.ocaml_lwt: 3.3.0 -> 4.1.0 --- pkgs/development/ocaml-modules/cohttp/lwt.nix | 4 +-- .../development/ocaml-modules/conduit/lwt.nix | 4 +-- .../lwt/{default.nix => 3.x.nix} | 0 pkgs/development/ocaml-modules/lwt/4.x.nix | 35 +++++++++++++++++++ .../ocaml-modules/lwt_log/default.nix | 15 ++++++-- .../ocaml-modules/lwt_ssl/default.nix | 4 +++ .../ocaml-modules/ojquery/default.nix | 4 +-- pkgs/top-level/ocaml-packages.nix | 34 +++++++++++++----- 8 files changed, 82 insertions(+), 18 deletions(-) rename pkgs/development/ocaml-modules/lwt/{default.nix => 3.x.nix} (100%) create mode 100644 pkgs/development/ocaml-modules/lwt/4.x.nix diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 1630bfd131e4..741df5b06145 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, cohttp, lwt3, uri, ppx_sexp_conv }: +{ stdenv, ocaml, findlib, dune, cohttp, ocaml_lwt, uri, ppx_sexp_conv }: if !stdenv.lib.versionAtLeast cohttp.version "0.99" then cohttp @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib dune uri ppx_sexp_conv ]; - propagatedBuildInputs = [ cohttp lwt3 ]; + propagatedBuildInputs = [ cohttp ocaml_lwt ]; buildPhase = "dune build -p cohttp-lwt"; } diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 5b085239cfd0..69d7132a83a4 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, ppx_sexp_conv, conduit, lwt3 }: +{ stdenv, ocaml, findlib, dune, ppx_sexp_conv, conduit, ocaml_lwt }: if !stdenv.lib.versionAtLeast conduit.version "1.0" then conduit @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib dune ppx_sexp_conv ]; - propagatedBuildInputs = [ conduit lwt3 ]; + propagatedBuildInputs = [ conduit ocaml_lwt ]; buildPhase = "dune build -p conduit-lwt"; } diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/3.x.nix similarity index 100% rename from pkgs/development/ocaml-modules/lwt/default.nix rename to pkgs/development/ocaml-modules/lwt/3.x.nix diff --git a/pkgs/development/ocaml-modules/lwt/4.x.nix b/pkgs/development/ocaml-modules/lwt/4.x.nix new file mode 100644 index 000000000000..f43a65065b92 --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt/4.x.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchzip, pkgconfig, ncurses, libev, dune +, ocaml, findlib, cppo +, ocaml-migrate-parsetree, ppx_tools_versioned, result +}: + +let inherit (stdenv.lib) optional versionAtLeast; in + +stdenv.mkDerivation rec { + version = "4.1.0"; + name = "ocaml${ocaml.version}-lwt-${version}"; + + src = fetchzip { + url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; + sha256 = "16wnc61kfj54z4q8sn9f5iik37pswz328hcz3z6rkza3kh3s6wmm"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ocaml findlib dune cppo + ocaml-migrate-parsetree ppx_tools_versioned + ] ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; + propagatedBuildInputs = [ libev result ]; + + configurePhase = "ocaml src/util/configure.ml -use-libev true"; + buildPhase = "jbuilder build -p lwt"; + inherit (dune) installPhase; + + meta = { + homepage = "https://ocsigen.org/lwt/"; + description = "A cooperative threads library for OCaml"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; + }; +} + diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix index 42ff2f26b7d3..a3d34b190b86 100644 --- a/pkgs/development/ocaml-modules/lwt_log/default.nix +++ b/pkgs/development/ocaml-modules/lwt_log/default.nix @@ -1,10 +1,19 @@ -{ stdenv, ocaml, findlib, dune, lwt }: +{ stdenv, fetchFromGitHub, ocaml, findlib, dune, lwt }: + +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "lwt_log is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.1.0"; name = "ocaml${ocaml.version}-lwt_log-${version}"; - inherit (lwt) src; + src = fetchFromGitHub { + owner = "aantron"; + repo = "lwt_log"; + rev = version; + sha256 = "1c58gkqfvyf2j11jwj2nh4iq999wj9xpnmr80hz9d0nk9fv333pi"; + }; buildInputs = [ ocaml findlib dune ]; diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix index 8fbec7cd4dff..a06e72529864 100644 --- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchzip, ocaml, findlib, dune, ssl, lwt }: +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "lwt_ssl is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { version = "1.1.2"; name = "ocaml${ocaml.version}-lwt_ssl-${version}"; diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix index 8cf5819c9002..6b0eefe195f1 100644 --- a/pkgs/development/ocaml-modules/ojquery/default.nix +++ b/pkgs/development/ocaml-modules/ojquery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, react }: +{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, ocaml_lwt, react }: if stdenv.lib.versionAtLeast ocaml.version "4.06" then throw "ojquery is not available for OCaml ${ocaml.version}" @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ]; - propagatedBuildInputs = [ js_of_ocaml lwt3 react ]; + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt react ]; createFindlibDestdir = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a6214abbc367..7de4bf3fad40 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -238,7 +238,16 @@ let easy-format = callPackage ../development/ocaml-modules/easy-format { }; - eliom = callPackage ../development/ocaml-modules/eliom { }; + eliom = callPackage ../development/ocaml-modules/eliom { + js_of_ocaml-lwt = js_of_ocaml-lwt.override { + ocaml_lwt = lwt3; + lwt_log = lib.overrideDerivation + (lwt_log.override { lwt = lwt3; }) + (_: { inherit (lwt3) src; }); + }; + lwt_react = lwt_react.override { lwt = lwt3; }; + lwt_ssl = lwt_ssl.override { lwt = lwt3; }; + }; elpi = callPackage ../development/ocaml-modules/elpi { }; @@ -401,25 +410,27 @@ let lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { }; lwt3 = if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/lwt { } + then callPackage ../development/ocaml-modules/lwt/3.x.nix { } else throw "lwt3 is not available for OCaml ${ocaml.version}"; - ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; + lwt4 = callPackage ../development/ocaml-modules/lwt/4.x.nix { }; + + ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt4 else lwt2; lwt_log = callPackage ../development/ocaml-modules/lwt_log { - lwt = lwt3; + lwt = lwt4; }; lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { - lwt = lwt3; + lwt = ocaml_lwt; }; lwt_react = callPackage ../development/ocaml-modules/lwt_react { - lwt = lwt3; + lwt = ocaml_lwt; }; lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl { - lwt = lwt3; + lwt = ocaml_lwt; }; macaque = callPackage ../development/ocaml-modules/macaque { }; @@ -535,7 +546,10 @@ let ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { + lwt_react = lwt_react.override { lwt = lwt3; }; + lwt_ssl = lwt_ssl.override { lwt = lwt3; }; + }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; @@ -545,7 +559,9 @@ let odoc = callPackage ../development/ocaml-modules/odoc { }; - ojquery = callPackage ../development/ocaml-modules/ojquery { }; + ojquery = callPackage ../development/ocaml-modules/ojquery { + ocaml_lwt = lwt3; + }; omd = callPackage ../development/ocaml-modules/omd { }; From 0668906e8470bb1bfa03a47cbedec5050a16a905 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Fri, 5 Oct 2018 16:13:42 +0200 Subject: [PATCH 236/992] nixos/containers: Add regression test for #40355 --- nixos/tests/containers-imperative.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 6f86819f4e88..782095a09dad 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -86,6 +86,9 @@ import ./make-test.nix ({ pkgs, ...} : { # Execute commands via the root shell. $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die; + # Execute a nix command via the root shell. (regression test for #40355) + $machine->succeed("nixos-container run $id1 -- nix-instantiate -E 'derivation { name = \"empty\"; builder = \"false\"; system = \"false\"; }'"); + # Stop and start (regression test for #4989) $machine->succeed("nixos-container stop $id1"); $machine->succeed("nixos-container start $id1"); From b669a45868eaf31ad3fffe5389c5dec8827a564c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 8 Oct 2018 12:04:10 +0300 Subject: [PATCH 237/992] boehmgc: reinstate 7.6.6, use for asymptote A quickfix after #45708 --- pkgs/development/libraries/boehm-gc/7.6.6.nix | 74 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/libraries/boehm-gc/7.6.6.nix diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix new file mode 100644 index 000000000000..da71e40187f4 --- /dev/null +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -0,0 +1,74 @@ +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops +, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179 +}: + +stdenv.mkDerivation rec { + name = "boehm-gc-${version}"; + version = "7.6.6"; + + src = fetchurl { + urls = [ + "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" + "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" + ]; + sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79"; + }; + + buildInputs = [ libatomic_ops ]; + nativeBuildInputs = [ pkgconfig ]; + + outputs = [ "out" "dev" "doc" ]; + separateDebugInfo = stdenv.isLinux; + + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" + ''; + + patches = [ (fetchpatch { + url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch"; + sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3"; + }) ] ++ + # https://github.com/ivmai/bdwgc/pull/208 + lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch; + + configureFlags = + [ "--enable-cplusplus" ] + ++ lib.optional enableLargeConfig "--enable-large-config" + ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"; + + doCheck = true; # not cross; + + # Don't run the native `strip' when cross-compiling. + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; + + enableParallelBuilding = true; + + meta = { + description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; + + longDescription = '' + The Boehm-Demers-Weiser conservative garbage collector can be used as a + garbage collecting replacement for C malloc or C++ new. It allows you + to allocate memory basically as you normally would, without explicitly + deallocating memory that is no longer useful. The collector + automatically recycles memory when it determines that it can no longer + be otherwise accessed. + + The collector is also used by a number of programming language + implementations that either use C as intermediate code, want to + facilitate easier interoperation with C libraries, or just prefer the + simple collector interface. + + Alternatively, the garbage collector may be used as a leak detector for + C or C++ programs, though that is not its primary goal. + ''; + + homepage = http://hboehm.info/gc/; + + # non-copyleft, X11-style license + license = http://hboehm.info/gc/license.txt; + + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf1f1caa27c5..780239f291c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -569,6 +569,7 @@ with pkgs; asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; }; gsl = gsl_1; + boehmgc = boehmgc_766; }; atomicparsley = callPackage ../tools/video/atomicparsley { }; @@ -9074,6 +9075,7 @@ with pkgs; bobcat = callPackage ../development/libraries/bobcat { }; boehmgc = callPackage ../development/libraries/boehm-gc { }; + boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { }; boolstuff = callPackage ../development/libraries/boolstuff { }; From 0932acc62227045ffafc770dc2e0b231a9f3dfe2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 8 Oct 2018 17:14:38 +0800 Subject: [PATCH 238/992] fbv: init at 1.0b --- pkgs/tools/graphics/fbv/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/graphics/fbv/default.nix diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/tools/graphics/fbv/default.nix new file mode 100644 index 000000000000..c7fab1710672 --- /dev/null +++ b/pkgs/tools/graphics/fbv/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, getopt, libjpeg, libpng12, libungif }: + +stdenv.mkDerivation rec { + name = "fbv-1.0b"; + + src = fetchurl { + url = "http://s-tech.elsat.net.pl/fbv/${name}.tar.gz"; + sha256 = "0g5b550vk11l639y8p5sx1v1i6ihgqk0x1hd0ri1bc2yzpdbjmcv"; + }; + + buildInputs = [ getopt libjpeg libpng12 libungif ]; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/{bin,man/man1} + ''; + + meta = with stdenv.lib; { + description = "View pictures on a linux framebuffer device"; + homepage = http://s-tech.elsat.net.pl/fbv/; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e808b70fb41e..f88bd87392a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2588,6 +2588,8 @@ with pkgs; feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; + fbv = callPackage ../tools/graphics/fbv { }; + fim = callPackage ../tools/graphics/fim { }; flac123 = callPackage ../applications/audio/flac123 { }; From ab6f4d365252fd5709601da86bb45359913067a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2018 11:26:30 +0200 Subject: [PATCH 239/992] systemd-wait: fix evaluation error --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 780239f291c8..0793eee3961a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14784,7 +14784,7 @@ with pkgs; ''; })); - systemd-wait = callPackages ../os-specific/linux/systemd-wait { }; + systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; sysvinit = callPackage ../os-specific/linux/sysvinit { }; From d2ce22caf05a24fdac43a2cb172fa331bf3d268d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?TG=20=E2=8A=97=20=CE=98?= <*@tg-x.net> Date: Mon, 8 Oct 2018 11:30:27 +0200 Subject: [PATCH 240/992] liquidsoap: 1.1.1 -> 1.3.4 --- pkgs/tools/audio/liquidsoap/full.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 7d3b899048f7..7ef0793a4831 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -4,7 +4,6 @@ , libsamplerate, libmad, taglib, lame, libogg , libvorbis, speex, libtheora, libopus, fdk_aac , faad2, flac, ladspaH, ffmpeg, frei0r, dssi -, autoconf, automake, libtool }: let @@ -34,22 +33,6 @@ stdenv.mkDerivation { configureFlags = [ "--localstatedir=/var" ]; - # liquidsoap only looks for lame and ffmpeg at runtime, so we need to link them in manually - NIX_LDFLAGS = [ - # # LAME - # # "-lmp3lame" - # # ffmpeg - # "-lavcodec" - # "-lavdevice" - # "-lavfilter" - # "-lavformat" - "-lavresample" - # "-lavutil" - # "-lpostproc" - # "-lswresample" - "-lswscale" - ]; - buildInputs = [ which ocamlPackages.ocaml ocamlPackages.findlib pkgconfig libao portaudio alsaLib libpulseaudio libjack2 @@ -58,7 +41,6 @@ stdenv.mkDerivation { faad2 flac ladspaH ffmpeg frei0r dssi ocamlPackages.xmlm ocamlPackages.ocaml_pcre ocamlPackages.camomile - # autoconf automake libtool ]; hardeningDisable = [ "format" "fortify" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcf20c6e0cab..0309b001797e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3581,8 +3581,7 @@ with pkgs; lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { - ffmpeg = ffmpeg_2; - # ocamlPackages = ocaml-ng.ocamlPackages_4_03; + ffmpeg = ffmpeg-full; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; From c2e6ca501e3eb2d9ee24367f4ba5dda81699649c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 8 Oct 2018 11:53:08 +0200 Subject: [PATCH 241/992] openssh: fix tunnel forwarding (upstream patch) Close #48031, fixes #48016. I didn't use the PR commit because I think it's better to fetch the patch. --- pkgs/tools/networking/openssh/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 04a77176682d..96bc2c56ece8 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { patches = [ + # Remove on update! + (fetchpatch { + name = "fix-tunnel-forwarding.diff"; + url = "https://github.com/openssh/openssh-portable/commit/cfb1d9bc767.diff"; + sha256 = "1mszj7f1kj6bazr7asbi1bi4238lfpilpp98f6c1dn3py4fbsdg8"; + }) + ./locale_archive.patch ./fix-host-key-algorithms-plus.patch From 9da2134cfa704b4862046b0d9e46f9fe791c3fa6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 8 Oct 2018 05:43:15 -0500 Subject: [PATCH 242/992] Fix local path to release notes in error message The error message when produced when Nix is too old refers the user to a local copy of the NixOS release notes, but the provided path is incorrect. --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index f4b2640ac5a0..a74a01719c73 100644 --- a/default.nix +++ b/default.nix @@ -18,7 +18,7 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins. For more information, please see the NixOS release notes at https://nixos.org/nixos/manual or locally at - ${toString ./doc/manual/release-notes}. + ${toString ./nixos/doc/manual/release-notes}. If you need further help, see https://nixos.org/nixos/support.html '' From 3f719b0fad6044ccf8f22ebe22a582f56b447715 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 8 Oct 2018 12:53:07 +0200 Subject: [PATCH 243/992] Fix build for rPackages.units (cherry picked from commit 1eb1fec3aee1f1d1084779acec001e13ee9cbd71) --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 0fbd2ae6fa70..c9766a985f6f 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -367,6 +367,7 @@ let tkrplot = [ pkgs.xorg.libX11 pkgs.tk.dev ]; topicmodels = [ pkgs.gsl_1 ]; udunits2 = [ pkgs.udunits pkgs.expat ]; + units = [ pkgs.udunits ]; V8 = [ pkgs.v8_3_14 ]; VBLPCM = [ pkgs.gsl_1 ]; WhopGenome = [ pkgs.zlib.dev ]; From 68a2fceed56d525fbb3bbe4859c44fa6906668d5 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 8 Oct 2018 11:52:55 +0200 Subject: [PATCH 244/992] nixos/murmur: mention mumble in description This makes the option easier to find with the options search or in the manpage. --- nixos/modules/services/networking/murmur.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index fcc813e6898f..a6e90feff7ea 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -50,7 +50,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "If enabled, start the Murmur Service."; + description = "If enabled, start the Murmur Mumble server."; }; autobanAttempts = mkOption { From 7d43e2a86144d1834019e4917aad60a35d1e68ca Mon Sep 17 00:00:00 2001 From: Victor SENE Date: Mon, 8 Oct 2018 14:10:00 +0200 Subject: [PATCH 245/992] nixos/emby : use the dataDir option --- nixos/modules/services/misc/emby.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix index 151edd0e761a..0ad4a3f7376f 100644 --- a/nixos/modules/services/misc/emby.nix +++ b/nixos/modules/services/misc/emby.nix @@ -55,7 +55,7 @@ in User = cfg.user; Group = cfg.group; PermissionsStartOnly = "true"; - ExecStart = "${pkgs.emby}/bin/emby"; + ExecStart = "${pkgs.emby}/bin/emby -programdata ${cfg.dataDir}"; Restart = "on-failure"; }; }; From 751c64754fd289a6bef611979de671519d4745d0 Mon Sep 17 00:00:00 2001 From: Victor SENE Date: Mon, 8 Oct 2018 14:51:49 +0200 Subject: [PATCH 246/992] nixos/emby : delete programData hardcode in pkg --- pkgs/servers/emby/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 932d070577e6..12b0dde0c9b4 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ sqlite ]}" \ - --add-flags "$out/opt/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" + --add-flags "$out/opt/emby-server/EmbyServer.dll -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" ''; meta = with stdenv.lib; { From 908a75a3ae8b84f7de7f4cafb627abc7c652606f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= Date: Mon, 8 Oct 2018 14:54:32 +0200 Subject: [PATCH 247/992] gitaly: 0.117.2 -> 0.120.0 --- pkgs/applications/version-management/gitaly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index b7eee8926aa5..9523059b42f2 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.120.0"; + version = "0.125.0"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "0jsk6n1vmddpnnccr8mjvcsfjzaagqy1600q5yss6lbz896w2bx4"; + sha256 = "14a4qgpnspzw9cjqh6gbw3771bxfm789ibvmvb8jc4pklvbyl4mi"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; @@ -27,7 +27,7 @@ in buildGoPackage rec { postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib,vendor} $ruby + cp -rv $src/ruby/{bin,lib} $ruby ''; outputs = [ "bin" "out" "ruby" ]; From 998d4e4e2c2c71034b9232453d33d8a2c9fdbdb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= Date: Mon, 8 Oct 2018 14:56:52 +0200 Subject: [PATCH 248/992] gitlab-workhorse: 6.1.0 -> 6.1.1, make build deterministic --- .../version-management/gitlab-workhorse/default.nix | 6 +++--- .../gitlab-workhorse/deterministic-build.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 1fe8c844ebf0..16acf2a91d70 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "6.1.0"; + version = "6.1.1"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0h0mqalia4ldb2icr2h6x75pnr5jb5y23pi4kv4ri3w3ddnl74bq"; + sha256 = "1dwvk86bfsqgkp0mwz71yis3i7aypjf96r3hsjkgpd27hwbjgxbr"; }; buildInputs = [ git go ]; - patches = [ ./remove-hardcoded-paths.patch ]; + patches = [ ./remove-hardcoded-paths.patch ./deterministic-build.patch ]; makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch b/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch new file mode 100644 index 000000000000..da6dc5493ac5 --- /dev/null +++ b/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2018-10-08 12:45:15.206269937 +0200 ++++ b/Makefile 2018-10-08 12:45:24.435366307 +0200 +@@ -6,7 +6,7 @@ + BIN_BUILD_DIR := $(TARGET_DIR)/bin + PKG_BUILD_DIR := $(TARGET_DIR)/src/$(PKG) + COVERAGE_DIR := $(TARGET_DIR)/cover +-VERSION := $(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S) ++VERSION := 6.1.1 + GOBUILD := go build -ldflags "-X main.Version=$(VERSION)" + EXE_ALL := gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse + INSTALL := install From d837338d6b16146cc4d388f223c8bed878546061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= Date: Mon, 8 Oct 2018 15:01:29 +0200 Subject: [PATCH 249/992] gitlab: 11.2.3 -> 11.3.4 --- .../applications/version-management/gitlab/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 98e2e739e0d7..c66260912612 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -11,29 +11,29 @@ let groups = [ "default" "unicorn" "ed25519" "metrics" ]; }; - version = "11.3.0"; + version = "11.3.4"; sources = if gitlabEnterprise then { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb"; - sha256 = "1l5cfbc45xa3gq90wyly3szn93szh162g9szc6dnkqx0db70j9l3"; + sha256 = "1cgwm6g1mij1958mdyds8f76qjw39nllsr23dvsqgf60h4vbsdfd"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ee"; rev = "v${version}-ee"; - sha256 = "0gmainjhs21hipbvshga5dzkjrpmlkk9vxxnxgwjaqbg9wrhw47m"; + sha256 = "1ifaa879l85d4yfzrgszrgj04bfjxjh3n7v31zfb6lsqmh87xbm4"; }; } else { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb"; - sha256 = "162xy8xpa2qhz10nh2dw0vbd0665pz9984vnim9i30xcafr5picq"; + sha256 = "0hls81ns9n10xrzw0b9pn1916445irqrysbicsdl8kdn83ds35p7"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ce"; rev = "v${version}"; - sha256 = "158n2qnp1zsj5kk2w3v9xyakgdb739n955hlq3i9sl80q8f4xda3"; + sha256 = "0dymr706yn917niybg2gj1pkgrzgiirbv4ib9pkgs140kbf3hn0c"; }; }; From 0083ca12664a4fbda9a8716267c5173676a8194a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= Date: Mon, 8 Oct 2018 15:02:14 +0200 Subject: [PATCH 250/992] gitlab-ee: Add ee rubyEnv, fixes regression introduced by 11.3.0 in #45574 --- .../version-management/gitlab/default.nix | 2 +- .../gitlab/{ => rubyEnv-ce}/Gemfile | 0 .../gitlab/{ => rubyEnv-ce}/Gemfile.lock | 0 .../gitlab/{ => rubyEnv-ce}/gemset.nix | 0 .../gitlab/rubyEnv-ee/Gemfile | 461 +++ .../gitlab/rubyEnv-ee/Gemfile.lock | 1239 ++++++ .../gitlab/rubyEnv-ee/gemset.nix | 3681 +++++++++++++++++ 7 files changed, 5382 insertions(+), 1 deletion(-) rename pkgs/applications/version-management/gitlab/{ => rubyEnv-ce}/Gemfile (100%) rename pkgs/applications/version-management/gitlab/{ => rubyEnv-ce}/Gemfile.lock (100%) rename pkgs/applications/version-management/gitlab/{ => rubyEnv-ce}/gemset.nix (100%) create mode 100644 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile create mode 100644 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock create mode 100644 pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index c66260912612..c1a4392ec0ef 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -7,7 +7,7 @@ let rubyEnv = bundlerEnv { name = "gitlab-env-${version}"; inherit ruby; - gemdir = ./.; + gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}"; groups = [ "default" "unicorn" "ed25519" "metrics" ]; }; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile similarity index 100% rename from pkgs/applications/version-management/gitlab/Gemfile rename to pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock similarity index 100% rename from pkgs/applications/version-management/gitlab/Gemfile.lock rename to pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix similarity index 100% rename from pkgs/applications/version-management/gitlab/gemset.nix rename to pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile new file mode 100644 index 000000000000..86502db9d26e --- /dev/null +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -0,0 +1,461 @@ +# --- Special code for migrating to Rails 5.0 --- +def rails5? + %w[1 true].include?(ENV["RAILS5"]) +end + +gem_versions = {} +gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' +gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0' +gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10' +gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' +# --- The end of special code for migrating to Rails 5.0 --- + +source 'https://rubygems.org' + +gem 'rails', gem_versions['rails'] +gem 'rails-deprecated_sanitizer', '~> 1.0.3' + +# Responders respond_to and respond_with +gem 'responders', '~> 2.0' + +gem 'sprockets', '~> 3.7.0' + +# Default values for AR models +gem 'default_value_for', gem_versions['default_value_for'] + +# Supported DBs +gem 'mysql2', '~> 0.4.10', group: :mysql +gem 'pg', '~> 0.18.2', group: :postgres + +gem 'rugged', '~> 0.27' +gem 'grape-path-helpers', '~> 1.0' + +gem 'faraday', '~> 0.12' + +# Authentication libraries +gem 'devise', '~> 4.4' +gem 'doorkeeper', '~> 4.3' +gem 'doorkeeper-openid_connect', '~> 1.5' +gem 'omniauth', '~> 1.8' +gem 'omniauth-auth0', '~> 2.0.0' +gem 'omniauth-azure-oauth2', '~> 0.0.9' +gem 'omniauth-cas3', '~> 1.1.4' +gem 'omniauth-facebook', '~> 4.0.0' +gem 'omniauth-github', '~> 1.3' +gem 'omniauth-gitlab', '~> 1.0.2' +gem 'omniauth-google-oauth2', '~> 0.5.3' +gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos +gem 'omniauth-oauth2-generic', '~> 0.2.2' +gem 'omniauth-saml', '~> 1.10' +gem 'omniauth-shibboleth', '~> 1.3.0' +gem 'omniauth-twitter', '~> 1.4' +gem 'omniauth_crowd', '~> 2.2.0' +gem 'omniauth-authentiq', '~> 0.3.3' +gem 'rack-oauth2', '~> 1.2.1' +gem 'jwt', '~> 1.5.6' + +# Kerberos authentication. EE-only +gem 'gssapi', group: :kerberos + +# Spam and anti-bot protection +gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' +gem 'akismet', '~> 2.0' + +# Two-factor authentication +gem 'devise-two-factor', '~> 3.0.0' +gem 'rqrcode-rails3', '~> 0.1.7' +gem 'attr_encrypted', '~> 3.1.0' +gem 'u2f', '~> 0.2.1' + +# GitLab Pages +gem 'validates_hostname', '~> 1.0.6' + +# Browser detection +gem 'browser', '~> 2.5' + +# GPG +gem 'gpgme' + +# LDAP Auth +# GitLab fork with several improvements to original library. For full list of changes +# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master +gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' +gem 'net-ldap' + +# Git Wiki +# Required manually in config/initializers/gollum.rb to control load order +gem 'gitlab-gollum-lib', '~> 4.2', require: false + +gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false + +# Language detection +gem 'github-linguist', '~> 5.3.3', require: 'linguist' + +# API +gem 'grape', '~> 1.0' +gem 'grape-entity', '~> 0.7.1' +gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' + +# GraphQL API +gem 'graphql', '~> 1.8.0' +gem 'graphiql-rails', '~> 1.4.10' + +# Disable strong_params so that Mash does not respond to :permitted? +gem 'hashie-forbidden_attributes' + +# Pagination +gem 'kaminari', '~> 1.0' + +# HAML +gem 'hamlit', '~> 2.8.8' + +# Files attachments +# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged. +# config/initializers/carrierwave_patch.rb can be removed once that change is released. +gem 'carrierwave', '= 1.2.3' +gem 'mini_magick' + +# Drag and Drop UI +gem 'dropzonejs-rails', '~> 0.7.1' + +# for backups +gem 'fog-aws', '~> 2.0.1' +gem 'fog-core', '~> 1.44' +gem 'fog-google', '~> 1.7.1' +gem 'fog-local', '~> 0.3' +gem 'fog-openstack', '~> 0.1' +gem 'fog-rackspace', '~> 0.1.1' +gem 'fog-aliyun', '~> 0.2.0' + +# for Google storage +gem 'google-api-client', '~> 0.23' + +# for aws storage +gem 'unf', '~> 0.1.4' + +# Seed data +gem 'seed-fu', '~> 2.3.7' + +# Search +gem 'elasticsearch-model', '~> 0.1.9' +gem 'elasticsearch-rails', '~> 0.1.9' +gem 'elasticsearch-api', '5.0.3' +gem 'aws-sdk' +gem 'faraday_middleware-aws-signers-v4' + +# Markdown and HTML processing +gem 'html-pipeline', '~> 2.8' +gem 'deckar01-task_list', '2.0.0' +gem 'gitlab-markup', '~> 1.6.4' +gem 'redcarpet', '~> 3.4' +gem 'commonmarker', '~> 0.17' +gem 'RedCloth', '~> 4.3.2' +gem 'rdoc', '~> 6.0' +gem 'org-ruby', '~> 0.9.12' +gem 'creole', '~> 0.5.0' +gem 'wikicloth', '0.8.1' +gem 'asciidoctor', '~> 1.5.6' +gem 'asciidoctor-plantuml', '0.0.8' +gem 'rouge', '~> 3.1' +gem 'truncato', '~> 0.7.9' +gem 'bootstrap_form', '~> 2.7.0' +gem 'nokogiri', '~> 1.8.2' + +# Calendar rendering +gem 'icalendar' + +# Diffs +gem 'diffy', '~> 3.1.0' + +# Application server +group :unicorn do + gem 'unicorn', '~> 5.1.0' + gem 'unicorn-worker-killer', '~> 0.4.4' +end + +# State machine +gem 'state_machines-activerecord', '~> 0.5.1' + +# Issue tags +gem 'acts-as-taggable-on', '~> 5.0' + +# Background jobs +gem 'sidekiq', '~> 5.1' +gem 'sidekiq-cron', '~> 0.6.0' +gem 'redis-namespace', '~> 1.6.0' +gem 'sidekiq-limit_fetch', '~> 3.4', require: false + +# Cron Parser +gem 'rufus-scheduler', '~> 3.4' + +# HTTP requests +gem 'httparty', '~> 0.13.3' + +# Colored output to console +gem 'rainbow', '~> 3.0' + +# Progress bar +gem 'ruby-progressbar' + +# GitLab settings +gem 'settingslogic', '~> 2.0.9' + +# Linear-time regex library for untrusted regular expressions +gem 're2', '~> 1.1.1' + +# Misc + +gem 'version_sorter', '~> 2.1.0' + +# Export Ruby Regex to Javascript +gem 'js_regex', '~> 2.2.1' + +# User agent parsing +gem 'device_detector' + +# Cache +gem 'redis-rails', '~> 5.0.2' + +# Redis +gem 'redis', '~> 3.2' +gem 'connection_pool', '~> 2.0' + +# HipChat integration +gem 'hipchat', '~> 1.5.0' + +# JIRA integration +gem 'jira-ruby', '~> 1.4' + +# Flowdock integration +gem 'gitlab-flowdock-git-hook', '~> 1.0.1' + +# Slack integration +gem 'slack-notifier', '~> 1.5.1' + +# Hangouts Chat integration +gem 'hangouts-chat', '~> 0.0.5' + +# Asana integration +gem 'asana', '~> 0.6.0' + +# FogBugz integration +gem 'ruby-fogbugz', '~> 0.2.1' + +# Kubernetes integration +gem 'kubeclient', '~> 3.1.0' + +# Sanitize user input +gem 'sanitize', '~> 4.6' +gem 'babosa', '~> 1.0.2' + +# Sanitizes SVG input +gem 'loofah', '~> 2.2' + +# Working with license +gem 'licensee', '~> 8.9' + +# Protect against bruteforcing +gem 'rack-attack', '~> 4.4.1' + +# Ace editor +gem 'ace-rails-ap', '~> 4.1.0' + +# Keyboard shortcuts +gem 'mousetrap-rails', '~> 1.4.6' + +# Detect and convert string character encoding +gem 'charlock_holmes', '~> 0.7.5' + +# Faster blank +gem 'fast_blank' + +# Parse time & duration +gem 'chronic', '~> 0.10.2' +gem 'chronic_duration', '~> 0.10.6' + +gem 'webpack-rails', '~> 0.9.10' +gem 'rack-proxy', '~> 0.6.0' + +gem 'sass-rails', '~> 5.0.6' +gem 'uglifier', '~> 2.7.2' + +gem 'addressable', '~> 2.5.2' +gem 'font-awesome-rails', '~> 4.7' +gem 'gemojione', '~> 3.3' +gem 'gon', '~> 6.2' +gem 'jquery-atwho-rails', '~> 1.3.2' +gem 'request_store', '~> 1.3' +gem 'select2-rails', '~> 3.5.9' +gem 'virtus', '~> 1.0.1' +gem 'base32', '~> 0.3.0' + +gem "gitlab-license", "~> 1.0" + +# Sentry integration +gem 'sentry-raven', '~> 2.7' + +gem 'premailer-rails', '~> 1.9.7' + +# I18n +gem 'ruby_parser', '~> 3.8', require: false +gem 'rails-i18n', gem_versions['rails-i18n'] +gem 'gettext_i18n_rails', '~> 1.8.0' +gem 'gettext_i18n_rails_js', '~> 1.3' +gem 'gettext', '~> 3.2.2', require: false, group: :development + +gem 'batch-loader', '~> 1.2.1' + +# Perf bar +gem 'peek', '~> 1.0.1' +gem 'peek-gc', '~> 0.0.2' +gem 'peek-mysql2', '~> 1.1.0', group: :mysql +gem 'peek-pg', '~> 1.3.0', group: :postgres +gem 'peek-rblineprof', '~> 0.2.0' +gem 'peek-redis', '~> 1.2.0' +gem 'peek-sidekiq', '~> 1.0.3' + +# Metrics +group :metrics do + gem 'method_source', '~> 0.8', require: false + gem 'influxdb', '~> 0.2', require: false + + # Prometheus + gem 'prometheus-client-mmap', '~> 0.9.4' + gem 'raindrops', '~> 0.18' +end + +group :development do + gem 'foreman', '~> 0.84.0' + gem 'brakeman', '~> 4.2', require: false + + gem 'letter_opener_web', '~> 1.3.0' + gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false + + # Better errors handler + gem 'better_errors', '~> 2.1.0' + gem 'binding_of_caller', '~> 0.7.2' + + # thin instead webrick + gem 'thin', '~> 1.7.0' +end + +group :development, :test do + gem 'bootsnap', '~> 1.3' + gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] + gem 'pry-byebug', '~> 3.4.1', platform: :mri + gem 'pry-rails', '~> 0.3.4' + + gem 'awesome_print', require: false + gem 'fuubar', '~> 2.2.0' + + gem 'database_cleaner', '~> 1.5.0' + gem 'factory_bot_rails', '~> 4.8.2' + gem 'rspec-rails', '~> 3.7.0' + gem 'rspec-retry', '~> 0.4.5' + gem 'rspec_profiling', '~> 0.0.5' + gem 'rspec-set', '~> 0.1.3' + gem 'rspec-parameterized', require: false + + # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) + gem 'minitest', '~> 5.7.0' + + # Generate Fake data + gem 'ffaker', '~> 2.4' + + gem 'capybara', '~> 2.15' + gem 'capybara-screenshot', '~> 1.0.0' + gem 'selenium-webdriver', '~> 3.12' + + gem 'spring', '~> 2.0.0' + gem 'spring-commands-rspec', '~> 1.0.4' + + gem 'gitlab-styles', '~> 2.4', require: false + # Pin these dependencies, otherwise a new rule could break the CI pipelines + gem 'rubocop', '~> 0.54.0' + gem 'rubocop-rspec', '~> 1.22.1' + + gem 'scss_lint', '~> 0.56.0', require: false + gem 'haml_lint', '~> 0.26.0', require: false + gem 'simplecov', '~> 0.14.0', require: false + gem 'bundler-audit', '~> 0.5.0', require: false + + gem 'benchmark-ips', '~> 2.3.0', require: false + + gem 'license_finder', '~> 5.4', require: false + gem 'knapsack', '~> 1.16' + + gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] + + gem 'stackprof', '~> 0.2.10', require: false + + gem 'simple_po_parser', '~> 1.1.2', require: false + + gem 'timecop', '~> 0.8.0' +end + +group :test do + gem 'shoulda-matchers', '~> 3.1.2', require: false + gem 'email_spec', '~> 2.2.0' + gem 'json-schema', '~> 2.8.0' + gem 'webmock', '~> 2.3.2' + gem 'rails-controller-testing' if rails5? # Rails5 only gem. + gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. + gem 'sham_rack', '~> 1.3.6' + gem 'concurrent-ruby', '~> 1.0.5' + gem 'test-prof', '~> 0.2.5' + gem 'rspec_junit_formatter' +end + +gem 'octokit', '~> 4.9' + +gem 'mail_room', '~> 0.9.1' + +gem 'email_reply_trimmer', '~> 0.1' +gem 'html2text' + +gem 'ruby-prof', '~> 0.17.0' +gem 'rbtrace', '~> 0.4', require: false + +# OAuth +gem 'oauth2', '~> 1.4' + +# Health check +gem 'health_check', '~> 2.6.0' + +# System information +gem 'vmstat', '~> 2.3.0' +gem 'sys-filesystem', '~> 1.1.6' + +# NTP client +gem 'net-ntp' + +# SSH host key support +gem 'net-ssh', '~> 5.0' +gem 'sshkey', '~> 1.9.0' + +# Required for ED25519 SSH host key support +group :ed25519 do + gem 'ed25519', '~> 1.2' + gem 'bcrypt_pbkdf', '~> 1.0' +end + +# Gitaly GRPC client +gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' +gem 'grpc', '~> 1.11.0' + +# Locked until https://github.com/google/protobuf/issues/4210 is closed +gem 'google-protobuf', '= 3.5.1' + +gem 'toml-rb', '~> 1.0.0', require: false + +# Feature toggles +gem 'flipper', '~> 0.13.0' +gem 'flipper-active_record', '~> 0.13.0' +gem 'flipper-active_support_cache_store', '~> 0.13.0' + +# Structured logging +gem 'lograge', '~> 0.5' +gem 'grape_logging', '~> 1.7' + +# Asset synchronization +gem 'asset_sync', '~> 2.4' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock new file mode 100644 index 000000000000..d7c4f80efd15 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -0,0 +1,1239 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.3.2) + abstract_type (0.0.7) + ace-rails-ap (4.1.2) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.10) + activesupport (= 4.2.10) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) + globalid (>= 0.3.0) + activemodel (4.2.10) + activesupport (= 4.2.10) + builder (~> 3.1) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) + arel (~> 6.0) + activerecord_sane_schema_dumper (0.2) + rails (>= 4, < 5) + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts-as-taggable-on (5.0.0) + activerecord (>= 4.2.8) + adamantium (0.2.0) + ice_nine (~> 0.11.0) + memoizable (~> 0.4.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + aes_key_wrap (1.0.1) + akismet (2.0.0) + arel (6.0.4) + asana (0.6.0) + faraday (~> 0.9) + faraday_middleware (~> 0.9) + faraday_middleware-multi_json (~> 0.0) + oauth2 (~> 1.0) + asciidoctor (1.5.6.2) + asciidoctor-plantuml (0.0.8) + asciidoctor (~> 1.5) + asset_sync (2.4.0) + activemodel (>= 4.1.0) + fog-core + mime-types (>= 2.99) + unf + ast (2.4.0) + atomic (1.1.99) + attr_encrypted (3.1.0) + encryptor (~> 3.0.0) + attr_required (1.0.0) + awesome_print (1.8.0) + aws-sdk (2.9.32) + aws-sdk-resources (= 2.9.32) + aws-sdk-core (2.9.32) + aws-sigv4 (~> 1.0) + jmespath (~> 1.0) + aws-sdk-resources (2.9.32) + aws-sdk-core (= 2.9.32) + aws-sigv4 (1.0.0) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + babosa (1.0.2) + base32 (0.3.2) + batch-loader (1.2.1) + bcrypt (3.1.12) + bcrypt_pbkdf (1.0.0) + benchmark-ips (2.3.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + bindata (2.4.3) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + bootsnap (1.3.1) + msgpack (~> 1.0) + bootstrap_form (2.7.0) + brakeman (4.2.1) + browser (2.5.3) + builder (3.2.3) + bullet (5.5.1) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.10.0) + bundler-audit (0.5.0) + bundler (~> 1.2) + thor (~> 0.18) + byebug (9.0.6) + capybara (2.15.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara-screenshot (1.0.14) + capybara (>= 1.0, < 3) + launchy + carrierwave (1.2.3) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) + cause (0.1) + charlock_holmes (0.7.6) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chronic (0.10.2) + chronic_duration (0.10.6) + numerizer (~> 0.1.1) + chunky_png (1.3.5) + citrus (3.0.2) + coderay (1.1.2) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + commonmarker (0.17.13) + ruby-enum (~> 0.5) + concord (0.1.5) + adamantium (~> 0.2.0) + equalizer (~> 0.0.9) + concurrent-ruby (1.0.5) + concurrent-ruby-ext (1.0.5) + concurrent-ruby (= 1.0.5) + connection_pool (2.2.1) + crack (0.4.3) + safe_yaml (~> 1.0.0) + crass (1.0.4) + creole (0.5.0) + css_parser (1.5.0) + addressable + daemons (1.2.3) + database_cleaner (1.5.3) + debug_inspector (0.0.2) + debugger-ruby_core_source (1.3.8) + deckar01-task_list (2.0.0) + html-pipeline + declarative (0.0.10) + declarative-option (0.1.0) + default_value_for (3.0.2) + activerecord (>= 3.2.0, < 5.1) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + device_detector (1.0.0) + devise (4.4.3) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 6.0) + responders + warden (~> 1.2.3) + devise-two-factor (3.0.0) + activesupport + attr_encrypted (>= 1.3, < 4, != 2) + devise (~> 4.0) + railties + rotp (~> 2.0) + diff-lcs (1.3) + diffy (3.1.0) + docile (1.1.5) + domain_name (0.5.20180417) + unf (>= 0.0.5, < 1.0.0) + doorkeeper (4.3.2) + railties (>= 4.2) + doorkeeper-openid_connect (1.5.0) + doorkeeper (~> 4.3) + json-jwt (~> 1.6) + dropzonejs-rails (0.7.2) + rails (> 3.1) + ed25519 (1.2.4) + elasticsearch (5.0.3) + elasticsearch-api (= 5.0.3) + elasticsearch-transport (= 5.0.3) + elasticsearch-api (5.0.3) + multi_json + elasticsearch-model (0.1.9) + activesupport (> 3) + elasticsearch (> 0.4) + hashie + elasticsearch-rails (0.1.9) + elasticsearch-transport (5.0.3) + faraday + multi_json + email_reply_trimmer (0.1.6) + email_spec (2.2.0) + htmlentities (~> 4.3.3) + launchy (~> 2.1) + mail (~> 2.7) + encryptor (3.0.0) + equalizer (0.0.11) + erubis (2.7.0) + escape_utils (1.1.1) + et-orbi (1.0.3) + tzinfo + eventmachine (1.0.8) + excon (0.62.0) + execjs (2.6.0) + expression_parser (0.9.0) + factory_bot (4.8.2) + activesupport (>= 3.0.0) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) + railties (>= 3.0.0) + faraday (0.12.2) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) + faraday_middleware-aws-signers-v4 (0.1.7) + aws-sdk-resources (~> 2) + faraday (~> 0.9) + faraday_middleware-multi_json (0.0.6) + faraday_middleware + multi_json + fast_blank (1.0.0) + fast_gettext (1.6.0) + ffaker (2.4.0) + ffi (1.9.25) + flipper (0.13.0) + flipper-active_record (0.13.0) + activerecord (>= 3.2, < 6) + flipper (~> 0.13.0) + flipper-active_support_cache_store (0.13.0) + activesupport (>= 3.2, < 6) + flipper (~> 0.13.0) + flowdock (0.7.1) + httparty (~> 0.7) + multi_json + fog-aliyun (0.2.0) + fog-core (~> 1.27) + fog-json (~> 1.0) + ipaddress (~> 0.8) + xml-simple (~> 1.1) + fog-aws (2.0.1) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-core (1.45.0) + builder + excon (~> 0.58) + formatador (~> 0.2) + fog-google (1.7.1) + fog-core + fog-json + fog-xml + google-api-client (~> 0.23.0) + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.3.1) + fog-core (~> 1.27) + fog-openstack (0.1.21) + fog-core (>= 1.40) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-rackspace (0.1.1) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-xml (0.1.3) + fog-core + nokogiri (>= 1.5.11, < 2.0.0) + font-awesome-rails (4.7.0.1) + railties (>= 3.2, < 5.1) + foreman (0.84.0) + thor (~> 0.19.1) + formatador (0.2.5) + fuubar (2.2.0) + rspec-core (~> 3.0) + ruby-progressbar (~> 1.4) + gemojione (3.3.0) + json + get_process_mem (0.2.0) + gettext (3.2.9) + locale (>= 2.0.5) + text (>= 1.3.0) + gettext_i18n_rails (1.8.0) + fast_gettext (>= 0.9.0) + gettext_i18n_rails_js (1.3.0) + gettext (>= 3.0.2) + gettext_i18n_rails (>= 0.7.1) + po_to_json (>= 1.0.0) + rails (>= 3.2.0) + gitaly-proto (0.117.0) + google-protobuf (~> 3.1) + grpc (~> 1.10) + github-linguist (5.3.3) + charlock_holmes (~> 0.7.5) + escape_utils (~> 1.1.0) + mime-types (>= 1.19) + rugged (>= 0.25.1) + github-markup (1.7.0) + gitlab-flowdock-git-hook (1.0.1) + flowdock (~> 0.7) + gitlab-grit (>= 2.4.1) + multi_json + gitlab-gollum-lib (4.2.7.5) + gemojione (~> 3.2) + github-markup (~> 1.6) + gollum-grit_adapter (~> 1.0) + nokogiri (>= 1.6.1, < 2.0) + rouge (~> 3.1) + sanitize (~> 4.6.4) + stringex (~> 2.6) + gitlab-gollum-rugged_adapter (0.4.4.1) + mime-types (>= 1.15) + rugged (~> 0.25) + gitlab-grit (2.8.2) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (>= 1.16) + posix-spawn (~> 0.3) + gitlab-license (1.0.0) + gitlab-markup (1.6.4) + gitlab-styles (2.4.1) + rubocop (~> 0.54.0) + rubocop-gitlab-security (~> 0.1.0) + rubocop-rspec (~> 1.19) + gitlab_omniauth-ldap (2.0.4) + net-ldap (~> 0.16) + omniauth (~> 1.3) + pyu-ruby-sasl (>= 0.0.3.3, < 0.1) + rubyntlm (~> 0.5) + globalid (0.4.1) + activesupport (>= 4.2.0) + gollum-grit_adapter (1.0.1) + gitlab-grit (~> 2.7, >= 2.7.1) + gon (6.2.0) + actionpack (>= 3.0) + multi_json + request_store (>= 1.0) + google-api-client (0.23.4) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.5, < 0.7.0) + httpclient (>= 2.8.1, < 3.0) + mime-types (~> 3.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + google-protobuf (3.5.1) + googleapis-common-protos-types (1.0.1) + google-protobuf (~> 3.0) + googleauth (0.6.2) + faraday (~> 0.12) + jwt (>= 1.4, < 3.0) + logging (~> 2.0) + memoist (~> 0.12) + multi_json (~> 1.11) + os (~> 0.9) + signet (~> 0.7) + gpgme (2.0.13) + mini_portile2 (~> 2.1) + grape (1.0.3) + activesupport + builder + mustermann-grape (~> 1.0.0) + rack (>= 1.3.0) + rack-accept + virtus (>= 1.0.0) + grape-entity (0.7.1) + activesupport (>= 4.0) + multi_json (>= 1.3.2) + grape-path-helpers (1.0.6) + activesupport (>= 4, < 5.1) + grape (~> 1.0) + rake (~> 12) + grape_logging (1.7.0) + grape + graphiql-rails (1.4.10) + railties + sprockets-rails + graphql (1.8.1) + grpc (1.11.0) + google-protobuf (~> 3.1) + googleapis-common-protos-types (~> 1.0.0) + googleauth (>= 0.5.1, < 0.7) + gssapi (1.2.0) + ffi (>= 1.0.1) + haml (5.0.4) + temple (>= 0.8.0) + tilt + haml_lint (0.26.0) + haml (>= 4.0, < 5.1) + rainbow + rake (>= 10, < 13) + rubocop (>= 0.49.0) + sysexits (~> 1.1) + hamlit (2.8.8) + temple (>= 0.8.0) + thor + tilt + hangouts-chat (0.0.5) + hashdiff (0.3.4) + hashie (3.5.7) + hashie-forbidden_attributes (0.1.1) + hashie (>= 3.0) + health_check (2.6.0) + rails (>= 4.0) + hipchat (1.5.2) + httparty + mimemagic + html-pipeline (2.8.4) + activesupport (>= 2) + nokogiri (>= 1.4) + html2text (0.2.0) + nokogiri (~> 1.6) + htmlentities (4.3.4) + http (2.2.2) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 1.0.1) + http_parser.rb (~> 0.6.0) + http-cookie (1.0.3) + domain_name (~> 0.5) + http-form_data (1.0.3) + http_parser.rb (0.6.0) + httparty (0.13.7) + json (~> 1.8) + multi_xml (>= 0.5.2) + httpclient (2.8.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + icalendar (2.4.1) + ice_nine (0.11.2) + influxdb (0.2.3) + cause + json + ipaddress (0.8.3) + jira-ruby (1.4.1) + activesupport + multipart-post + oauth (~> 0.5, >= 0.5.0) + jmespath (1.3.1) + jquery-atwho-rails (1.3.2) + js_regex (2.2.1) + regexp_parser (>= 0.4.11, <= 0.5.0) + json (1.8.6) + json-jwt (1.9.4) + activesupport + aes_key_wrap + bindata + json-schema (2.8.0) + addressable (>= 2.4) + jwt (1.5.6) + kaminari (1.0.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.0.1) + kaminari-activerecord (= 1.0.1) + kaminari-core (= 1.0.1) + kaminari-actionview (1.0.1) + actionview + kaminari-core (= 1.0.1) + kaminari-activerecord (1.0.1) + activerecord + kaminari-core (= 1.0.1) + kaminari-core (1.0.1) + kgio (2.10.0) + knapsack (1.16.0) + rake + kubeclient (3.1.0) + http (~> 2.2.2) + recursive-open-struct (~> 1.0, >= 1.0.4) + rest-client (~> 2.0) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.4.1) + launchy (~> 2.2) + letter_opener_web (1.3.0) + actionmailer (>= 3.2) + letter_opener (~> 1.0) + railties (>= 3.2) + license_finder (5.4.0) + bundler + rubyzip + thor + toml (= 0.2.0) + with_env (= 1.1.0) + xml-simple + licensee (8.9.2) + rugged (~> 0.24) + little-plugger (1.1.4) + locale (2.1.2) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + lograge (0.10.0) + actionpack (>= 4) + activesupport (>= 4) + railties (>= 4) + request_store (~> 1.0) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + mail_room (0.9.1) + memoist (0.16.0) + memoizable (0.4.2) + thread_safe (~> 0.3, >= 0.3.1) + method_source (0.9.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mimemagic (0.3.0) + mini_magick (4.8.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.7.0) + mousetrap-rails (1.4.6) + msgpack (1.2.4) + multi_json (1.13.1) + multi_xml (0.6.0) + multipart-post (2.0.0) + mustermann (1.0.2) + mustermann-grape (1.0.0) + mustermann (~> 1.0.0) + mysql2 (0.4.10) + net-ldap (0.16.0) + net-ntp (2.1.3) + net-ssh (5.0.1) + netrc (0.11.0) + nokogiri (1.8.4) + mini_portile2 (~> 2.3.0) + nokogumbo (1.5.0) + nokogiri + numerizer (0.1.1) + oauth (0.5.4) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + octokit (4.9.0) + sawyer (~> 0.8.0, >= 0.5.3) + omniauth (1.8.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) + omniauth-auth0 (2.0.0) + omniauth-oauth2 (~> 1.4) + omniauth-authentiq (0.3.3) + jwt (>= 1.5) + omniauth-oauth2 (>= 1.5) + omniauth-azure-oauth2 (0.0.9) + jwt (~> 1.0) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.4) + omniauth-cas3 (1.1.4) + addressable (~> 2.3) + nokogiri (~> 1.7, >= 1.7.1) + omniauth (~> 1.2) + omniauth-facebook (4.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (1.3.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-gitlab (1.0.3) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.5) + omniauth-kerberos (0.3.0) + omniauth-multipassword + timfel-krb5-auth (~> 0.8) + omniauth-multipassword (0.4.2) + omniauth (~> 1.0) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) + omniauth (~> 1.2) + omniauth-oauth2-generic (0.2.2) + omniauth-oauth2 (~> 1.0) + omniauth-saml (1.10.0) + omniauth (~> 1.3, >= 1.3.2) + ruby-saml (~> 1.7) + omniauth-shibboleth (1.3.0) + omniauth (>= 1.0.0) + omniauth-twitter (1.4.0) + omniauth-oauth (~> 1.1) + rack + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) + org-ruby (0.9.12) + rubypants (~> 0.2) + orm_adapter (0.5.0) + os (0.9.6) + parallel (1.12.1) + parser (2.5.1.0) + ast (~> 2.4.0) + parslet (1.8.2) + peek (1.0.1) + concurrent-ruby (>= 0.9.0) + concurrent-ruby-ext (>= 0.9.0) + railties (>= 4.0.0) + peek-gc (0.0.2) + peek + peek-mysql2 (1.1.0) + atomic (>= 1.0.0) + mysql2 + peek + peek-pg (1.3.0) + concurrent-ruby + concurrent-ruby-ext + peek + pg + peek-rblineprof (0.2.0) + peek + rblineprof + peek-redis (1.2.0) + atomic (>= 1.0.0) + peek + redis + peek-sidekiq (1.0.3) + atomic (>= 1.0.0) + peek + sidekiq + pg (0.18.4) + po_to_json (1.0.1) + json (>= 1.6.0) + posix-spawn (0.3.13) + powerpack (0.1.1) + premailer (1.10.4) + addressable + css_parser (>= 1.4.10) + htmlentities (>= 4.0.0) + premailer-rails (1.9.7) + actionmailer (>= 3, < 6) + premailer (~> 1.7, >= 1.7.9) + proc_to_ast (0.1.0) + coderay + parser + unparser + procto (0.0.3) + prometheus-client-mmap (0.9.4) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-byebug (3.4.3) + byebug (>= 9.0, < 9.1) + pry (~> 0.10) + pry-rails (0.3.5) + pry (>= 0.9.10) + public_suffix (3.0.2) + pyu-ruby-sasl (0.0.3.3) + rack (1.6.10) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (4.4.1) + rack + rack-cors (1.0.2) + rack-oauth2 (1.2.3) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) + multi_json (>= 1.3.6) + rack (>= 1.1) + rack-protection (2.0.1) + rack + rack-proxy (0.6.0) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.10) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + rails-i18n (4.0.9) + i18n (~> 0.7) + railties (~> 4.0) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rainbow (3.0.0) + raindrops (0.18.0) + rake (12.3.1) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rblineprof (0.3.6) + debugger-ruby_core_source (~> 1.3) + rbtrace (0.4.10) + ffi (>= 1.0.6) + msgpack (>= 0.4.3) + trollop (>= 1.16.2) + rdoc (6.0.4) + re2 (1.1.1) + recaptcha (3.0.0) + json + recursive-open-struct (1.1.0) + redcarpet (3.4.0) + redis (3.3.5) + redis-actionpack (5.0.2) + actionpack (>= 4.0, < 6) + redis-rack (>= 1, < 3) + redis-store (>= 1.1.0, < 2) + redis-activesupport (5.0.4) + activesupport (>= 3, < 6) + redis-store (>= 1.3, < 2) + redis-namespace (1.6.0) + redis (>= 3.0.4) + redis-rack (2.0.4) + rack (>= 1.5, < 3) + redis-store (>= 1.2, < 2) + redis-rails (5.0.2) + redis-actionpack (>= 5.0, < 6) + redis-activesupport (>= 5.0, < 6) + redis-store (>= 1.2, < 2) + redis-store (1.4.1) + redis (>= 2.2, < 5) + regexp_parser (0.5.0) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + request_store (1.3.1) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + rest-client (2.0.2) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + retriable (3.1.2) + rinku (2.0.0) + rotp (2.1.2) + rouge (3.2.1) + rqrcode (0.7.0) + chunky_png + rqrcode-rails3 (0.1.7) + rqrcode (>= 0.4.2) + rspec (3.7.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-core (3.7.1) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.7.0) + rspec-parameterized (0.4.0) + binding_of_caller + parser + proc_to_ast + rspec (>= 2.13, < 4) + unparser + rspec-rails (3.7.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) + rspec-retry (0.4.5) + rspec-core + rspec-set (0.1.3) + rspec-support (3.7.1) + rspec_junit_formatter (0.2.3) + builder (< 4) + rspec-core (>= 2, < 4, != 2.12.0) + rspec_profiling (0.0.5) + activerecord + pg + rails + sqlite3 + rubocop (0.54.0) + parallel (~> 1.10) + parser (>= 2.5) + powerpack (~> 0.1) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + rubocop-gitlab-security (0.1.1) + rubocop (>= 0.51) + rubocop-rspec (1.22.2) + rubocop (>= 0.52.1) + ruby-enum (0.7.2) + i18n + ruby-fogbugz (0.2.1) + crack (~> 0.4) + ruby-prof (0.17.0) + ruby-progressbar (1.9.0) + ruby-saml (1.7.2) + nokogiri (>= 1.5.10) + ruby_parser (3.9.0) + sexp_processor (~> 4.1) + rubyntlm (0.6.2) + rubypants (0.2.0) + rubyzip (1.2.2) + rufus-scheduler (3.4.0) + et-orbi (~> 1.0) + rugged (0.27.4) + safe_yaml (1.0.4) + sanitize (4.6.6) + crass (~> 1.0.2) + nokogiri (>= 1.4.4) + nokogumbo (~> 1.4) + sass (3.5.5) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) + scss_lint (0.56.0) + rake (>= 0.9, < 13) + sass (~> 3.5.3) + seed-fu (2.3.7) + activerecord (>= 3.1) + activesupport (>= 3.1) + select2-rails (3.5.9.3) + thor (~> 0.14) + selenium-webdriver (3.12.0) + childprocess (~> 0.5) + rubyzip (~> 1.2) + sentry-raven (2.7.2) + faraday (>= 0.7.6, < 1.0) + settingslogic (2.0.9) + sexp_processor (4.9.0) + sham_rack (1.3.6) + rack + shoulda-matchers (3.1.2) + activesupport (>= 4.0.0) + sidekiq (5.1.3) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.2, >= 2.2.0) + rack-protection (>= 1.5.0) + redis (>= 3.3.5, < 5) + sidekiq-cron (0.6.0) + rufus-scheduler (>= 3.3.0) + sidekiq (>= 4.2.1) + sidekiq-limit_fetch (3.4.0) + sidekiq (>= 4) + signet (0.8.1) + addressable (~> 2.3) + faraday (~> 0.9) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simple_po_parser (1.1.2) + simplecov (0.14.1) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + slack-notifier (1.5.1) + spring (2.0.1) + activesupport (>= 4.2) + spring-commands-rspec (1.0.4) + spring (>= 0.9.1) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.13) + sshkey (1.9.0) + stackprof (0.2.10) + state_machines (0.5.0) + state_machines-activemodel (0.5.1) + activemodel (>= 4.1, < 6.0) + state_machines (>= 0.5.0) + state_machines-activerecord (0.5.1) + activerecord (>= 4.1, < 6.0) + state_machines-activemodel (>= 0.5.0) + stringex (2.8.4) + sys-filesystem (1.1.6) + ffi + sysexits (1.2.0) + temple (0.8.0) + test-prof (0.2.5) + test_after_commit (1.1.0) + activerecord (>= 3.2) + text (1.3.1) + thin (1.7.0) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.8) + timecop (0.8.1) + timfel-krb5-auth (0.8.3) + toml (0.2.0) + parslet (~> 1.8.0) + toml-rb (1.0.0) + citrus (~> 3.0, > 3.0) + trollop (2.1.3) + truncato (0.7.10) + htmlentities (~> 4.3.1) + nokogiri (~> 1.8.0, >= 1.7.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + u2f (0.2.1) + uber (0.1.0) + uglifier (2.7.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.5) + unicode-display_width (1.3.2) + unicorn (5.1.0) + kgio (~> 2.6) + raindrops (~> 0.7) + unicorn-worker-killer (0.4.4) + get_process_mem (~> 0) + unicorn (>= 4, < 6) + uniform_notifier (1.10.0) + unparser (0.2.7) + abstract_type (~> 0.0.7) + adamantium (~> 0.2.0) + concord (~> 0.1.5) + diff-lcs (~> 1.3) + equalizer (~> 0.0.9) + parser (>= 2.3.1.2, < 2.6) + procto (~> 0.0.2) + validates_hostname (1.0.6) + activerecord (>= 3.0) + activesupport (>= 3.0) + version_sorter (2.1.0) + virtus (1.0.5) + axiom-types (~> 0.1) + coercible (~> 1.0) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) + vmstat (2.3.0) + warden (1.2.7) + rack (>= 1.0) + webmock (2.3.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + webpack-rails (0.9.10) + railties (>= 3.2.0) + wikicloth (0.8.1) + builder + expression_parser + rinku + with_env (1.1.0) + xml-simple (1.1.5) + xpath (2.1.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth (~> 4.3.2) + ace-rails-ap (~> 4.1.0) + activerecord_sane_schema_dumper (= 0.2) + acts-as-taggable-on (~> 5.0) + addressable (~> 2.5.2) + akismet (~> 2.0) + asana (~> 0.6.0) + asciidoctor (~> 1.5.6) + asciidoctor-plantuml (= 0.0.8) + asset_sync (~> 2.4) + attr_encrypted (~> 3.1.0) + awesome_print + aws-sdk + babosa (~> 1.0.2) + base32 (~> 0.3.0) + batch-loader (~> 1.2.1) + bcrypt_pbkdf (~> 1.0) + benchmark-ips (~> 2.3.0) + better_errors (~> 2.1.0) + binding_of_caller (~> 0.7.2) + bootsnap (~> 1.3) + bootstrap_form (~> 2.7.0) + brakeman (~> 4.2) + browser (~> 2.5) + bullet (~> 5.5.0) + bundler-audit (~> 0.5.0) + capybara (~> 2.15) + capybara-screenshot (~> 1.0.0) + carrierwave (= 1.2.3) + charlock_holmes (~> 0.7.5) + chronic (~> 0.10.2) + chronic_duration (~> 0.10.6) + commonmarker (~> 0.17) + concurrent-ruby (~> 1.0.5) + connection_pool (~> 2.0) + creole (~> 0.5.0) + database_cleaner (~> 1.5.0) + deckar01-task_list (= 2.0.0) + default_value_for (~> 3.0.0) + device_detector + devise (~> 4.4) + devise-two-factor (~> 3.0.0) + diffy (~> 3.1.0) + doorkeeper (~> 4.3) + doorkeeper-openid_connect (~> 1.5) + dropzonejs-rails (~> 0.7.1) + ed25519 (~> 1.2) + elasticsearch-api (= 5.0.3) + elasticsearch-model (~> 0.1.9) + elasticsearch-rails (~> 0.1.9) + email_reply_trimmer (~> 0.1) + email_spec (~> 2.2.0) + factory_bot_rails (~> 4.8.2) + faraday (~> 0.12) + faraday_middleware-aws-signers-v4 + fast_blank + ffaker (~> 2.4) + flipper (~> 0.13.0) + flipper-active_record (~> 0.13.0) + flipper-active_support_cache_store (~> 0.13.0) + fog-aliyun (~> 0.2.0) + fog-aws (~> 2.0.1) + fog-core (~> 1.44) + fog-google (~> 1.7.1) + fog-local (~> 0.3) + fog-openstack (~> 0.1) + fog-rackspace (~> 0.1.1) + font-awesome-rails (~> 4.7) + foreman (~> 0.84.0) + fuubar (~> 2.2.0) + gemojione (~> 3.3) + gettext (~> 3.2.2) + gettext_i18n_rails (~> 1.8.0) + gettext_i18n_rails_js (~> 1.3) + gitaly-proto (~> 0.117.0) + github-linguist (~> 5.3.3) + gitlab-flowdock-git-hook (~> 1.0.1) + gitlab-gollum-lib (~> 4.2) + gitlab-gollum-rugged_adapter (~> 0.4.4) + gitlab-license (~> 1.0) + gitlab-markup (~> 1.6.4) + gitlab-styles (~> 2.4) + gitlab_omniauth-ldap (~> 2.0.4) + gon (~> 6.2) + google-api-client (~> 0.23) + google-protobuf (= 3.5.1) + gpgme + grape (~> 1.0) + grape-entity (~> 0.7.1) + grape-path-helpers (~> 1.0) + grape_logging (~> 1.7) + graphiql-rails (~> 1.4.10) + graphql (~> 1.8.0) + grpc (~> 1.11.0) + gssapi + haml_lint (~> 0.26.0) + hamlit (~> 2.8.8) + hangouts-chat (~> 0.0.5) + hashie-forbidden_attributes + health_check (~> 2.6.0) + hipchat (~> 1.5.0) + html-pipeline (~> 2.8) + html2text + httparty (~> 0.13.3) + icalendar + influxdb (~> 0.2) + jira-ruby (~> 1.4) + jquery-atwho-rails (~> 1.3.2) + js_regex (~> 2.2.1) + json-schema (~> 2.8.0) + jwt (~> 1.5.6) + kaminari (~> 1.0) + knapsack (~> 1.16) + kubeclient (~> 3.1.0) + letter_opener_web (~> 1.3.0) + license_finder (~> 5.4) + licensee (~> 8.9) + lograge (~> 0.5) + loofah (~> 2.2) + mail_room (~> 0.9.1) + method_source (~> 0.8) + mini_magick + minitest (~> 5.7.0) + mousetrap-rails (~> 1.4.6) + mysql2 (~> 0.4.10) + net-ldap + net-ntp + net-ssh (~> 5.0) + nokogiri (~> 1.8.2) + oauth2 (~> 1.4) + octokit (~> 4.9) + omniauth (~> 1.8) + omniauth-auth0 (~> 2.0.0) + omniauth-authentiq (~> 0.3.3) + omniauth-azure-oauth2 (~> 0.0.9) + omniauth-cas3 (~> 1.1.4) + omniauth-facebook (~> 4.0.0) + omniauth-github (~> 1.3) + omniauth-gitlab (~> 1.0.2) + omniauth-google-oauth2 (~> 0.5.3) + omniauth-kerberos (~> 0.3.0) + omniauth-oauth2-generic (~> 0.2.2) + omniauth-saml (~> 1.10) + omniauth-shibboleth (~> 1.3.0) + omniauth-twitter (~> 1.4) + omniauth_crowd (~> 2.2.0) + org-ruby (~> 0.9.12) + peek (~> 1.0.1) + peek-gc (~> 0.0.2) + peek-mysql2 (~> 1.1.0) + peek-pg (~> 1.3.0) + peek-rblineprof (~> 0.2.0) + peek-redis (~> 1.2.0) + peek-sidekiq (~> 1.0.3) + pg (~> 0.18.2) + premailer-rails (~> 1.9.7) + prometheus-client-mmap (~> 0.9.4) + pry-byebug (~> 3.4.1) + pry-rails (~> 0.3.4) + rack-attack (~> 4.4.1) + rack-cors (~> 1.0.0) + rack-oauth2 (~> 1.2.1) + rack-proxy (~> 0.6.0) + rails (= 4.2.10) + rails-deprecated_sanitizer (~> 1.0.3) + rails-i18n (~> 4.0.9) + rainbow (~> 3.0) + raindrops (~> 0.18) + rblineprof (~> 0.3.6) + rbtrace (~> 0.4) + rdoc (~> 6.0) + re2 (~> 1.1.1) + recaptcha (~> 3.0) + redcarpet (~> 3.4) + redis (~> 3.2) + redis-namespace (~> 1.6.0) + redis-rails (~> 5.0.2) + request_store (~> 1.3) + responders (~> 2.0) + rouge (~> 3.1) + rqrcode-rails3 (~> 0.1.7) + rspec-parameterized + rspec-rails (~> 3.7.0) + rspec-retry (~> 0.4.5) + rspec-set (~> 0.1.3) + rspec_junit_formatter + rspec_profiling (~> 0.0.5) + rubocop (~> 0.54.0) + rubocop-rspec (~> 1.22.1) + ruby-fogbugz (~> 0.2.1) + ruby-prof (~> 0.17.0) + ruby-progressbar + ruby_parser (~> 3.8) + rufus-scheduler (~> 3.4) + rugged (~> 0.27) + sanitize (~> 4.6) + sass-rails (~> 5.0.6) + scss_lint (~> 0.56.0) + seed-fu (~> 2.3.7) + select2-rails (~> 3.5.9) + selenium-webdriver (~> 3.12) + sentry-raven (~> 2.7) + settingslogic (~> 2.0.9) + sham_rack (~> 1.3.6) + shoulda-matchers (~> 3.1.2) + sidekiq (~> 5.1) + sidekiq-cron (~> 0.6.0) + sidekiq-limit_fetch (~> 3.4) + simple_po_parser (~> 1.1.2) + simplecov (~> 0.14.0) + slack-notifier (~> 1.5.1) + spring (~> 2.0.0) + spring-commands-rspec (~> 1.0.4) + sprockets (~> 3.7.0) + sshkey (~> 1.9.0) + stackprof (~> 0.2.10) + state_machines-activerecord (~> 0.5.1) + sys-filesystem (~> 1.1.6) + test-prof (~> 0.2.5) + test_after_commit (~> 1.1) + thin (~> 1.7.0) + timecop (~> 0.8.0) + toml-rb (~> 1.0.0) + truncato (~> 0.7.9) + u2f (~> 0.2.1) + uglifier (~> 2.7.2) + unf (~> 0.1.4) + unicorn (~> 5.1.0) + unicorn-worker-killer (~> 0.4.4) + validates_hostname (~> 1.0.6) + version_sorter (~> 2.1.0) + virtus (~> 1.0.1) + vmstat (~> 2.3.0) + webmock (~> 2.3.2) + webpack-rails (~> 0.9.10) + wikicloth (= 0.8.1) + +BUNDLED WITH + 1.16.4 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix new file mode 100644 index 000000000000..a067d1e42722 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -0,0 +1,3681 @@ +{ + abstract_type = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14"; + type = "gem"; + }; + version = "0.0.7"; + }; + ace-rails-ap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14wj9gsiy7rm0lvs27ffsrh92wndjksj6rlfj3n7jhv1v77w9v2h"; + type = "gem"; + }; + version = "4.1.2"; + }; + actionmailer = { + dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ivyjsapqgn1xfb2p8yqjrg2jldqm5r7hxrjxq6kdr05gk4fsg59"; + type = "gem"; + }; + version = "4.2.10"; + }; + actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l6agrxdaishxjx2zc2x8md95plfp39bfskzgs6v9gsdp2y2arpx"; + type = "gem"; + }; + version = "4.2.10"; + }; + actionview = { + dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jrx2pmkywk70z7n17gw3jrcdw3n03wdzvg45bnq8wxshl1lmbhv"; + type = "gem"; + }; + version = "4.2.10"; + }; + activejob = { + dependencies = ["activesupport" "globalid"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10jsa5pqklcsd2npicqxr5abjlwi53di2brpzgz35k557fkpc1z8"; + type = "gem"; + }; + version = "4.2.10"; + }; + activemodel = { + dependencies = ["activesupport" "builder"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c4vj9xajxa906bqbcjpni74nya6rh2nbb15gl8xm0vl9zf3ll9v"; + type = "gem"; + }; + version = "4.2.10"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport" "arel"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lws9y4p9c2vnmv3ddfpv8jh6azlddppl3fi31vahaz14ifxjk5s"; + type = "gem"; + }; + version = "4.2.10"; + }; + activerecord_sane_schema_dumper = { + dependencies = ["rails"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "122c7v7lvs0gwckvx2rar07waxnx1vv0lryz322nybb69d8vbhl6"; + type = "gem"; + }; + version = "0.2"; + }; + activesupport = { + dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + type = "gem"; + }; + version = "4.2.10"; + }; + acts-as-taggable-on = { + dependencies = ["activerecord"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i"; + type = "gem"; + }; + version = "5.0.0"; + }; + adamantium = { + dependencies = ["ice_nine" "memoizable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak"; + type = "gem"; + }; + version = "0.2.0"; + }; + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + aes_key_wrap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07"; + type = "gem"; + }; + version = "1.0.1"; + }; + akismet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w"; + type = "gem"; + }; + version = "2.0.0"; + }; + arel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4"; + type = "gem"; + }; + version = "6.0.4"; + }; + asana = { + dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bn7f3sc2f02g871jd0y6qdhixn464mflkjchp56x6kcnyqy24z6"; + type = "gem"; + }; + version = "0.6.0"; + }; + asciidoctor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f"; + type = "gem"; + }; + version = "1.5.6.2"; + }; + asciidoctor-plantuml = { + dependencies = ["asciidoctor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna"; + type = "gem"; + }; + version = "0.0.8"; + }; + asset_sync = { + dependencies = ["activemodel" "fog-core" "mime-types" "unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf"; + type = "gem"; + }; + version = "2.4.0"; + }; + ast = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + type = "gem"; + }; + version = "2.4.0"; + }; + atomic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kh9rvhjn4dndbfsk3yjq7alds6s2j70rc4k8wdwdyibab8a8gq9"; + type = "gem"; + }; + version = "1.1.99"; + }; + attr_encrypted = { + dependencies = ["encryptor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg"; + type = "gem"; + }; + version = "3.1.0"; + }; + attr_required = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc"; + type = "gem"; + }; + version = "1.0.0"; + }; + awesome_print = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h"; + type = "gem"; + }; + version = "1.8.0"; + }; + aws-sdk = { + dependencies = ["aws-sdk-resources"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn"; + type = "gem"; + }; + version = "2.9.32"; + }; + aws-sdk-core = { + dependencies = ["aws-sigv4" "jmespath"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x"; + type = "gem"; + }; + version = "2.9.32"; + }; + aws-sdk-resources = { + dependencies = ["aws-sdk-core"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi"; + type = "gem"; + }; + version = "2.9.32"; + }; + aws-sigv4 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz"; + type = "gem"; + }; + version = "1.0.0"; + }; + axiom-types = { + dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1"; + type = "gem"; + }; + version = "0.1.1"; + }; + babosa = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f"; + type = "gem"; + }; + version = "1.0.2"; + }; + base32 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b7y8sy6j9v1lvfzd4va88k5vg9yh0xcjzzn3llcw7yxqlcrnbjk"; + type = "gem"; + }; + version = "0.3.2"; + }; + batch-loader = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nvmwzn8q6dkp2n8wz47z7gldj3yrj7h6syy0cwrkzi19bfvxba2"; + type = "gem"; + }; + version = "1.2.1"; + }; + bcrypt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy"; + type = "gem"; + }; + version = "3.1.12"; + }; + bcrypt_pbkdf = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv"; + type = "gem"; + }; + version = "1.0.0"; + }; + benchmark-ips = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j"; + type = "gem"; + }; + version = "2.3.0"; + }; + better_errors = { + dependencies = ["coderay" "erubis" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11csk41yhijqvp0dkky0cjl8kn6blw4jhr8b6v4islfvvayddcxc"; + type = "gem"; + }; + version = "2.1.1"; + }; + bindata = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr"; + type = "gem"; + }; + version = "2.4.3"; + }; + binding_of_caller = { + dependencies = ["debug_inspector"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk"; + type = "gem"; + }; + version = "0.7.2"; + }; + bootsnap = { + dependencies = ["msgpack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9"; + type = "gem"; + }; + version = "1.3.1"; + }; + bootstrap_form = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw"; + type = "gem"; + }; + version = "2.7.0"; + }; + brakeman = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v"; + type = "gem"; + }; + version = "4.2.1"; + }; + browser = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sdx0ny34i6vqxdsc7sy9g0nafdbrw8kvvb5xh9m18x1bzpqk92f"; + type = "gem"; + }; + version = "2.5.3"; + }; + builder = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + type = "gem"; + }; + version = "3.2.3"; + }; + bullet = { + dependencies = ["activesupport" "uniform_notifier"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pdq3ckmwxnwrdm2x89zfj68h0yhiln35y8wps2nkvam4kpivyr5"; + type = "gem"; + }; + version = "5.5.1"; + }; + bundler-audit = { + dependencies = ["thor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gr7k6m9fda7m66irxzydm8v9xbmlryjj65cagwm1zyi5f317srb"; + type = "gem"; + }; + version = "0.5.0"; + }; + byebug = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kbfcn65rgdhi72n8x9l393b89rvi5z542459k7d1ggchpb0idb0"; + type = "gem"; + }; + version = "9.0.6"; + }; + capybara = { + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bahhwrd1rpfhci1x57yz0df9plziipljbw3p4k6mlash4wq6w92"; + type = "gem"; + }; + version = "2.15.1"; + }; + capybara-screenshot = { + dependencies = ["capybara" "launchy"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xy79lf3rwn3602r4hqm9s8a03bhlf6hzwdi6345dzrkmhwwj2ij"; + type = "gem"; + }; + version = "1.0.14"; + }; + carrierwave = { + dependencies = ["activemodel" "activesupport" "mime-types"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k9kla5ncygm97vn33lsrs7ch5zy4qqhhvc8m3khm986yaqh75qs"; + type = "gem"; + }; + version = "1.2.3"; + }; + cause = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00"; + type = "gem"; + }; + version = "0.1"; + }; + charlock_holmes = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; + type = "gem"; + }; + version = "0.7.6"; + }; + childprocess = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; + type = "gem"; + }; + version = "0.9.0"; + }; + chronic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; + type = "gem"; + }; + version = "0.10.2"; + }; + chronic_duration = { + dependencies = ["numerizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k7sx3xqbrn6s4pishh2pgr4kw6fmw63h00lh503l66k8x0qvigs"; + type = "gem"; + }; + version = "0.10.6"; + }; + chunky_png = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn"; + type = "gem"; + }; + version = "1.3.5"; + }; + citrus = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l7nhk3gkm1hdchkzzhg2f70m47pc0afxfpl6mkiibc9qcpl3hjf"; + type = "gem"; + }; + version = "3.0.2"; + }; + coderay = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + type = "gem"; + }; + version = "1.1.2"; + }; + coercible = { + dependencies = ["descendants_tracker"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah"; + type = "gem"; + }; + version = "1.0.0"; + }; + commonmarker = { + dependencies = ["ruby-enum"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9"; + type = "gem"; + }; + version = "0.17.13"; + }; + concord = { + dependencies = ["adamantium" "equalizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg"; + type = "gem"; + }; + version = "0.1.5"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + type = "gem"; + }; + version = "1.0.5"; + }; + concurrent-ruby-ext = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "119l554zi3720d3rk670ldcqhsgmfii28a9z307v4mwdjckdm4gp"; + type = "gem"; + }; + version = "1.0.5"; + }; + connection_pool = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; + type = "gem"; + }; + version = "2.2.1"; + }; + crack = { + dependencies = ["safe_yaml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + type = "gem"; + }; + version = "0.4.3"; + }; + crass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; + type = "gem"; + }; + version = "1.0.4"; + }; + creole = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm"; + type = "gem"; + }; + version = "0.5.0"; + }; + css_parser = { + dependencies = ["addressable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlr17cn044yaq4l3d9p42g3bghnamwsprq9c39xn6pxjrn5k1hy"; + type = "gem"; + }; + version = "1.5.0"; + }; + daemons = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg"; + type = "gem"; + }; + version = "1.2.3"; + }; + database_cleaner = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj"; + type = "gem"; + }; + version = "1.5.3"; + }; + debug_inspector = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m"; + type = "gem"; + }; + version = "0.0.2"; + }; + debugger-ruby_core_source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lp5dmm8a8dpwymv6r1y6yr24wxsj0gvgb2b8i7qq9rcv414snwd"; + type = "gem"; + }; + version = "1.3.8"; + }; + deckar01-task_list = { + dependencies = ["html-pipeline"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j"; + type = "gem"; + }; + version = "2.0.0"; + }; + declarative = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + type = "gem"; + }; + version = "0.0.10"; + }; + declarative-option = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; + type = "gem"; + }; + version = "0.1.0"; + }; + default_value_for = { + dependencies = ["activerecord"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "014482mxjrc227fxv6vff6ccjr9dr0ydz52flxslsa7biq542k73"; + type = "gem"; + }; + version = "3.0.2"; + }; + descendants_tracker = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79"; + type = "gem"; + }; + version = "0.0.4"; + }; + device_detector = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zbsjj1bgwmsiqiw6x5fzbzp25xc10c02s37ggl2635ha0qzn05q"; + type = "gem"; + }; + version = "1.0.0"; + }; + devise = { + dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xmxfhym0yxwb0zwmmzhdiykbpyqqm3id02g7rf3vcgbc1lqvdnj"; + type = "gem"; + }; + version = "4.4.3"; + }; + devise-two-factor = { + dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pkldws5lga4mlv4xmcrfb0yivl6qad0l8qyb2hdb50adv6ny4gs"; + type = "gem"; + }; + version = "3.0.0"; + }; + diff-lcs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + diffy = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj"; + type = "gem"; + }; + version = "3.1.0"; + }; + docile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + type = "gem"; + }; + version = "1.1.5"; + }; + domain_name = { + dependencies = ["unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; + type = "gem"; + }; + version = "0.5.20180417"; + }; + doorkeeper = { + dependencies = ["railties"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "022r03i830b2lvmr0xzlj6ivlvc1zr64hy4a4bsy3flv94da77rz"; + type = "gem"; + }; + version = "4.3.2"; + }; + doorkeeper-openid_connect = { + dependencies = ["doorkeeper" "json-jwt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wgrz0xcply5vl6d1m62blqwcbn4v0b27bswyws2y9wbyglz6f95"; + type = "gem"; + }; + version = "1.5.0"; + }; + dropzonejs-rails = { + dependencies = ["rails"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64"; + type = "gem"; + }; + version = "0.7.2"; + }; + ed25519 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; + type = "gem"; + }; + version = "1.2.4"; + }; + elasticsearch = { + dependencies = ["elasticsearch-api" "elasticsearch-transport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fik4nrxyi28zy1xwi4rygn0pf1sm1gskcrvbsnmqfrsdd6l4ga4"; + type = "gem"; + }; + version = "5.0.3"; + }; + elasticsearch-api = { + dependencies = ["multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0aal128hq59l5kscl2ag2cv24g1sp5ysdb4jxkqmj0b1l9rv16mw"; + type = "gem"; + }; + version = "5.0.3"; + }; + elasticsearch-model = { + dependencies = ["activesupport" "elasticsearch" "hashie"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10kbsdxd192g8x60fhaxs4gqpgwag68d53flcw8rwvdm0i8smyzf"; + type = "gem"; + }; + version = "0.1.9"; + }; + elasticsearch-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "081hm2dc3l6kky027wm3s8k6lmiygg0hnrggnidchbl94nlalw2z"; + type = "gem"; + }; + version = "0.1.9"; + }; + elasticsearch-transport = { + dependencies = ["faraday" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a7fak70ajdqw1ahd2gmgijka52pjjfr3chaakkxa5fk3rwwna26"; + type = "gem"; + }; + version = "5.0.3"; + }; + email_reply_trimmer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vijywhy1acsq4187ss6w8a7ksswaf1d5np3wbj962b6rqif5vcz"; + type = "gem"; + }; + version = "0.1.6"; + }; + email_spec = { + dependencies = ["htmlentities" "launchy" "mail"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yadaif80cf2ry0nvhir1s70xmm22xzncq6vfvvffdd8h02ridv0"; + type = "gem"; + }; + version = "2.2.0"; + }; + encryptor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb"; + type = "gem"; + }; + version = "3.0.0"; + }; + equalizer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; + type = "gem"; + }; + version = "0.0.11"; + }; + erubis = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + type = "gem"; + }; + version = "2.7.0"; + }; + escape_utils = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "088r5c2mz2vy2jbbx1xjbi8msnzg631ggli29nhik2spbcp1z6vh"; + type = "gem"; + }; + version = "1.1.1"; + }; + et-orbi = { + dependencies = ["tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi"; + type = "gem"; + }; + version = "1.0.3"; + }; + eventmachine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp"; + type = "gem"; + }; + version = "1.0.8"; + }; + excon = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; + type = "gem"; + }; + version = "0.62.0"; + }; + execjs = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw"; + type = "gem"; + }; + version = "2.6.0"; + }; + expression_parser = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib"; + type = "gem"; + }; + version = "0.9.0"; + }; + factory_bot = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx"; + type = "gem"; + }; + version = "4.8.2"; + }; + factory_bot_rails = { + dependencies = ["factory_bot" "railties"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2"; + type = "gem"; + }; + version = "4.8.2"; + }; + faraday = { + dependencies = ["multipart-post"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2"; + type = "gem"; + }; + version = "0.12.2"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; + type = "gem"; + }; + version = "0.12.2"; + }; + faraday_middleware-aws-signers-v4 = { + dependencies = ["aws-sdk-resources" "faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp"; + type = "gem"; + }; + version = "0.1.7"; + }; + faraday_middleware-multi_json = { + dependencies = ["faraday_middleware" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q"; + type = "gem"; + }; + version = "0.0.6"; + }; + fast_blank = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56"; + type = "gem"; + }; + version = "1.0.0"; + }; + fast_gettext = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3"; + type = "gem"; + }; + version = "1.6.0"; + }; + ffaker = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rlfvf2iakphs3krxy1hiywr2jzmrhvhig8n8fw6rcivpz9v52ry"; + type = "gem"; + }; + version = "2.4.0"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + type = "gem"; + }; + version = "1.9.25"; + }; + flipper = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw"; + type = "gem"; + }; + version = "0.13.0"; + }; + flipper-active_record = { + dependencies = ["activerecord" "flipper"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1"; + type = "gem"; + }; + version = "0.13.0"; + }; + flipper-active_support_cache_store = { + dependencies = ["activesupport" "flipper"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk"; + type = "gem"; + }; + version = "0.13.0"; + }; + flowdock = { + dependencies = ["httparty" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg"; + type = "gem"; + }; + version = "0.7.1"; + }; + fog-aliyun = { + dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; + type = "gem"; + }; + version = "0.2.0"; + }; + fog-aws = { + dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; + type = "gem"; + }; + version = "2.0.1"; + }; + fog-core = { + dependencies = ["builder" "excon" "formatador"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; + type = "gem"; + }; + version = "1.45.0"; + }; + fog-google = { + dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2"; + type = "gem"; + }; + version = "1.7.1"; + }; + fog-json = { + dependencies = ["fog-core" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; + type = "gem"; + }; + version = "1.0.2"; + }; + fog-local = { + dependencies = ["fog-core"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn"; + type = "gem"; + }; + version = "0.3.1"; + }; + fog-openstack = { + dependencies = ["fog-core" "fog-json" "ipaddress"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys"; + type = "gem"; + }; + version = "0.1.21"; + }; + fog-rackspace = { + dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a"; + type = "gem"; + }; + version = "0.1.1"; + }; + fog-xml = { + dependencies = ["fog-core" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n"; + type = "gem"; + }; + version = "0.1.3"; + }; + font-awesome-rails = { + dependencies = ["railties"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qc07vj7qyllrj7lr7wl89l5ir0gj104rc7sds2jynzmrqsamnlw"; + type = "gem"; + }; + version = "4.7.0.1"; + }; + foreman = { + dependencies = ["thor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0"; + type = "gem"; + }; + version = "0.84.0"; + }; + formatador = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + type = "gem"; + }; + version = "0.2.5"; + }; + fuubar = { + dependencies = ["rspec-core" "ruby-progressbar"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlv2wisgnim29h47shvqhipbz1wgndfdr7i6y5wcfag0z2660lv"; + type = "gem"; + }; + version = "2.2.0"; + }; + gemojione = { + dependencies = ["json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; + type = "gem"; + }; + version = "3.3.0"; + }; + get_process_mem = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "025f7v6bpbgsa2nr0hzv2riggj8qmzbwcyxfgjidpmwh5grh7j29"; + type = "gem"; + }; + version = "0.2.0"; + }; + gettext = { + dependencies = ["locale" "text"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; + type = "gem"; + }; + version = "3.2.9"; + }; + gettext_i18n_rails = { + dependencies = ["fast_gettext"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vs918a03mqvx9aczaqdg9d2q9s3c6swqavzn82qgq5i822czrcm"; + type = "gem"; + }; + version = "1.8.0"; + }; + gettext_i18n_rails_js = { + dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11yn5cf92wsmlj5c1065mg6swf8gq9l6g9ahikvvyf9npvjay42x"; + type = "gem"; + }; + version = "1.3.0"; + }; + gitaly-proto = { + dependencies = ["google-protobuf" "grpc"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i"; + type = "gem"; + }; + version = "0.117.0"; + }; + github-linguist = { + dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk"; + type = "gem"; + }; + version = "5.3.3"; + }; + github-markup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; + type = "gem"; + }; + version = "1.7.0"; + }; + gitlab-flowdock-git-hook = { + dependencies = ["flowdock" "gitlab-grit" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8"; + type = "gem"; + }; + version = "1.0.1"; + }; + gitlab-gollum-lib = { + dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn"; + type = "gem"; + }; + version = "4.2.7.5"; + }; + gitlab-gollum-rugged_adapter = { + dependencies = ["mime-types" "rugged"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi"; + type = "gem"; + }; + version = "0.4.4.1"; + }; + gitlab-grit = { + dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4"; + type = "gem"; + }; + version = "2.8.2"; + }; + gitlab-license = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q26cgp3ln3b36n3sc69r6hxafkxjwdr3m0d7jlch5j7vyib9bih"; + type = "gem"; + }; + version = "1.0.0"; + }; + gitlab-markup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v6w3z7smmkqnhphb4ghgpqg61vimflqzpszybji0li99f2k1jb6"; + type = "gem"; + }; + version = "1.6.4"; + }; + gitlab-styles = { + dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx"; + type = "gem"; + }; + version = "2.4.1"; + }; + gitlab_omniauth-ldap = { + dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv"; + type = "gem"; + }; + version = "2.0.4"; + }; + globalid = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38"; + type = "gem"; + }; + version = "0.4.1"; + }; + gollum-grit_adapter = { + dependencies = ["gitlab-grit"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; + type = "gem"; + }; + version = "1.0.1"; + }; + gon = { + dependencies = ["actionpack" "multi_json" "request_store"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q9nvnw98mbb40h7mlzn1zk40r2l29yybhinmiqhrq8a6adsv806"; + type = "gem"; + }; + version = "6.2.0"; + }; + google-api-client = { + dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05h2lca9b334ayabgs3h0mzc2wg3csvkqv1lv3iirpgf90ypbk1k"; + type = "gem"; + }; + version = "0.23.4"; + }; + google-protobuf = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi"; + type = "gem"; + }; + version = "3.5.1"; + }; + googleapis-common-protos-types = { + dependencies = ["google-protobuf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck"; + type = "gem"; + }; + version = "1.0.1"; + }; + googleauth = { + dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; + type = "gem"; + }; + version = "0.6.2"; + }; + gpgme = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fclgx3pg3sihk9xn3amcf8db0q749dsqkycayn1c8x134zml3gb"; + type = "gem"; + }; + version = "2.0.13"; + }; + grape = { + dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427"; + type = "gem"; + }; + version = "1.0.3"; + }; + grape-entity = { + dependencies = ["activesupport" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w78wylkhdkc0s6n6d20hggbb3pl3ladzzd5lx6ack2iswybx7b9"; + type = "gem"; + }; + version = "0.7.1"; + }; + grape-path-helpers = { + dependencies = ["activesupport" "grape" "rake"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13h5575xfc144wsr48sp3qngpwvh4ikz4r3m55j8jmdr6sa16rbw"; + type = "gem"; + }; + version = "1.0.6"; + }; + grape_logging = { + dependencies = ["grape"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza"; + type = "gem"; + }; + version = "1.7.0"; + }; + graphiql-rails = { + dependencies = ["railties" "sprockets-rails"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10q5zipwgjgaan9lfqakdkm5ry8afgkq79bkimgksn6jyyvpz6w8"; + type = "gem"; + }; + version = "1.4.10"; + }; + graphql = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10bnl8yjyg5x6h787cfkpd5gphl5z5jblj8fc9lbmgk27n2knssl"; + type = "gem"; + }; + version = "1.8.1"; + }; + grpc = { + dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz"; + type = "gem"; + }; + version = "1.11.0"; + }; + gssapi = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix"; + type = "gem"; + }; + version = "1.2.0"; + }; + haml = { + dependencies = ["temple" "tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac"; + type = "gem"; + }; + version = "5.0.4"; + }; + haml_lint = { + dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04illnjl9hsg7wqf8x5s108m5is9aj52g80c6nrgsksyp4vh9ynn"; + type = "gem"; + }; + version = "0.26.0"; + }; + hamlit = { + dependencies = ["temple" "thor" "tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i"; + type = "gem"; + }; + version = "2.8.8"; + }; + hangouts-chat = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dmnv3723c22683bzys8walkl6wi74xzawxjbhwqzjdbwk3bdgmx"; + type = "gem"; + }; + version = "0.0.5"; + }; + hashdiff = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + type = "gem"; + }; + version = "0.3.4"; + }; + hashie = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb"; + type = "gem"; + }; + version = "3.5.7"; + }; + hashie-forbidden_attributes = { + dependencies = ["hashie"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1chgg5d2iddja6ww02x34g8avg11fzmzcb8yvnqlykii79zx6vis"; + type = "gem"; + }; + version = "0.1.1"; + }; + health_check = { + dependencies = ["rails"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mfa180nyzz1j0abfihm5nm3lmzq99362ibcphky6rh5vwhckvm8"; + type = "gem"; + }; + version = "2.6.0"; + }; + hipchat = { + dependencies = ["httparty" "mimemagic"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; + type = "gem"; + }; + version = "1.5.2"; + }; + html-pipeline = { + dependencies = ["activesupport" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad"; + type = "gem"; + }; + version = "2.8.4"; + }; + html2text = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii"; + type = "gem"; + }; + version = "0.2.0"; + }; + htmlentities = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + http = { + dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kcd9qp8vm1rkyp7gfh8j0dbl3zpi97vz2vbhpbcsdsa7l21a59r"; + type = "gem"; + }; + version = "2.2.2"; + }; + http-cookie = { + dependencies = ["domain_name"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + http-form_data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8dwwbfpf8kc0lcsqcgy29lflszd1x4d7kc0f7227892m7r6y0m"; + type = "gem"; + }; + version = "1.0.3"; + }; + "http_parser.rb" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; + httparty = { + dependencies = ["json" "multi_xml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2"; + type = "gem"; + }; + version = "0.13.7"; + }; + httpclient = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + type = "gem"; + }; + version = "0.9.5"; + }; + icalendar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd"; + type = "gem"; + }; + version = "2.4.1"; + }; + ice_nine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; + type = "gem"; + }; + version = "0.11.2"; + }; + influxdb = { + dependencies = ["cause" "json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w"; + type = "gem"; + }; + version = "0.2.3"; + }; + ipaddress = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; + type = "gem"; + }; + version = "0.8.3"; + }; + jira-ruby = { + dependencies = ["activesupport" "multipart-post" "oauth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14019mliqwcppj6qp2wdhh5gbvs2yh2idibag13m9a18ag965bhw"; + type = "gem"; + }; + version = "1.4.1"; + }; + jmespath = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; + type = "gem"; + }; + version = "1.3.1"; + }; + jquery-atwho-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9"; + type = "gem"; + }; + version = "1.3.2"; + }; + js_regex = { + dependencies = ["regexp_parser"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf"; + type = "gem"; + }; + version = "2.2.1"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + type = "gem"; + }; + version = "1.8.6"; + }; + json-jwt = { + dependencies = ["activesupport" "aes_key_wrap" "bindata"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "065k7vffdki73f4nz89lxi6wxmcw5dlf593831pgvlbralll6x3r"; + type = "gem"; + }; + version = "1.9.4"; + }; + json-schema = { + dependencies = ["addressable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz"; + type = "gem"; + }; + version = "2.8.0"; + }; + jwt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; + type = "gem"; + }; + version = "1.5.6"; + }; + kaminari = { + dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0invfvfb252ihsdr65rylkvd1x2wy004jval52v3i8ybb0jhc5hi"; + type = "gem"; + }; + version = "1.0.1"; + }; + kaminari-actionview = { + dependencies = ["actionview" "kaminari-core"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mhhsm6xhmwqc7hfw7xnk1kdbfg468bqs5awcqm5j6j8b9zyjvdi"; + type = "gem"; + }; + version = "1.0.1"; + }; + kaminari-activerecord = { + dependencies = ["activerecord" "kaminari-core"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kb5aj6iy1cwcq5548jd3w1ipxicnzmnx2ay1s4hvad2gvrd4g93"; + type = "gem"; + }; + version = "1.0.1"; + }; + kaminari-core = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r2n293ad1xr9wgn8cr53nfzwls4w3p1xi4kjfjgl1z0yf05mpwr"; + type = "gem"; + }; + version = "1.0.1"; + }; + kgio = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118"; + type = "gem"; + }; + version = "2.10.0"; + }; + knapsack = { + dependencies = ["rake"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q2y7mb8ii1ncdrlp46l9v2x909gdnjaid2dg5gcicj39hna36di"; + type = "gem"; + }; + version = "1.16.0"; + }; + kubeclient = { + dependencies = ["http" "recursive-open-struct" "rest-client"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czzdp9lfsrah2jkaddkqzmphyvnk096zm1ra6jddh626d8d53r4"; + type = "gem"; + }; + version = "3.1.0"; + }; + launchy = { + dependencies = ["addressable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; + type = "gem"; + }; + version = "2.4.3"; + }; + letter_opener = { + dependencies = ["launchy"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21"; + type = "gem"; + }; + version = "1.4.1"; + }; + letter_opener_web = { + dependencies = ["actionmailer" "letter_opener" "railties"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050x5cwqbxj2cydd2pzy9vfhmpgn1w6lfbwjaax1m1vpkn3xg9bv"; + type = "gem"; + }; + version = "1.3.0"; + }; + license_finder = { + dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01rhqm5m3m22gq6q9f1x9fh3x3wrf9khnnsycblj0xg5frdjv77v"; + type = "gem"; + }; + version = "5.4.0"; + }; + licensee = { + dependencies = ["rugged"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc"; + type = "gem"; + }; + version = "8.9.2"; + }; + little-plugger = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + locale = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; + type = "gem"; + }; + version = "2.1.2"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + type = "gem"; + }; + version = "2.2.2"; + }; + lograge = { + dependencies = ["actionpack" "activesupport" "railties" "request_store"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00lcn7s3slfn32di4qwlx2yj5f9r2pcnd0naxrvqqwypcg1z2sdd"; + type = "gem"; + }; + version = "0.10.0"; + }; + loofah = { + dependencies = ["crass" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yjs6wbcj3n06d3xjqpy3qbpx0bfa12h3x2rbpc2k33ldjlkx6zy"; + type = "gem"; + }; + version = "2.2.2"; + }; + mail = { + dependencies = ["mini_mime"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz"; + type = "gem"; + }; + version = "2.7.0"; + }; + mail_room = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16b8yjd1if665mwaindwys06nkkcs0jw3dcsqvn6qbp6alfigqaa"; + type = "gem"; + }; + version = "0.9.1"; + }; + memoist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; + type = "gem"; + }; + version = "0.16.0"; + }; + memoizable = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; + type = "gem"; + }; + version = "0.4.2"; + }; + method_source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xqj21j3vfq4ldia6i2akhn2qd84m0iqcnsl49kfpq3xk6x0dzgn"; + type = "gem"; + }; + version = "0.9.0"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + type = "gem"; + }; + version = "3.1"; + }; + mime-types-data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + type = "gem"; + }; + version = "3.2016.0521"; + }; + mimemagic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "101lq4bnjs7ywdcicpw3vbz9amg5gbb4va1626fybd2hawgdx8d9"; + type = "gem"; + }; + version = "0.3.0"; + }; + mini_magick = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1djxfs9rxw6q6vr6wb4ndxhp1vj1zbwb55s1kf6mz9bzgmswqg0n"; + type = "gem"; + }; + version = "4.8.0"; + }; + mini_mime = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; + type = "gem"; + }; + version = "1.0.0"; + }; + mini_portile2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + type = "gem"; + }; + version = "2.3.0"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rxqfakp629mp3vwda7zpgb57lcns5znkskikbfd0kriwv8i1vq8"; + type = "gem"; + }; + version = "5.7.0"; + }; + mousetrap-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m"; + type = "gem"; + }; + version = "1.4.6"; + }; + msgpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + type = "gem"; + }; + version = "1.2.4"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; + multi_xml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + type = "gem"; + }; + version = "0.6.0"; + }; + multipart-post = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + type = "gem"; + }; + version = "2.0.0"; + }; + mustermann = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; + type = "gem"; + }; + version = "1.0.2"; + }; + mustermann-grape = { + dependencies = ["mustermann"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10xdggddjl8nraq7pbli31lwgrzxzz8gp558i811lsv71fqbmhzr"; + type = "gem"; + }; + version = "1.0.0"; + }; + mysql2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq"; + type = "gem"; + }; + version = "0.4.10"; + }; + net-ldap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fh4l8zfsrvghanpnjxk944k7yl093qpw4759xs6f1v9kb73ihfq"; + type = "gem"; + }; + version = "0.16.0"; + }; + net-ntp = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z96m7nnb9f634cz4i6p0x89z7g9i9h97cnk5f3x3q5x090kzisv"; + type = "gem"; + }; + version = "2.1.3"; + }; + net-ssh = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hj2i8rk5wb6235r5n19in1hkrp1fbz2bf40xmagavb5ahv7205w"; + type = "gem"; + }; + version = "5.0.1"; + }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + nokogiri = { + dependencies = ["mini_portile2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; + type = "gem"; + }; + version = "1.8.4"; + }; + nokogumbo = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj"; + type = "gem"; + }; + version = "1.5.0"; + }; + numerizer = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h"; + type = "gem"; + }; + version = "0.1.1"; + }; + oauth = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; + type = "gem"; + }; + version = "0.5.4"; + }; + oauth2 = { + dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094hmmfms8vpm6nwglpl7jmlv85nlfzl0kik4fizgx1rg70a6mr5"; + type = "gem"; + }; + version = "1.4.0"; + }; + octokit = { + dependencies = ["sawyer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298"; + type = "gem"; + }; + version = "4.9.0"; + }; + omniauth = { + dependencies = ["hashie" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1msqr4qq7mfdvl3rg89529isrv595hvjpj2gi0say4b8nwqfggmg"; + type = "gem"; + }; + version = "1.8.1"; + }; + omniauth-auth0 = { + dependencies = ["omniauth-oauth2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0id5gn14av81kh41cq4q6c9knyvzl7vc4rs3m4pmpd43g2z6jdw2"; + type = "gem"; + }; + version = "2.0.0"; + }; + omniauth-authentiq = { + dependencies = ["jwt" "omniauth-oauth2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k7vajxwplsp188xfj4mi9iqbc7f7djqh02by4mphc51hl87kcqi"; + type = "gem"; + }; + version = "0.3.3"; + }; + omniauth-azure-oauth2 = { + dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ck5616fjik0dw89xvak1mi8ijcv10lsh6n9h4107l5dys2g3jfx"; + type = "gem"; + }; + version = "0.0.9"; + }; + omniauth-cas3 = { + dependencies = ["addressable" "nokogiri" "omniauth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "191b4jm4djmmy54yxfxj3c889r2wn3g6sfsdj6l1rjy0kw1m2qgx"; + type = "gem"; + }; + version = "1.1.4"; + }; + omniauth-facebook = { + dependencies = ["omniauth-oauth2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5"; + type = "gem"; + }; + version = "4.0.0"; + }; + omniauth-github = { + dependencies = ["omniauth" "omniauth-oauth2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yg7k4p95ybcsii17spqarl8rpfzkq0kb19ab6wl4lc922zgfbqc"; + type = "gem"; + }; + version = "1.3.0"; + }; + omniauth-gitlab = { + dependencies = ["omniauth" "omniauth-oauth2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19ydk2zd2mz8zi80z3l03pajpm9357sg3lrankrcb3pirkkdb9fp"; + type = "gem"; + }; + version = "1.0.3"; + }; + omniauth-google-oauth2 = { + dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rvdac08vgrxcblq8w2hqj080v2cwv3cigxdzs11gz4d538zjnym"; + type = "gem"; + }; + version = "0.5.3"; + }; + omniauth-kerberos = { + dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7"; + type = "gem"; + }; + version = "0.3.0"; + }; + omniauth-multipassword = { + dependencies = ["omniauth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8"; + type = "gem"; + }; + version = "0.4.2"; + }; + omniauth-oauth = { + dependencies = ["oauth" "omniauth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037"; + type = "gem"; + }; + version = "1.1.0"; + }; + omniauth-oauth2 = { + dependencies = ["oauth2" "omniauth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kscjf1y0lnggsl4z3w5bwllqshqjlsl5kmcya5haydajdnzvdjr"; + type = "gem"; + }; + version = "1.5.0"; + }; + omniauth-oauth2-generic = { + dependencies = ["omniauth-oauth2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m6vpip3rm1spx1x9y1kjczzailsph1xqgaakqylzq3jqkv18273"; + type = "gem"; + }; + version = "0.2.2"; + }; + omniauth-saml = { + dependencies = ["omniauth" "ruby-saml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p"; + type = "gem"; + }; + version = "1.10.0"; + }; + omniauth-shibboleth = { + dependencies = ["omniauth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04yin7j8xpr8llvank3ivzahqkc6ss5bppc7q6znzdswxmf75fxh"; + type = "gem"; + }; + version = "1.3.0"; + }; + omniauth-twitter = { + dependencies = ["omniauth-oauth" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; + type = "gem"; + }; + version = "1.4.0"; + }; + omniauth_crowd = { + dependencies = ["activesupport" "nokogiri" "omniauth"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7"; + type = "gem"; + }; + version = "2.2.3"; + }; + org-ruby = { + dependencies = ["rubypants"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk"; + type = "gem"; + }; + version = "0.9.12"; + }; + orm_adapter = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda"; + type = "gem"; + }; + version = "0.5.0"; + }; + os = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; + type = "gem"; + }; + version = "0.9.6"; + }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + type = "gem"; + }; + version = "1.12.1"; + }; + parser = { + dependencies = ["ast"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9"; + type = "gem"; + }; + version = "2.5.1.0"; + }; + parslet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88"; + type = "gem"; + }; + version = "1.8.2"; + }; + peek = { + dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1998vcsli215d6qrn9821gr2qip60xki2p7n2dpn8i1n68hyshcn"; + type = "gem"; + }; + version = "1.0.1"; + }; + peek-gc = { + dependencies = ["peek"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094h3mr9q8wzbqsj0girpyjvj4bcxax8m438igp42n75xv0bhwi9"; + type = "gem"; + }; + version = "0.0.2"; + }; + peek-mysql2 = { + dependencies = ["atomic" "mysql2" "peek"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fzx3dwj7k6sc87jwhjk8vzp8dskv49j141xx15vvkg603j8k"; + type = "gem"; + }; + version = "1.1.0"; + }; + peek-pg = { + dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17yk8xrh7yh57wg6vi3s8km9qd9f910n94r511mdyqd7aizlfb7c"; + type = "gem"; + }; + version = "1.3.0"; + }; + peek-rblineprof = { + dependencies = ["peek" "rblineprof"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ywk1gvsnhrkhqq2ibwsg7099kg5m2vs4nmzy0wf65kb0ywl0m9c"; + type = "gem"; + }; + version = "0.2.0"; + }; + peek-redis = { + dependencies = ["atomic" "peek" "redis"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v91cni591d9wdrmvgam20gr3504x84mh1l95da4rz5a9436jm33"; + type = "gem"; + }; + version = "1.2.0"; + }; + peek-sidekiq = { + dependencies = ["atomic" "peek" "sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x"; + type = "gem"; + }; + version = "1.0.3"; + }; + pg = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + type = "gem"; + }; + version = "0.18.4"; + }; + po_to_json = { + dependencies = ["json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xvanl437305mry1gd57yvcg7xrfhri91czr32bjr8j2djm8hwba"; + type = "gem"; + }; + version = "1.0.1"; + }; + posix-spawn = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; + type = "gem"; + }; + version = "0.3.13"; + }; + powerpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; + type = "gem"; + }; + version = "0.1.1"; + }; + premailer = { + dependencies = ["addressable" "css_parser" "htmlentities"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10w6f7r6snpkcnv3byxma9b08lyqzcfxkm083scb2dr2ly4xkzyf"; + type = "gem"; + }; + version = "1.10.4"; + }; + premailer-rails = { + dependencies = ["actionmailer" "premailer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05czxmx6hnykg6g23hy2ww2bf86a69njbi02sv7lrds4w776jhim"; + type = "gem"; + }; + version = "1.9.7"; + }; + proc_to_ast = { + dependencies = ["coderay" "parser" "unparser"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj"; + type = "gem"; + }; + version = "0.1.0"; + }; + procto = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c"; + type = "gem"; + }; + version = "0.0.3"; + }; + prometheus-client-mmap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14ww8c2qy43jw3fzmq54hsljmqmlx9a7zg9sv6ddw48qy118ls10"; + type = "gem"; + }; + version = "0.9.4"; + }; + pry = { + dependencies = ["coderay" "method_source"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g"; + type = "gem"; + }; + version = "0.11.3"; + }; + pry-byebug = { + dependencies = ["byebug" "pry"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g820bqmlq8vvh78895zgrzgmj3g6n63px7cba11s02lpz56630n"; + type = "gem"; + }; + version = "3.4.3"; + }; + pry-rails = { + dependencies = ["pry"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6"; + type = "gem"; + }; + version = "0.3.5"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + type = "gem"; + }; + version = "3.0.2"; + }; + pyu-ruby-sasl = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn"; + type = "gem"; + }; + version = "0.0.3.3"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q"; + type = "gem"; + }; + version = "1.6.10"; + }; + rack-accept = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936"; + type = "gem"; + }; + version = "0.4.5"; + }; + rack-attack = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1"; + type = "gem"; + }; + version = "4.4.1"; + }; + rack-cors = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013"; + type = "gem"; + }; + version = "1.0.2"; + }; + rack-oauth2 = { + dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf"; + type = "gem"; + }; + version = "1.2.3"; + }; + rack-protection = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; + type = "gem"; + }; + version = "2.0.1"; + }; + rack-proxy = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4"; + type = "gem"; + }; + version = "0.6.0"; + }; + rack-test = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; + type = "gem"; + }; + version = "0.6.3"; + }; + rails = { + dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vbdlkmlh470g7msqhmcmhxhi4finv3cjg595x9viafvphnf40l"; + type = "gem"; + }; + version = "4.2.10"; + }; + rails-deprecated_sanitizer = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; + type = "gem"; + }; + version = "1.0.3"; + }; + rails-dom-testing = { + dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6"; + type = "gem"; + }; + version = "1.0.9"; + }; + rails-html-sanitizer = { + dependencies = ["loofah"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; + type = "gem"; + }; + version = "1.0.4"; + }; + rails-i18n = { + dependencies = ["i18n" "railties"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17a02f2671pw5r2hl2n3isiz6w9wy2dxq8g52srciyl1xcmvsw01"; + type = "gem"; + }; + version = "4.0.9"; + }; + railties = { + dependencies = ["actionpack" "activesupport" "rake" "thor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0snymfqj2cql0gp51i6a44avcirdridc15yggnxjj9raa9f3229p"; + type = "gem"; + }; + version = "4.2.10"; + }; + rainbow = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; + }; + raindrops = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz"; + type = "gem"; + }; + version = "0.18.0"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg"; + type = "gem"; + }; + version = "12.3.1"; + }; + rb-fsevent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + type = "gem"; + }; + version = "0.10.2"; + }; + rb-inotify = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + type = "gem"; + }; + version = "0.9.10"; + }; + rblineprof = { + dependencies = ["debugger-ruby_core_source"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6"; + type = "gem"; + }; + version = "0.3.6"; + }; + rbtrace = { + dependencies = ["ffi" "msgpack" "trollop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv"; + type = "gem"; + }; + version = "0.4.10"; + }; + rdoc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7"; + type = "gem"; + }; + version = "6.0.4"; + }; + re2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00wf9k1hkv3z3nfkrnfyyfq9ah0l7k14awqys3h2hqz4c21pqd2i"; + type = "gem"; + }; + version = "1.1.1"; + }; + recaptcha = { + dependencies = ["json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n"; + type = "gem"; + }; + version = "3.0.0"; + }; + recursive-open-struct = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wfcyigmf5mwrxy76p0bi4sdb4h9afs8jc73pjav5cnqszljjl3c"; + type = "gem"; + }; + version = "1.1.0"; + }; + redcarpet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + type = "gem"; + }; + version = "3.4.0"; + }; + RedCloth = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy"; + type = "gem"; + }; + version = "4.3.2"; + }; + redis = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i415x8gi0c5vsiy6ikvx5js6fhc4x80a5lqv8iidy2iymd20irv"; + type = "gem"; + }; + version = "3.3.5"; + }; + redis-actionpack = { + dependencies = ["actionpack" "redis-rack" "redis-store"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63"; + type = "gem"; + }; + version = "5.0.2"; + }; + redis-activesupport = { + dependencies = ["activesupport" "redis-store"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5"; + type = "gem"; + }; + version = "5.0.4"; + }; + redis-namespace = { + dependencies = ["redis"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r7daagrjjribn098dxwbv9zivrbq2rsffbkj2ccxyn9lmjjbgah"; + type = "gem"; + }; + version = "1.6.0"; + }; + redis-rack = { + dependencies = ["rack" "redis-store"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb"; + type = "gem"; + }; + version = "2.0.4"; + }; + redis-rails = { + dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40"; + type = "gem"; + }; + version = "5.0.2"; + }; + redis-store = { + dependencies = ["redis"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00yh8rhv91vxjlqs4ylic99m9npjxmgib2vjj8hgzk1174y6vcmq"; + type = "gem"; + }; + version = "1.4.1"; + }; + regexp_parser = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb"; + type = "gem"; + }; + version = "0.5.0"; + }; + representable = { + dependencies = ["declarative" "declarative-option" "uber"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; + type = "gem"; + }; + version = "3.0.4"; + }; + request_store = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1va9x0b3ww4chcfqlmi8b14db39di1mwa7qrjbh7ma0lhndvs2zv"; + type = "gem"; + }; + version = "1.3.1"; + }; + responders = { + dependencies = ["actionpack" "railties"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rhdyyvvm26f2l3fgwdp6xasfl2y0whwgy766bhdwz697mf78zfn"; + type = "gem"; + }; + version = "2.4.0"; + }; + rest-client = { + dependencies = ["http-cookie" "mime-types" "netrc"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; + type = "gem"; + }; + version = "2.0.2"; + }; + retriable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; + type = "gem"; + }; + version = "3.1.2"; + }; + rinku = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11cakxzp7qi04d41hbqkh92n52mm4z2ba8sqyhxbmfi4kypmls9y"; + type = "gem"; + }; + version = "2.0.0"; + }; + rotp = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d"; + type = "gem"; + }; + version = "2.1.2"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; + type = "gem"; + }; + version = "3.2.1"; + }; + rqrcode = { + dependencies = ["chunky_png"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb"; + type = "gem"; + }; + version = "0.7.0"; + }; + rqrcode-rails3 = { + dependencies = ["rqrcode"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg"; + type = "gem"; + }; + version = "0.1.7"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01"; + type = "gem"; + }; + version = "3.7.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj"; + type = "gem"; + }; + version = "3.7.1"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy"; + type = "gem"; + }; + version = "3.7.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3"; + type = "gem"; + }; + version = "3.7.0"; + }; + rspec-parameterized = { + dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0arynbr6cfjhccwc8gy2xf87nybdnncsnmfwknnh8s7d4mj730p0"; + type = "gem"; + }; + version = "0.4.0"; + }; + rspec-rails = { + dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cdcnbv5dppwy3b4jdp5a0wd9m07a8wlqwb9yazn8i7k1k2mwgvx"; + type = "gem"; + }; + version = "3.7.2"; + }; + rspec-retry = { + dependencies = ["rspec-core"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0izvxab7jvk25kaprk0i72asjyh1ip3cm70bgxlm8lpid35qjar6"; + type = "gem"; + }; + version = "0.4.5"; + }; + rspec-set = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06vw8b5w1a58838cw9ssmy3r6f8vrjh54h7dp97rwv831gn5zlyk"; + type = "gem"; + }; + version = "0.1.3"; + }; + rspec-support = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1"; + type = "gem"; + }; + version = "3.7.1"; + }; + rspec_junit_formatter = { + dependencies = ["builder" "rspec-core"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai"; + type = "gem"; + }; + version = "0.2.3"; + }; + rspec_profiling = { + dependencies = ["activerecord" "pg" "rails" "sqlite3"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g7q7gav26bpiprx4dhlvdh4zdrhwiky9jbmsp14gyfiabqdz4sz"; + type = "gem"; + }; + version = "0.0.5"; + }; + rubocop = { + dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "106y99lq0fg62k3vk1w5wwb4vq16pnh4l61skc82xck627z0h8is"; + type = "gem"; + }; + version = "0.54.0"; + }; + rubocop-gitlab-security = { + dependencies = ["rubocop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln"; + type = "gem"; + }; + version = "0.1.1"; + }; + rubocop-rspec = { + dependencies = ["rubocop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vk51h9swvgshan8vp8yjz03qv9vn5vs29i9iddhjwcwgzsganla"; + type = "gem"; + }; + version = "1.22.2"; + }; + ruby-enum = { + dependencies = ["i18n"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + type = "gem"; + }; + version = "0.7.2"; + }; + ruby-fogbugz = { + dependencies = ["crack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm"; + type = "gem"; + }; + version = "0.2.1"; + }; + ruby-prof = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c"; + type = "gem"; + }; + version = "0.17.0"; + }; + ruby-progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; + type = "gem"; + }; + version = "1.9.0"; + }; + ruby-saml = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3"; + type = "gem"; + }; + version = "1.7.2"; + }; + ruby_parser = { + dependencies = ["sexp_processor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18apbsmmivgc1schfxmkp429aijrwy8psm30dwx5cpmpjf48ir3n"; + type = "gem"; + }; + version = "3.9.0"; + }; + rubyntlm = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; + type = "gem"; + }; + version = "0.6.2"; + }; + rubypants = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph"; + type = "gem"; + }; + version = "0.2.0"; + }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + type = "gem"; + }; + version = "1.2.2"; + }; + rufus-scheduler = { + dependencies = ["et-orbi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8"; + type = "gem"; + }; + version = "3.4.0"; + }; + rugged = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72"; + type = "gem"; + }; + version = "0.27.4"; + }; + safe_yaml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; + }; + sanitize = { + dependencies = ["crass" "nokogiri" "nokogumbo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv"; + type = "gem"; + }; + version = "4.6.6"; + }; + sass = { + dependencies = ["sass-listen"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; + type = "gem"; + }; + version = "3.5.5"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + type = "gem"; + }; + version = "4.0.0"; + }; + sass-rails = { + dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb"; + type = "gem"; + }; + version = "5.0.6"; + }; + sawyer = { + dependencies = ["addressable" "faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; + type = "gem"; + }; + version = "0.8.1"; + }; + scss_lint = { + dependencies = ["rake" "sass"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g"; + type = "gem"; + }; + version = "0.56.0"; + }; + seed-fu = { + dependencies = ["activerecord" "activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x6gclryl0hds3zms095d2iyafcvm2kfrm7362vrkxws7r2775pi"; + type = "gem"; + }; + version = "2.3.7"; + }; + select2-rails = { + dependencies = ["thor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj"; + type = "gem"; + }; + version = "3.5.9.3"; + }; + selenium-webdriver = { + dependencies = ["childprocess" "rubyzip"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07bl3wjkf254r3ljfl4qdazz5aw60s6nqjwrbbgq754j9b7226kz"; + type = "gem"; + }; + version = "3.12.0"; + }; + sentry-raven = { + dependencies = ["faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; + type = "gem"; + }; + version = "2.7.2"; + }; + settingslogic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar"; + type = "gem"; + }; + version = "2.0.9"; + }; + sexp_processor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6kp2qxq550hz7gsxqi37irxn3vynkz7ibgy9hfwqymf6y1jdik"; + type = "gem"; + }; + version = "4.9.0"; + }; + sham_rack = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i"; + type = "gem"; + }; + version = "1.3.6"; + }; + shoulda-matchers = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zvv94pqk5b5my3w1shdz7h34xf2ldhg5k4qfdpbwi2iy0j9zw2a"; + type = "gem"; + }; + version = "3.1.2"; + }; + sidekiq = { + dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh"; + type = "gem"; + }; + version = "5.1.3"; + }; + sidekiq-cron = { + dependencies = ["rufus-scheduler" "sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj"; + type = "gem"; + }; + version = "0.6.0"; + }; + sidekiq-limit_fetch = { + dependencies = ["sidekiq"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; + type = "gem"; + }; + version = "3.4.0"; + }; + signet = { + dependencies = ["addressable" "faraday" "jwt" "multi_json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; + type = "gem"; + }; + version = "0.8.1"; + }; + simple_po_parser = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3"; + type = "gem"; + }; + version = "1.1.2"; + }; + simplecov = { + dependencies = ["docile" "json" "simplecov-html"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww"; + type = "gem"; + }; + version = "0.14.1"; + }; + simplecov-html = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf"; + type = "gem"; + }; + version = "0.10.0"; + }; + slack-notifier = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6"; + type = "gem"; + }; + version = "1.5.1"; + }; + spring = { + dependencies = ["activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x"; + type = "gem"; + }; + version = "2.0.1"; + }; + spring-commands-rspec = { + dependencies = ["spring"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2"; + type = "gem"; + }; + version = "1.0.4"; + }; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-rails = { + dependencies = ["actionpack" "activesupport" "sprockets"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; + type = "gem"; + }; + version = "3.2.1"; + }; + sqlite3 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + type = "gem"; + }; + version = "1.3.13"; + }; + sshkey = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + type = "gem"; + }; + version = "1.9.0"; + }; + stackprof = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski"; + type = "gem"; + }; + version = "0.2.10"; + }; + state_machines = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3"; + type = "gem"; + }; + version = "0.5.0"; + }; + state_machines-activemodel = { + dependencies = ["activemodel" "state_machines"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l"; + type = "gem"; + }; + version = "0.5.1"; + }; + state_machines-activerecord = { + dependencies = ["activerecord" "state_machines-activemodel"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3"; + type = "gem"; + }; + version = "0.5.1"; + }; + stringex = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1"; + type = "gem"; + }; + version = "2.8.4"; + }; + sys-filesystem = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "092wj7936i5inzafi09wqh5c8dbak588q21k652dsrdjf5qi10zq"; + type = "gem"; + }; + version = "1.1.6"; + }; + sysexits = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr"; + type = "gem"; + }; + version = "1.2.0"; + }; + temple = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; + type = "gem"; + }; + version = "0.8.0"; + }; + test-prof = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3"; + type = "gem"; + }; + version = "0.2.5"; + }; + test_after_commit = { + dependencies = ["activerecord"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s8pz00xq28lsa1rfczm83yqwk8wcb5dqw2imlj8gldnsdapcyc2"; + type = "gem"; + }; + version = "1.1.0"; + }; + text = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; + type = "gem"; + }; + version = "1.3.1"; + }; + thin = { + dependencies = ["daemons" "eventmachine" "rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q"; + type = "gem"; + }; + version = "1.7.0"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns"; + type = "gem"; + }; + version = "0.19.4"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + type = "gem"; + }; + version = "2.0.8"; + }; + timecop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vwbkwqyxhavzvr1820hqwz43ylnfcf6w4x6sag0nghi44sr9kmx"; + type = "gem"; + }; + version = "0.8.1"; + }; + timfel-krb5-auth = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b"; + type = "gem"; + }; + version = "0.8.3"; + }; + toml = { + dependencies = ["parslet"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xj460rkyqvg74xc8kivmbvgc46c6mm7r8mbjs5m2gq8khf8sbki"; + type = "gem"; + }; + version = "0.2.0"; + }; + toml-rb = { + dependencies = ["citrus"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d"; + type = "gem"; + }; + version = "1.0.0"; + }; + trollop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; + type = "gem"; + }; + version = "2.1.3"; + }; + truncato = { + dependencies = ["htmlentities" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b"; + type = "gem"; + }; + version = "0.7.10"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + type = "gem"; + }; + version = "1.2.5"; + }; + u2f = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lsm1hvwcaa9sq13ab1l1zjk0fgcy951ay11v2acx0h6q1iv21vr"; + type = "gem"; + }; + version = "0.2.1"; + }; + uber = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; + type = "gem"; + }; + version = "0.1.0"; + }; + uglifier = { + dependencies = ["execjs" "json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz"; + type = "gem"; + }; + version = "2.7.2"; + }; + unf = { + dependencies = ["unf_ext"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; + type = "gem"; + }; + version = "0.0.7.5"; + }; + unicode-display_width = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n"; + type = "gem"; + }; + version = "1.3.2"; + }; + unicorn = { + dependencies = ["kgio" "raindrops"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; + type = "gem"; + }; + version = "5.1.0"; + }; + unicorn-worker-killer = { + dependencies = ["get_process_mem" "unicorn"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva"; + type = "gem"; + }; + version = "0.4.4"; + }; + uniform_notifier = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l"; + type = "gem"; + }; + version = "1.10.0"; + }; + unparser = { + dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k2asbk9k5kzq8jidy3frqcmn58i9cvaizn8f6g5xlx1pn70bx1w"; + type = "gem"; + }; + version = "0.2.7"; + }; + validates_hostname = { + dependencies = ["activerecord" "activesupport"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja"; + type = "gem"; + }; + version = "1.0.6"; + }; + version_sorter = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr"; + type = "gem"; + }; + version = "2.1.0"; + }; + virtus = { + dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk"; + type = "gem"; + }; + version = "1.0.5"; + }; + vmstat = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vb5mwc71p8rlm30hnll3lb4z70ipl5rmilskpdrq2mxwfilcm5b"; + type = "gem"; + }; + version = "2.3.0"; + }; + warden = { + dependencies = ["rack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12"; + type = "gem"; + }; + version = "1.2.7"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + type = "gem"; + }; + version = "2.3.2"; + }; + webpack-rails = { + dependencies = ["railties"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv"; + type = "gem"; + }; + version = "0.9.10"; + }; + wikicloth = { + dependencies = ["builder" "expression_parser" "rinku"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s"; + type = "gem"; + }; + version = "0.8.1"; + }; + with_env = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; + type = "gem"; + }; + version = "1.1.0"; + }; + xml-simple = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xlqplda3fix5pcykzsyzwgnbamb3qrqkgbrhhfz2a2fxhrkvhw8"; + type = "gem"; + }; + version = "1.1.5"; + }; + xpath = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ha626m6fh50fpilb9pdnmq9xl586w7c0zyidg895c3iq13rqgyw"; + type = "gem"; + }; + version = "2.1.0"; + }; +} \ No newline at end of file From 7686d7225628c1b478f8d6e4d701c0680a2afcc6 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 7 Oct 2018 15:19:32 -0400 Subject: [PATCH 251/992] linux_testing: 4.19-rc6 -> 4.19-rc7 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index cabaa59966c1..3d28bd68121d 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.19-rc6"; - modDirVersion = "4.19.0-rc6"; + version = "4.19-rc7"; + modDirVersion = "4.19.0-rc7"; extraMeta.branch = "4.19"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0cq0xr4lwvngyiyall62hddbk27gy72zjiigb8xdsry96a8ccvgl"; + sha256 = "0wjh62vfhvi2prz9sx9c0s0f9sa9z1775qn4jf8zz5y5isixzdml"; }; # Should the testing kernels ever be built on Hydra? From 9bbd4f653fff6ac1b5befc7ff6095d0806e25369 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 15:32:48 +0200 Subject: [PATCH 252/992] qtgraphicaleffects: Add dev output This shrank my system closure by about 192 MiB. --- pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix index 888f627baab8..d0be6ae77694 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix @@ -3,5 +3,5 @@ qtModule { name = "qtgraphicaleffects"; qtInputs = [ qtdeclarative ]; - outputs = [ "out" ]; + outputs = [ "out" "dev" ]; } From 2be42950c3b726f3cbf8c0198c66190aed094121 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 16:30:19 +0200 Subject: [PATCH 253/992] thunderbird: Remove buildconfig This reduces the closure size from 1689 MiB to 425 MiB. --- .../networking/mailreaders/thunderbird/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e0bedeb2f045..419cc2fd2d84 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -47,14 +47,17 @@ in stdenv.mkDerivation rec { # from firefox + m4 + wrapperTool nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; - # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540 - # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c patches = [ + # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540 + # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c (fetchpatch { name = "bc651d3d910c.patch"; url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c"; sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g"; }) + + # Remove buildconfig.html to prevent a dependency on clang etc. + ../../browsers/firefox/no-buildconfig.patch ]; configureFlags = @@ -191,6 +194,8 @@ in stdenv.mkDerivation rec { "$out/bin/thunderbird" --version ''; + disallowedRequisites = [ stdenv.cc ]; + meta = with stdenv.lib; { description = "A full-featured e-mail client"; homepage = http://www.mozilla.org/thunderbird/; From 15a190eb27167c1817e0d5154394d0b3d768a56c Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 8 Oct 2018 16:51:37 +0200 Subject: [PATCH 254/992] tinc: 1.0.34 -> 1.0.35, 1.1pre16 -> 1.1pre17 Critical security update (CVE-2018-16737, CVE-2018-16738, CVE-2018-16758) --- pkgs/tools/networking/tinc/default.nix | 4 ++-- pkgs/tools/networking/tinc/pre.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index bf039b653cc6..a17f382557ac 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.34"; + version = "1.0.35"; name = "tinc-${version}"; src = fetchurl { url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0"; + sha256 = "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 09c737c048ae..0cc1fb99455a 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; - version = "1.1pre16"; + version = "1.1pre17"; src = fetchgit { rev = "refs/tags/release-${version}"; url = "git://tinc-vpn.org/tinc"; - sha256 = "03dsm1kxagq8srskzg649xyhbdqbbqxc84pdwrz7yakpa9m6225c"; + sha256 = "12abmx9qglchgn94a1qwgzldf2kaz77p8705ylpggzyncxv6bw2q"; }; outputs = [ "out" "man" "info" ]; From 24320f4a9e398e03374d8dbca95d553850ac2ee4 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 8 Oct 2018 16:28:35 +0200 Subject: [PATCH 255/992] nixos/prometheus-varnish-exporter: avoid crash on restart --- .../modules/services/monitoring/prometheus/exporters/varnish.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix index 8dbf2d735ab9..aaed76175b84 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -69,6 +69,7 @@ in path = [ pkgs.varnish ]; serviceConfig = { DynamicUser = true; + RestartSec = mkDefault 1; ExecStart = '' ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ From fbb7e0c82f297815950e9153c21e561a704bfcd5 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 8 Oct 2018 16:30:53 +0200 Subject: [PATCH 256/992] nixos/prometheus-exporters: fix unapplied service config Prior to this commit, the default values for `Restart`, `PrivateTmp` and `WorkingDirectory` were falsely ignored. I also added myself as maintainer. --- .../monitoring/prometheus/exporters.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 1d5f400250fd..ae8caac436da 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -123,15 +123,13 @@ let systemd.services."prometheus-${name}-exporter" = mkMerge ([{ wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - serviceConfig = { - Restart = mkDefault "always"; - PrivateTmp = mkDefault true; - WorkingDirectory = mkDefault /tmp; - } // mkIf (!(serviceOpts.serviceConfig.DynamicUser or false)) { - User = conf.user; - Group = conf.group; - }; - } serviceOpts ]); + serviceConfig.Restart = mkDefault "always"; + serviceConfig.PrivateTmp = mkDefault true; + serviceConfig.WorkingDirectory = mkDefault /tmp; + } serviceOpts ] ++ optional (serviceOpts.serviceConfig.DynamicUser or false) { + serviceConfig.User = conf.user; + serviceConfig.Group = conf.group; + }); }; in { @@ -172,5 +170,8 @@ in }) exporterOpts) ); - meta.doc = ./exporters.xml; + meta = { + doc = ./exporters.xml; + maintainers = [ maintainers.willibutz ]; + }; } From 0febc64ed1928e163d9747ee1a7d3d1c7c0f9c6d Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 8 Oct 2018 16:38:16 +0200 Subject: [PATCH 257/992] nixos/tests: add test for prometheus exporters --- nixos/release.nix | 1 + nixos/tests/prometheus-exporters.nix | 297 +++++++++++++++++++++++++++ 2 files changed, 298 insertions(+) create mode 100644 nixos/tests/prometheus-exporters.nix diff --git a/nixos/release.nix b/nixos/release.nix index 8016dba09152..858c01d75806 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -390,6 +390,7 @@ in rec { tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {}; tests.printing = callTest tests/printing.nix {}; tests.prometheus = callTest tests/prometheus.nix {}; + tests.prometheus-exporters = callTest tests/prometheus-exporters.nix {}; tests.prosody = callTest tests/prosody.nix {}; tests.proxy = callTest tests/proxy.nix {}; tests.quagga = callTest tests/quagga.nix {}; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix new file mode 100644 index 000000000000..2f2c06dcb7d6 --- /dev/null +++ b/nixos/tests/prometheus-exporters.nix @@ -0,0 +1,297 @@ +import ./make-test.nix ({ lib, pkgs, ... }: +let + escape' = str: lib.replaceChars [''"'' "$" "\n"] [''\\\"'' "\\$" ""] str; + +/* + * The attrset `exporterTests` contains one attribute + * for each exporter test. Each of these attributes + * is expected to be an attrset containing: + * + * `exporterConfig`: + * this attribute set contains config for the exporter itself + * + * `exporterTest` + * this attribute set contains test instructions + * + * `metricProvider` (optional) + * this attribute contains additional machine config + * + * Example: + * exporterTests. = { + * exporterConfig = { + * enable = true; + * }; + * metricProvider = { + * services..enable = true; + * }; + * exporterTest = '' + * waitForUnit("prometheus--exporter.service"); + * waitForOpenPort("1234"); + * succeed("curl -sSf 'localhost:1234/metrics'"); + * ''; + * }; + * + * # this would generate the following test config: + * + * nodes. = { + * services.prometheus. = { + * enable = true; + * }; + * services..enable = true; + * }; + * + * testScript = '' + * $->start(); + * $->waitForUnit("prometheus--exporter.service"); + * $->waitForOpenPort("1234"); + * $->succeed("curl -sSf 'localhost:1234/metrics'"); + * $->shutdown(); + * ''; + */ + + exporterTests = { + + blackbox = { + exporterConfig = { + enable = true; + configFile = pkgs.writeText "config.yml" (builtins.toJSON { + modules.icmp_v6 = { + prober = "icmp"; + icmp.preferred_ip_protocol = "ip6"; + }; + }); + }; + exporterTest = '' + waitForUnit("prometheus-blackbox-exporter.service"); + waitForOpenPort(9115); + succeed("curl -sSf 'http://localhost:9115/probe?target=localhost&module=icmp_v6' | grep -q 'probe_success 1'"); + ''; + }; + + collectd = { + exporterConfig = { + enable = true; + extraFlags = [ "--web.collectd-push-path /collectd" ]; + }; + exporterTest =let postData = escape' '' + [{ + "values":[23], + "dstypes":["gauge"], + "type":"gauge", + "interval":1000, + "host":"testhost", + "plugin":"testplugin", + "time":$(date +%s) + }] + ''; in '' + waitForUnit("prometheus-collectd-exporter.service"); + waitForOpenPort(9103); + succeed("curl -sSfH 'Content-Type: application/json' -X POST --data \"${postData}\" localhost:9103/collectd"); + succeed("curl -sSf localhost:9103/metrics | grep -q 'collectd_testplugin_gauge{instance=\"testhost\"} 23'"); + ''; + }; + + dnsmasq = { + exporterConfig = { + enable = true; + leasesPath = "/var/lib/dnsmasq/dnsmasq.leases"; + }; + metricProvider = { + services.dnsmasq.enable = true; + }; + exporterTest = '' + waitForUnit("prometheus-dnsmasq-exporter.service"); + waitForOpenPort(9153); + succeed("curl -sSf http://localhost:9153/metrics | grep -q 'dnsmasq_leases 0'"); + ''; + }; + + dovecot = { + exporterConfig = { + enable = true; + scopes = [ "global" ]; + socketPath = "/var/run/dovecot2/old-stats"; + user = "root"; # <- don't use user root in production + }; + metricProvider = { + services.dovecot2.enable = true; + }; + exporterTest = '' + waitForUnit("prometheus-dovecot-exporter.service"); + waitForOpenPort(9166); + succeed("curl -sSf http://localhost:9166/metrics | grep -q 'dovecot_up{scope=\"global\"} 1'"); + ''; + }; + + fritzbox = { # TODO add proper test case + exporterConfig = { + enable = true; + }; + exporterTest = '' + waitForUnit("prometheus-fritzbox-exporter.service"); + waitForOpenPort(9133); + succeed("curl -sSf http://localhost:9133/metrics | grep -q 'fritzbox_exporter_collect_errors 0'"); + ''; + }; + + json = { + exporterConfig = { + enable = true; + url = "http://localhost"; + configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON [{ + name = "json_test_metric"; + path = "$.test"; + }]); + }; + metricProvider = { + systemd.services.prometheus-json-exporter.after = [ "nginx.service" ]; + services.nginx = { + enable = true; + virtualHosts.localhost.locations."/".extraConfig = '' + return 200 "{\"test\":1}"; + ''; + }; + }; + exporterTest = '' + waitForUnit("nginx.service"); + waitForOpenPort(80); + waitForUnit("prometheus-json-exporter.service"); + waitForOpenPort(7979); + succeed("curl -sSf localhost:7979/metrics | grep -q 'json_test_metric 1'"); + ''; + }; + + nginx = { + exporterConfig = { + enable = true; + }; + metricProvider = { + services.nginx = { + enable = true; + statusPage = true; + virtualHosts."/".extraConfig = "return 204;"; + }; + }; + exporterTest = '' + waitForUnit("nginx.service") + waitForUnit("prometheus-nginx-exporter.service") + waitForOpenPort(9113) + succeed("curl -sSf http://localhost:9113/metrics | grep -q 'nginx_up 1'") + ''; + }; + + node = { + exporterConfig = { + enable = true; + }; + exporterTest = '' + waitForUnit("prometheus-node-exporter.service"); + waitForOpenPort(9100); + succeed("curl -sSf http://localhost:9100/metrics | grep -q 'node_exporter_build_info{.\\+} 1'"); + ''; + }; + + postfix = { + exporterConfig = { + enable = true; + }; + metricProvider = { + services.postfix.enable = true; + }; + exporterTest = '' + waitForUnit("prometheus-postfix-exporter.service"); + waitForOpenPort(9154); + succeed("curl -sSf http://localhost:9154/metrics | grep -q 'postfix_smtpd_connects_total 0'"); + ''; + }; + + snmp = { + exporterConfig = { + enable = true; + configuration.default = { + version = 2; + auth.community = "public"; + }; + }; + exporterTest = '' + waitForUnit("prometheus-snmp-exporter.service"); + waitForOpenPort(9116); + succeed("curl -sSf localhost:9116/metrics | grep -q 'snmp_request_errors_total 0'"); + ''; + }; + + surfboard = { + exporterConfig = { + enable = true; + modemAddress = "localhost"; + }; + metricProvider = { + systemd.services.prometheus-surfboard-exporter.after = [ "nginx.service" ]; + services.nginx = { + enable = true; + virtualHosts.localhost.locations."/cgi-bin/status".extraConfig = '' + return 204; + ''; + }; + }; + exporterTest = '' + waitForUnit("nginx.service"); + waitForOpenPort(80); + waitForUnit("prometheus-surfboard-exporter.service"); + waitForOpenPort(9239); + succeed("curl -sSf localhost:9239/metrics | grep -q 'surfboard_up 1'"); + ''; + }; + + varnish = { + exporterConfig = { + enable = true; + instance = "/var/spool/varnish/varnish"; + group = "varnish"; + }; + metricProvider = { + systemd.services.prometheus-varnish-exporter.after = [ + "varnish.service" + ]; + services.varnish = { + enable = true; + config = '' + vcl 4.0; + backend default { + .host = "127.0.0.1"; + .port = "80"; + } + ''; + }; + }; + exporterTest = '' + waitForUnit("prometheus-varnish-exporter.service"); + waitForOpenPort(9131); + succeed("curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'"); + ''; + }; + }; + + nodes = lib.mapAttrs (exporter: testConfig: lib.mkMerge [{ + services.prometheus.exporters.${exporter} = testConfig.exporterConfig; + } testConfig.metricProvider or {}]) exporterTests; + + testScript = lib.concatStrings (lib.mapAttrsToList (exporter: testConfig: ('' + subtest "${exporter}", sub { + ${"$"+exporter}->start(); + ${lib.concatStringsSep " " (map (line: '' + ${"$"+exporter}->${line}; + '') (lib.splitString "\n" (lib.removeSuffix "\n" testConfig.exporterTest)))} + ${"$"+exporter}->shutdown(); + }; + '')) exporterTests); +in +{ + name = "prometheus-exporters"; + + inherit nodes testScript; + + meta = with lib.maintainers; { + maintainers = [ willibutz ]; + }; +}) From ee56a8bba52366a3f3572eeba3e7dc2e2242fe6e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 8 Oct 2018 10:33:36 -0500 Subject: [PATCH 258/992] gnuplot: 5.2.4 -> 5.2.5 http://www.gnuplot.info/ReleaseNotes_5_2_5.html --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f2be9fafc605..8de7ca3262cf 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -19,11 +19,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.4"; + name = "gnuplot-5.2.5"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1jvh8xmd2cvrhlsg88kxwh55wkwx31sg50v1n59slfippl0g058m"; + sha256 = "1ajw8xcb1kg2vy8n3rhrz71knjr2yivfavv9lqqzvp1dwv6b5783"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; From 9cc18fa7f969e7671a34cf85e6296be9e9823f63 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 8 Oct 2018 18:02:13 +0200 Subject: [PATCH 259/992] debian vm tools: use snapshot.debian.org snapshot.debian.org actually keeps track of all of the updates as they come in rather than doing arbitrary (?) snapshots. --- pkgs/build-support/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 03b3fb1f9f27..7880d98e6b6a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -990,7 +990,7 @@ rec { name = "debian-9.4-stretch-i386"; fullName = "Debian 9.4 Stretch (i386)"; packagesList = fetchurl { - url = https://web.archive.org/web/20180912163509/http://ftp.debian.org/debian/dists/stretch/main/binary-i386/Packages.xz; + url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-i386/Packages.xz; sha256 = "0flvn8zn7vk04p10ndf3aq0mdr8k2ic01g51aq4lsllkv8lmwzyh"; }; urlPrefix = mirror://debian; @@ -1001,7 +1001,7 @@ rec { name = "debian-9.4-stretch-amd64"; fullName = "Debian 9.4 Stretch (amd64)"; packagesList = fetchurl { - url = https://web.archive.org/web/20180912163152/http://ftp.debian.org/debian/dists/stretch/main/binary-amd64/Packages.xz; + url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-amd64/Packages.xz; sha256 = "11vnn9bba2jabixvabfbw9zparl326c88xn99di7pbr5xsnl15jm"; }; urlPrefix = mirror://debian; From 7b9c4954f2edc116a8052be28674c22a4c40adcf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 18:05:27 +0200 Subject: [PATCH 260/992] git: Strip libsecret This reduces gitFull's closure size from 412 MiB to 271 MiB. --- .../version-management/git-and-tools/git/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 368e2b68d0d1..b946d0b7daaf 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -303,6 +303,8 @@ EOF disable_test t0028-working-tree-encoding ''; + stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ]; + meta = { homepage = https://git-scm.com/; From 8abfa4084b5e9b81710e2a0a0d40c08a1531f4e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 17:28:45 +0200 Subject: [PATCH 261/992] geeqie: Reduce closure size This reduces the closure size from 568 MiB to 289 MiB. --- pkgs/development/libraries/clutter-gtk/default.nix | 2 ++ pkgs/development/libraries/clutter/default.nix | 2 ++ pkgs/development/libraries/cogl/default.nix | 2 ++ pkgs/development/libraries/libchamplain/default.nix | 2 ++ 4 files changed, 8 insertions(+) diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index afeb7064ffea..6c8951165313 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; }; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ clutter gtk3 ]; nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 97db6880c5f0..090f85554b66 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ gtk3 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 3f81c39a9b22..f35335e4be7b 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -31,6 +31,8 @@ in stdenv.mkDerivation rec { }) ]; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig libintl ]; configureFlags = [ diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 677910328458..95b1ad074b05 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ]; From 467bec34bb24d59c1178247935d92ac3195bac78 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 7 Oct 2018 20:08:03 -0400 Subject: [PATCH 262/992] nixos/doc: Actually fix partitioning instructions. The previous tentative to the fix got the order mixed up a bit. This new fix has been re-verified to get them in the good order as per the instructions in the following chapters. --- nixos/doc/manual/installation/installing.xml | 54 ++++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 2b68def95b70..8e94f946c5ee 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -115,10 +115,17 @@ - Add a swap partition. The size required will vary - according to needs, here a 8GiB one is created. The space left in front - (512MiB) will be used by the boot partition. -# parted /dev/sda -- mkpart primary linux-swap 512MiB 8.5GiB + Add the root partition. This will fill the disk + except for the end part, where the swap will live, and the space left in + front (512MiB) which will be used by the boot partition. +# parted /dev/sda -- mkpart primary 512MiB -8GiB + + + + + Next, add a swap partition. The size required will + vary according to needs, here a 8GiB one is created. +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% The swap partition size rules are no different than for other Linux @@ -127,20 +134,13 @@ - - - Next, add the root partition. This will fill the - remainder ending part of the disk. -# parted /dev/sda -- mkpart primary 8.5GiB -1MiB - - Finally, the boot partition. NixOS by default uses the ESP (EFI system partition) as its /boot partition. It uses the initially reserved 512MiB at the start of the disk. -# parted /dev/sda -- mkpart ESP fat32 1M 512MiB +# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB # parted /dev/sda -- set 3 boot on @@ -177,9 +177,16 @@ - Add a swap partition. The size required will vary - according to needs, here a 8GiB one is created. -# parted /dev/sda -- mkpart primary linux-swap 1M 8GiB + Add the root partition. This will fill the the disk + except for the end part, where the swap will live. +# parted /dev/sda -- mkpart primary 1MiB -8GiB + + + + + Finally, add a swap partition. The size required + will vary according to needs, here a 8GiB one is created. +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% The swap partition size rules are no different than for other Linux @@ -188,13 +195,6 @@ - - - Finally, add the root partition. This will fill the - remainder of the disk. -# parted /dev/sda -- mkpart primary 8GiB -1s - - @@ -486,17 +486,17 @@ $ nix-env -i w3m Example partition schemes for NixOS on <filename>/dev/sda</filename> (MBR) # parted /dev/sda -- mklabel msdos -# parted /dev/sda -- mkpart primary linux-swap 1M 8GiB -# parted /dev/sda -- mkpart primary 8GiB -1s +# parted /dev/sda -- mkpart primary 1MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% Example partition schemes for NixOS on <filename>/dev/sda</filename> (UEFI) # parted /dev/sda -- mklabel gpt -# parted /dev/sda -- mkpart primary linux-swap 512MiB 8.5GiB -# parted /dev/sda -- mkpart primary 8.5GiB -1MiB -# parted /dev/sda -- mkpart ESP fat32 1M 512MiB +# parted /dev/sda -- mkpart primary 512MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB # parted /dev/sda -- set 3 boot on From 6ec4ebf6f87fdfc221103f41a0353aa7c0a21684 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2018 11:25:23 +0200 Subject: [PATCH 263/992] LTS Haskell 12.12 --- .../configuration-hackage2nix.yaml | 105 +++++++++--------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index aee9b8df8fa3..f68270ba772e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -45,7 +45,7 @@ default-package-overrides: - base-compat-batteries ==0.10.1 # Newer versions don't work in LTS-12.x - cassava-megaparsec < 2 - # LTS Haskell 12.11 + # LTS Haskell 12.12 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -80,6 +80,7 @@ default-package-overrides: - alex ==3.2.4 - alg ==0.2.7.0 - algebra ==4.3.1 + - algebraic-graphs ==0.2 - Allure ==0.8.3.0 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 @@ -187,7 +188,7 @@ default-package-overrides: - apply-refact ==0.5.0.0 - apportionment ==0.0.0.3 - approximate ==0.3.1 - - app-settings ==0.2.0.11 + - app-settings ==0.2.0.12 - arithmoi ==0.7.0.0 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 @@ -219,12 +220,12 @@ default-package-overrides: - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - - autoexporter ==1.1.11 + - autoexporter ==1.1.13 - auto-update ==0.1.4 - avro ==0.3.5.1 - avwx ==0.3.0.2 - backprop ==0.2.5.0 - - bank-holidays-england ==0.1.0.7 + - bank-holidays-england ==0.1.0.8 - barrier ==0.1.1 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 @@ -314,7 +315,7 @@ default-package-overrides: - btrfs ==0.1.2.3 - buffer-builder ==0.2.4.6 - buffer-pipe ==0.0 - - butcher ==1.3.1.1 + - butcher ==1.3.2.0 - butter ==0.1.0.6 - bv ==0.5 - bv-little ==0.1.2 @@ -399,7 +400,7 @@ default-package-overrides: - clock ==0.7.2 - clock-extras ==0.1.0.2 - closed ==0.2.0 - - clr-host ==0.2.0.1 + - clr-host ==0.2.1.0 - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.0 - ClustalParser ==1.2.3 @@ -460,7 +461,7 @@ default-package-overrides: - contravariant ==1.4.1 - contravariant-extras ==0.3.4 - control-bool ==0.2.1 - - control-monad-free ==0.6.1 + - control-monad-free ==0.6.2 - control-monad-omega ==0.3.1 - convertible ==1.1.1.0 - cookie ==0.4.4 @@ -568,7 +569,7 @@ default-package-overrides: - dependent-sum-template ==0.0.0.6 - deque ==0.2.1 - deriving-compat ==0.5.2 - - derulo ==1.0.3 + - derulo ==1.0.5 - detour-via-sci ==1.0.0 - df1 ==0.1.1 - dhall ==1.15.1 @@ -616,7 +617,7 @@ default-package-overrides: - doctemplates ==0.2.2.1 - doctest ==0.16.0.1 - doctest-discover ==0.1.0.9 - - doctest-driver-gen ==0.2.0.3 + - doctest-driver-gen ==0.2.0.4 - do-list ==1.0.1 - dom-parser ==3.1.0 - dotenv ==0.5.2.5 @@ -729,8 +730,8 @@ default-package-overrides: - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 - - fin ==0.0.1 - Fin ==0.2.6.0 + - fin ==0.0.1 - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - fingertree ==0.1.4.1 @@ -746,16 +747,16 @@ default-package-overrides: - flay ==0.4 - flexible-defaults ==0.0.2 - floatshow ==0.2.4 - - flow ==1.0.15 + - flow ==1.0.17 - fmlist ==0.9.2 - fn ==0.3.0.2 - focus ==0.1.5.2 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.8 - - fold-debounce-conduit ==0.2.0.2 - - foldl ==1.4.4 + - fold-debounce-conduit ==0.2.0.3 + - foldl ==1.4.5 - folds ==0.7.4 - - FontyFruity ==0.5.3.3 + - FontyFruity ==0.5.3.4 - force-layout ==0.4.0.6 - foreign-store ==0.2 - ForestStructures ==0.0.0.2 @@ -802,15 +803,15 @@ default-package-overrides: - genvalidity ==0.5.1.0 - genvalidity-aeson ==0.2.0.2 - genvalidity-bytestring ==0.2.0.2 - - genvalidity-containers ==0.5.0.0 - - genvalidity-hspec ==0.6.1.1 + - genvalidity-containers ==0.5.1.0 + - genvalidity-hspec ==0.6.2.0 - genvalidity-hspec-aeson ==0.3.0.0 - genvalidity-hspec-binary ==0.2.0.2 - genvalidity-hspec-cereal ==0.2.0.2 - genvalidity-hspec-hashable ==0.2.0.2 - genvalidity-path ==0.3.0.2 - - genvalidity-property ==0.2.1.0 - - genvalidity-scientific ==0.2.0.1 + - genvalidity-property ==0.2.1.1 + - genvalidity-scientific ==0.2.1.0 - genvalidity-text ==0.5.1.0 - genvalidity-time ==0.2.1.0 - genvalidity-unordered-containers ==0.2.0.3 @@ -874,9 +875,9 @@ default-package-overrides: - graph-wrapper ==0.2.5.1 - gravatar ==0.8.0 - graylog ==0.1.0.1 - - greskell ==0.2.1.0 - - greskell-core ==0.1.2.3 - - greskell-websocket ==0.1.1.1 + - greskell ==0.2.1.1 + - greskell-core ==0.1.2.4 + - greskell-websocket ==0.1.1.2 - groom ==0.1.2.1 - groups ==0.4.1.0 - gtk ==0.14.10 @@ -962,11 +963,11 @@ default-package-overrides: - hidden-char ==0.1.0.2 - hierarchical-clustering ==0.4.6 - hierarchy ==1.0.2 - - higher-leveldb ==0.5.0.1 + - higher-leveldb ==0.5.0.2 - highlighting-kate ==0.6.4 - hinotify ==0.3.10 - hint ==0.8.0 - - histogram-fill ==0.9.0.0 + - histogram-fill ==0.9.1.0 - hjsmin ==0.2.0.2 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.7.0 @@ -980,7 +981,7 @@ default-package-overrides: - hmpfr ==0.4.4 - Hoed ==0.5.1 - hoopl ==3.10.2.2 - - hOpenPGP ==2.7.2 + - hOpenPGP ==2.7.3 - hopenpgp-tools ==0.21.2 - hopfli ==0.2.2.1 - hostname ==1.0 @@ -1004,7 +1005,7 @@ default-package-overrides: - hsemail ==2 - HSet ==0.0.1 - hset ==2.2.0 - - hsexif ==0.6.1.5 + - hsexif ==0.6.1.6 - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 - hsini ==0.5.1.2 @@ -1058,7 +1059,7 @@ default-package-overrides: - http-date ==0.0.8 - httpd-shed ==0.4.0.3 - http-link-header ==1.0.3.1 - - http-media ==0.7.1.2 + - http-media ==0.7.1.3 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.6.1 - http-types ==0.12.2 @@ -1070,7 +1071,7 @@ default-package-overrides: - hvega ==0.1.0.3 - hw-balancedparens ==0.2.0.2 - hw-bits ==0.7.0.3 - - hw-conduit ==0.2.0.3 + - hw-conduit ==0.2.0.5 - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 - hw-excess ==0.2.0.2 @@ -1117,10 +1118,10 @@ default-package-overrides: - immortal ==0.3 - include-file ==0.1.0.3 - incremental-parser ==0.3.1.1 - - indentation-core ==0.0.0.1 - - indentation-parsec ==0.0.0.1 + - indentation-core ==0.0.0.2 + - indentation-parsec ==0.0.0.2 - indents ==0.5.0.0 - - indexed-list-literals ==0.2.1.1 + - indexed-list-literals ==0.2.1.2 - inflections ==0.4.0.3 - influxdb ==1.6.0.9 - ini ==0.3.6 @@ -1153,7 +1154,7 @@ default-package-overrides: - ip ==1.3.0 - ip6addr ==1.0.0 - iproute ==1.7.5 - - IPv6Addr ==1.1.0 + - IPv6Addr ==1.1.1 - IPv6DB ==0.3.1 - ipython-kernel ==0.9.1.0 - irc ==0.6.1.0 @@ -1166,7 +1167,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - iterable ==3.0 - - ixset-typed ==0.4 + - ixset-typed ==0.4.0.1 - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jmacro ==0.6.15 @@ -1273,7 +1274,7 @@ default-package-overrides: - log-domain ==0.12 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.3.2 + - logging-effect ==1.3.3 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.6.0.2 @@ -1318,7 +1319,7 @@ default-package-overrides: - med-module ==0.1.1 - megaparsec ==6.5.0 - mega-sdist ==0.3.3.1 - - memory ==0.14.16 + - memory ==0.14.18 - MemoTrie ==0.6.9 - mercury-api ==0.1.0.1 - mersenne-random-pure64 ==0.2.2.0 @@ -1329,7 +1330,7 @@ default-package-overrides: - microformats2-parser ==1.0.1.9 - microlens ==0.4.9.1 - microlens-aeson ==2.3.0 - - microlens-contra ==0.1.0.1 + - microlens-contra ==0.1.0.2 - microlens-ghc ==0.4.9.1 - microlens-mtl ==0.1.11.1 - microlens-platform ==0.3.10 @@ -1392,7 +1393,7 @@ default-package-overrides: - mongoDB ==2.4.0.0 - monoidal-containers ==0.3.1.0 - monoid-extras ==0.5 - - monoid-subclasses ==0.4.6 + - monoid-subclasses ==0.4.6.1 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.9.0 - mono-traversable-instances ==0.1.0.0 @@ -1405,9 +1406,9 @@ default-package-overrides: - multiarg ==0.30.0.10 - multimap ==1.2.1 - multipart ==0.1.3 - - multistate ==0.8.0.0 + - multistate ==0.8.0.1 - murmur-hash ==0.1.0.9 - - MusicBrainz ==0.4 + - MusicBrainz ==0.4.1 - mustache ==2.3.0 - mutable-containers ==0.3.4 - mwc-probability ==2.0.4 @@ -1476,12 +1477,12 @@ default-package-overrides: - numhask-test ==0.1.0.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 - - nvim-hs ==1.0.0.2 + - nvim-hs ==1.0.0.3 - nvim-hs-contrib ==1.0.0.0 - oauthenticated ==0.2.1.0 - objective ==1.1.2 - ObjectName ==1.1.0.1 - - o-clock ==1.0.0 + - o-clock ==1.0.0.1 - odbc ==0.2.2 - oeis ==0.3.9 - ofx ==0.4.2.0 @@ -1509,7 +1510,7 @@ default-package-overrides: - opml-conduit ==0.6.0.4 - optional-args ==1.0.2 - options ==1.2.1.1 - - optparse-applicative ==0.14.2.0 + - optparse-applicative ==0.14.3.0 - optparse-generic ==1.3.0 - optparse-simple ==0.1.0 - optparse-text ==0.1.1.0 @@ -1737,12 +1738,13 @@ default-package-overrides: - relational-schemas ==0.1.6.2 - relude ==0.1.1 - renderable ==0.2.0.1 - - repa ==3.4.1.3 + - repa ==3.4.1.4 - repline ==0.1.7.0 - req ==1.1.0 - req-conduit ==1.0.0 - require ==0.2.1 - req-url-extra ==0.1.0.0 + - reroute ==0.5.0.0 - resolv ==0.1.1.1 - resource-pool ==0.2.3.2 - resourcet ==1.2.1 @@ -1774,7 +1776,7 @@ default-package-overrides: - safe-money ==0.6 - SafeSemaphore ==0.10.1 - saltine ==0.1.0.1 - - salve ==1.0.4 + - salve ==1.0.6 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.3 @@ -1913,6 +1915,8 @@ default-package-overrides: - splice ==0.6.1.1 - split ==0.2.3.3 - splitmix ==0.0.1 + - Spock ==0.13.0.0 + - Spock-core ==0.13.0.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlite-simple ==0.4.16.0 @@ -1950,7 +1954,7 @@ default-package-overrides: - store-core ==0.4.4 - Strafunski-StrategyLib ==5.0.1.0 - stratosphere ==0.24.4 - - streaming ==0.2.1.0 + - streaming ==0.2.2.0 - streaming-attoparsec ==1.0.0 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.0 @@ -1972,7 +1976,6 @@ default-package-overrides: - strive ==5.0.6 - structs ==0.1.1 - stylish-haskell ==0.9.2.0 - - summoner ==1.0.6 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 @@ -2119,7 +2122,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.11 + - turtle ==1.5.12 - TypeCompose ==0.9.13 - typed-process ==0.2.3.0 - type-fun ==0.1.1 @@ -2127,7 +2130,7 @@ default-package-overrides: - type-level-integers ==0.0.1 - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - - typelits-witnesses ==0.3.0.2 + - typelits-witnesses ==0.3.0.3 - typenums ==0.1.2 - type-of-html ==1.4.0.1 - type-of-html-static ==0.1.0.2 @@ -2201,7 +2204,7 @@ default-package-overrides: - vec ==0.1 - vector ==0.12.0.1 - vector-algorithms ==0.7.0.4 - - vector-binary-instances ==0.2.4 + - vector-binary-instances ==0.2.5 - vector-buffer ==0.4.1 - vector-builder ==0.3.6 - vector-bytes-instances ==0.1.1 @@ -2264,8 +2267,8 @@ default-package-overrides: - weigh ==0.0.12 - wide-word ==0.1.0.6 - wikicfp-scraper ==0.1.0.9 - - wild-bind ==0.1.2.2 - - wild-bind-x11 ==0.2.0.5 + - wild-bind ==0.1.2.3 + - wild-bind-x11 ==0.2.0.6 - Win32-notify ==0.3.0.3 - wire-streams ==0.1.1.0 - withdependencies ==0.2.4.2 @@ -2333,7 +2336,7 @@ default-package-overrides: - yesod ==1.6.0 - yesod-alerts ==0.1.2.0 - yesod-auth ==1.6.4.1 - - yesod-auth-fb ==1.9.0 + - yesod-auth-fb ==1.9.1 - yesod-auth-hashdb ==1.7 - yesod-bin ==1.6.0.3 - yesod-core ==1.6.6 From 478eff0225383d88b4f30b583f81377c2bbb64a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Oct 2018 02:31:17 +0200 Subject: [PATCH 264/992] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.11.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/23ec1f32c66bdb679d0f5b8c6e8727611bff6629. --- .../haskell-modules/hackage-packages.nix | 1700 ++++++++++------- 1 file changed, 975 insertions(+), 725 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b160174cf5eb..352d97d497ab 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5575,22 +5575,6 @@ self: { }) {}; "FontyFruity" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , directory, filepath, text, vector, xml - }: - mkDerivation { - pname = "FontyFruity"; - version = "0.5.3.3"; - sha256 = "0p02w0v93y11f7rzsc1im2rvld6h0pgrhmd827ypzamibry6xl5h"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq directory filepath text - vector xml - ]; - description = "A true type file format loader"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "FontyFruity_0_5_3_4" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , directory, filepath, text, vector, xml }: @@ -5604,7 +5588,6 @@ self: { ]; description = "A true type file format loader"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ForSyDe" = callPackage @@ -5820,8 +5803,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.5.0"; - sha256 = "0dd2gqgxjhy23a9xhz62gzashjqmcv34gkcys4wz9l6y2fk1a5xl"; + version = "0.6.0"; + sha256 = "0ri1x80za9gjcv44xk9kgx5w5jczr2p26jlpwhmn1sgmjdyc2m02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -5865,6 +5848,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Frames-dsv" = callPackage + ({ mkDerivation, base, bytestring, Frames, hspec, hw-dsv, pipes + , template-haskell, text, vector, vinyl + }: + mkDerivation { + pname = "Frames-dsv"; + version = "0.1.1"; + sha256 = "0932k8aqn9c08ijbs29g04gcka441gg424g90cqd4ky9b3yxzm7w"; + libraryHaskellDepends = [ + base bytestring Frames hw-dsv pipes template-haskell text vector + vinyl + ]; + testHaskellDepends = [ base Frames hspec pipes ]; + description = "Alternative CSV parser for the Frames package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Frank" = callPackage ({ mkDerivation, base, mtl, newtype, she, void }: mkDerivation { @@ -10205,8 +10205,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "1.1.0"; - sha256 = "0f7dckgiv5yq87gb7fd31k0h4adqi6xmdc010rdb6yfgpbk10k29"; + version = "1.1.1"; + sha256 = "0l2yfn46xyv0ib30k0kmhw3vl4vfmziqinhbynpi4yrmy6lmj29v"; libraryHaskellDepends = [ aeson attoparsec base iproute network network-info random text ]; @@ -10754,8 +10754,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "1"; - editedCabalFile = "1snx05qpllybd9yvy03p0lpnmimj0m24x1bxa4svxcsiv56yv9w8"; + revision = "2"; + editedCabalFile = "0pp67ygrd3m6q8ry5229m1b2rhy401gb74368h09bqc6wa3g7ygv"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -12723,8 +12723,8 @@ self: { }: mkDerivation { pname = "MusicBrainz"; - version = "0.4"; - sha256 = "0aanc1c43di5wq9c2w0b5lw3p24cwpaksgxy79lqm8qxj8qd3jxr"; + version = "0.4.1"; + sha256 = "0mydq3bjf15ksfrh4lf947ka43i3978q58y2aij3aqd763v2jb16"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra HTTP http-conduit http-types monad-control resourcet text time time-locale-compat @@ -19976,8 +19976,8 @@ self: { }: mkDerivation { pname = "accelerate"; - version = "1.2.0.0"; - sha256 = "0y8wx09smrcxkyyklrf4lrilqasbmaw1w1ga9y110bqgywkw4pmj"; + version = "1.2.0.1"; + sha256 = "0vglmasqgq0h8fvm9z8l2b3sygqvix8vr6c3n357gkr2mpz6gq8h"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base base-orphans bytestring @@ -20272,6 +20272,8 @@ self: { pname = "accelerate-io"; version = "1.2.0.0"; sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf"; + revision = "1"; + editedCabalFile = "0n1bch7rb2pvfqajjzaxrlw06f7vr583ckvn2ldr6lv59w1jrk3l"; libraryHaskellDepends = [ accelerate array base bmp bytestring primitive repa vector ]; @@ -21031,6 +21033,8 @@ self: { pname = "acme-stringly-typed"; version = "1.0.0.0"; sha256 = "18wvsvdmbwh9dcawiy4f9pn4vg98kdq9zxc37sz7dpmaigimw16f"; + revision = "1"; + editedCabalFile = "0i5hark97zl45iyiijxj07d2pg112kh3jcmjmscpbss5l5n02h23"; libraryHaskellDepends = [ base ]; description = "Stringly Typed Programming"; license = stdenv.lib.licenses.bsd3; @@ -26999,8 +27003,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "6.0.3"; - sha256 = "0w50dw9fig4fhk40fjgj1hggs1jbw0yhdrzinmwr2a8lg3nxx5z6"; + version = "6.1.1"; + sha256 = "1scshv7whw3ylp9nq8zgz12rbkvwq6hmcwn04s8h7ygnb9k3zy21"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -27016,8 +27020,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "6.0.3"; - sha256 = "001qywhyk013148g4cjw5xkr6b006zvn9f18m98mj5wg6wm1yxzc"; + version = "6.1.1"; + sha256 = "14nvb786w4cqam3nd3wjfr7m0ysbr07vjm0ivwsxyvda3mwkn7pz"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -27032,8 +27036,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "6.0.3"; - sha256 = "1zrp7dp86vgcj215ykwagjwpqnz137qbi1czhasxq3bby6rmkvca"; + version = "6.1.1"; + sha256 = "0vmqyhxwfs45x3cqrlm1nij0cfnw2bk6sq3ldq6vrfpzm892g6py"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring generic-lens http-client lens monad-logger mtl resourcet transformers unliftio-core @@ -27053,8 +27057,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.0.3"; - sha256 = "1s4x1y88zzac8i5p2yg28q91lknh4cxm72fsxqbpdwq43p1iynb0"; + version = "6.1.1"; + sha256 = "1kjsqka70bnkjzgdi427jqihlnm997ii147nzj8w04w5d6ynm2ly"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -27074,8 +27078,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "6.0.3"; - sha256 = "1mvg36wbj5knqrzmrvh9pn7aw1a22pcv1j8dafvg9qzm6wkr2liw"; + version = "6.1.1"; + sha256 = "0nklh0wi1y6drpm7i4ssjc8xx4b20knpnghn2yv839ph6w0f0r13"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -27091,24 +27095,26 @@ self: { }) {}; "antiope-s3" = callPackage - ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base - , bytestring, conduit, conduit-extra, exceptions, generic-lens - , http-types, lens, monad-logger, network-uri, resourcet, text + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core + , base, bytestring, conduit, conduit-extra, exceptions + , generic-lens, hedgehog, hspec, http-types, hw-hspec-hedgehog + , lens, monad-logger, mtl, network-uri, resourcet, text , unliftio-core }: mkDerivation { pname = "antiope-s3"; - version = "6.0.3"; - sha256 = "17ffjl3myk0575cds8z49rv9nkc72yvx37ka5l4r43p8faj82q2m"; + version = "6.1.1"; + sha256 = "0aq0qk377wvxm3kgy63zk382rnvjxx8csxj63vnmc5gikz5i2ya7"; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 base bytestring conduit - conduit-extra exceptions generic-lens http-types lens monad-logger - network-uri resourcet text unliftio-core + amazonka amazonka-core amazonka-s3 antiope-core base bytestring + conduit conduit-extra exceptions generic-lens http-types lens + monad-logger mtl network-uri resourcet text unliftio-core ]; testHaskellDepends = [ - amazonka amazonka-core amazonka-s3 base bytestring conduit - conduit-extra exceptions generic-lens http-types lens monad-logger - network-uri resourcet text unliftio-core + amazonka amazonka-core amazonka-s3 antiope-core base bytestring + conduit conduit-extra exceptions generic-lens hedgehog hspec + http-types hw-hspec-hedgehog lens monad-logger mtl network-uri + resourcet text unliftio-core ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -27120,8 +27126,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "6.0.3"; - sha256 = "1zxwhlaypk0pykrg39zi1zlz7zs0dha4ri3b6cb0qdbprcwbfvvx"; + version = "6.1.1"; + sha256 = "0jdlm3sl7w5cq2hpikm73763np56g16z48b34wavg9yblrdfvvn7"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens text unliftio-core @@ -27141,8 +27147,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "6.0.3"; - sha256 = "0clljlvbz6irxpfjrzhc541991r9spsw8aj5mblb666llc34nbax"; + version = "6.1.1"; + sha256 = "189wgl3qpmf4amgc571zv88zpdblaqcbcnw93a6lk6i7rzc6h40r"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base generic-lens lens lens-aeson @@ -27843,24 +27849,6 @@ self: { }) {}; "app-settings" = callPackage - ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl - , parsec, text - }: - mkDerivation { - pname = "app-settings"; - version = "0.2.0.11"; - sha256 = "1cahrpf42g5ids4k6hlzys1kmbgy1ypgax9ljckwymafradcc53a"; - libraryHaskellDepends = [ - base containers directory mtl parsec text - ]; - testHaskellDepends = [ - base containers directory hspec HUnit mtl parsec text - ]; - description = "A library to manage application settings (INI file-like)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "app-settings_0_2_0_12" = callPackage ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl , parsec, text }: @@ -27876,7 +27864,6 @@ self: { ]; description = "A library to manage application settings (INI file-like)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "appar" = callPackage @@ -31031,8 +31018,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.11"; - sha256 = "17d1a2fns4b3gw8cggg9yq1fxvkyr859s3y22i9lviz6x7hd8dvn"; + version = "1.1.13"; + sha256 = "05mgvif7wiq0vplk92kp8qn4a5wfma1gwdihqlz5lspmczszpdkv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -31207,8 +31194,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "25"; - editedCabalFile = "11igp1sw7snsjcrw865rrcp1k14828yj5z9q9kdmn09f0hdl57rb"; + revision = "28"; + editedCabalFile = "1x653r0x4frpp78jncvr91kc7g41i9c3s561cizyh518318lvsnr"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -32682,18 +32669,6 @@ self: { }) {}; "bank-holidays-england" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; - version = "0.1.0.7"; - sha256 = "196ldac7aljysw8m4nzdyf5mygswbckkvd6axm8a9yw4vchzcjks"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_1_0_8" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; @@ -32703,7 +32678,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "banwords" = callPackage @@ -39635,6 +39609,8 @@ self: { pname = "btrfs"; version = "0.1.2.3"; sha256 = "13dq5xdzny1c0yih67r3yhnsr9vxxim8kbqbj5hcygb2cmf0pz3y"; + revision = "1"; + editedCabalFile = "1py88k9sjmx9x41l0wmp19a52ng9fdf66rmd0n9404gxxbqd5jxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring time unix ]; @@ -40149,10 +40125,10 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.3.1.1"; - sha256 = "1llhsqg8m4f7am14kvw4psm5fb8kcph27mk059vg2mq65xns470z"; - revision = "2"; - editedCabalFile = "0r600p7pd4l4p75igklwfqqxp2jyl2ghqc3y6jhn473rrw31g36m"; + version = "1.3.2.0"; + sha256 = "06pas8iq0qvvraidjid9m85z7wx8cy017xhyqralxz67alirmchc"; + revision = "1"; + editedCabalFile = "1r4v2biwd0hp6v1jgx7zngh0hqlsk8ia3bvggbxxn5sp5x7ika1m"; libraryHaskellDepends = [ base bifunctors containers deque extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -40165,6 +40141,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "butcher_1_3_2_1" = callPackage + ({ mkDerivation, base, bifunctors, containers, deque, extra, free + , hspec, microlens, microlens-th, mtl, multistate, pretty + , transformers, unsafe, void + }: + mkDerivation { + pname = "butcher"; + version = "1.3.2.1"; + sha256 = "16jwhj3lrghn11igc5ci484r4xc1ii6hz6ysj39njds547dmznda"; + libraryHaskellDepends = [ + base bifunctors containers deque extra free microlens microlens-th + mtl multistate pretty transformers unsafe void + ]; + testHaskellDepends = [ + base containers deque extra free hspec microlens microlens-th mtl + multistate pretty transformers unsafe + ]; + description = "Chops a command or program invocation into digestable pieces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "butter" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , forkable-monad, free, HUnit, network-simple, stm @@ -46847,6 +46845,8 @@ self: { pname = "classy-prelude"; version = "1.4.0"; sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb"; + revision = "1"; + editedCabalFile = "1gf615lz0bfsn09vrjgj63d8zcpsmz1cgvdv8px3h0b4jrwdij6v"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist ghc-prim hashable mono-traversable @@ -47780,26 +47780,6 @@ self: { }) {}; "clr-host" = callPackage - ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory - , file-embed, filepath, glib, mono, text, transformers - }: - mkDerivation { - pname = "clr-host"; - version = "0.2.0.1"; - sha256 = "15hfdwddqij5dhl8qbq89rsbjvxpymvph8wz2naxa8mrd09yl1jk"; - setupHaskellDepends = [ - base Cabal directory filepath transformers - ]; - libraryHaskellDepends = [ - base bytestring clr-marshal file-embed text - ]; - librarySystemDepends = [ glib mono ]; - testHaskellDepends = [ base ]; - description = "Hosting the Common Language Runtime"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) glib; inherit (pkgs) mono;}; - - "clr-host_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory , file-embed, filepath, glib, mono, text, transformers }: @@ -47817,7 +47797,6 @@ self: { testHaskellDepends = [ base ]; description = "Hosting the Common Language Runtime"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) mono;}; "clr-inline" = callPackage @@ -49159,6 +49138,8 @@ self: { pname = "colour-accelerate"; version = "0.3.0.0"; sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz"; + revision = "1"; + editedCabalFile = "1mbz9wdx396q8gdy6yqsc5vsxrkky9zkxczjblvc9zy542v252cn"; libraryHaskellDepends = [ accelerate base ]; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -50530,8 +50511,8 @@ self: { }: mkDerivation { pname = "concraft"; - version = "0.12.1"; - sha256 = "1zjrv58fl4lkknmmih0dwi9ds241mxi42q3fxlpd8z5hlgq9pxpj"; + version = "0.13.0"; + sha256 = "1b03h65ww3cb0vxjrvj8y7bn30ci0fdbjcf8gxnmyy34npgz1ihw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52566,6 +52547,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "contiguous-fft" = callPackage + ({ mkDerivation, base, contiguous, prim-instances, primitive }: + mkDerivation { + pname = "contiguous-fft"; + version = "0.1.0.1"; + sha256 = "07nv27gj4shh22azf1nl1yr7xvzy4hzmp66yjsgxywj50850i6dq"; + libraryHaskellDepends = [ + base contiguous prim-instances primitive + ]; + description = "dft of contiguous memory structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "continue" = callPackage ({ mkDerivation, base, bifunctors, monad-control, mtl , semigroupoids, transformers, transformers-base @@ -52721,6 +52715,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "control-dsl" = callPackage + ({ mkDerivation, base, containers, doctest, doctest-discover + , temporary + }: + mkDerivation { + pname = "control-dsl"; + version = "0.2.1.1"; + sha256 = "0nfbipf26kkkjbxb9mqbjxqg99z3dfmpada28ajqjvz6n3mg4grg"; + revision = "1"; + editedCabalFile = "11rjly75f57a1818hjzy18pms51jicnzn99kx2mqzf7c7lygnsgg"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers doctest doctest-discover temporary + ]; + description = "An alternative to monads for control flow DSLs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "control-event" = callPackage ({ mkDerivation, base, containers, stm, time }: mkDerivation { @@ -52859,14 +52871,12 @@ self: { }) {}; "control-monad-free" = callPackage - ({ mkDerivation, base, prelude-extras, transformers }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "control-monad-free"; - version = "0.6.1"; - sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy"; - revision = "1"; - editedCabalFile = "1901lm2md7flri4ms745lgla18x2k7v0xh51jbjbx6202ppcx3fh"; - libraryHaskellDepends = [ base prelude-extras transformers ]; + version = "0.6.2"; + sha256 = "1habgf7byffqf1rqjkzpihvdhclaafgqsqpfpwp3fgpj5ayk1j33"; + libraryHaskellDepends = [ base transformers ]; description = "Free monads and monad transformers"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -54626,32 +54636,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_5_1_0" = callPackage + "criterion_1_5_2_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, bytestring, cassava, code-page , containers, criterion-measurement, deepseq, directory, exceptions - , fail, filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl - , mwc-random, optparse-applicative, parsec, QuickCheck, semigroups - , statistics, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, transformers-compat, vector, vector-algorithms + , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl + , mwc-random, optparse-applicative, parsec, QuickCheck, statistics + , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.5.1.0"; - sha256 = "1ixmr1mjid3yds5lzhcrjmvvlpgsn579wns96x5n1rkba14srxcq"; + version = "1.5.2.0"; + sha256 = "03y4lqkrr08nbsjk6qkrhyai7zzv0rrknn6rgni184f18c091wsd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base base-compat-batteries binary bytestring cassava code-page containers criterion-measurement deepseq - directory exceptions fail filepath Glob js-flot js-jquery - microstache mtl mwc-random optparse-applicative parsec semigroups - statistics text time transformers transformers-compat vector - vector-algorithms + directory exceptions filepath Glob js-flot js-jquery microstache + mtl mwc-random optparse-applicative parsec statistics text time + transformers transformers-compat vector vector-algorithms ]; executableHaskellDepends = [ - base base-compat-batteries optparse-applicative semigroups + base base-compat-batteries optparse-applicative ]; testHaskellDepends = [ aeson base base-compat base-compat-batteries bytestring deepseq @@ -55860,6 +55869,8 @@ self: { pname = "css-syntax"; version = "0.1.0.0"; sha256 = "02f000nzc0dhjhlp1z82q4far8ablvzalpk918lg54f63lbqdwsh"; + revision = "1"; + editedCabalFile = "14241m9nm3wbbhajw95gdj9mvfzf4hmrzvk2wgjvkm71mg4yhwnr"; libraryHaskellDepends = [ base scientific text ]; testHaskellDepends = [ base directory hspec QuickCheck scientific text @@ -56486,6 +56497,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cursor" = callPackage + ({ mkDerivation, base, containers, microlens, text, validity + , validity-containers, validity-text + }: + mkDerivation { + pname = "cursor"; + version = "0.0.0.1"; + sha256 = "0iq83v3yp7rj1fn82qkwakxi180nri50irzf8p8bzi558c6b3bmr"; + libraryHaskellDepends = [ + base containers microlens text validity validity-containers + validity-text + ]; + description = "Purely Functional Cursors"; + license = stdenv.lib.licenses.mit; + }) {}; + + "cursor-gen" = callPackage + ({ mkDerivation, base, containers, cursor, genvalidity + , genvalidity-containers, genvalidity-hspec + , genvalidity-hspec-optics, genvalidity-text, hspec, microlens + , pretty-show, QuickCheck, text + }: + mkDerivation { + pname = "cursor-gen"; + version = "0.0.0.0"; + sha256 = "10jxxy3dx2gsddmq4l95ddim4cj85l7l76lamhgqlhx6zw4j7d52"; + libraryHaskellDepends = [ + base containers cursor genvalidity genvalidity-containers + genvalidity-text QuickCheck text + ]; + testHaskellDepends = [ + base containers cursor genvalidity-hspec genvalidity-hspec-optics + hspec microlens pretty-show QuickCheck text + ]; + description = "Generators for Purely Functional Cursors"; + license = stdenv.lib.licenses.mit; + }) {}; + "curve25519" = callPackage ({ mkDerivation, base, bytestring, crypto-api, DRBG, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit @@ -56665,6 +56714,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "czipwith_1_0_1_1" = callPackage + ({ mkDerivation, base, template-haskell, transformers }: + mkDerivation { + pname = "czipwith"; + version = "1.0.1.1"; + sha256 = "0hs296mwx62alp9fkpkhw9jsjqlygagvb911nx22b0pgyiwqa52a"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base transformers ]; + description = "CZipWith class and deriving via TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "d-bus" = callPackage ({ mkDerivation, async, attoparsec, base, binary, blaze-builder , bytestring, conduit, conduit-extra, containers @@ -56696,6 +56758,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "d10" = callPackage + ({ mkDerivation, base, doctest, template-haskell }: + mkDerivation { + pname = "d10"; + version = "0.1.0.0"; + sha256 = "0ymhfarhsryqw0h6nksz9ki640b3xa1613k40hp85mk4rqir0zjq"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base doctest ]; + description = "Digits 0-9"; + license = stdenv.lib.licenses.mit; + }) {}; + "d3d11binding" = callPackage ({ mkDerivation, base, c-storable-deriving, d3d11, D3DCompiler , d3dx11, d3dxof, dxgi, dxguid, vect, Win32 @@ -60469,18 +60543,22 @@ self: { "deferred-folds" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, transformers, unordered-containers, vector + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, transformers, unordered-containers + , vector }: mkDerivation { pname = "deferred-folds"; - version = "0.9.8"; - sha256 = "0lrp0dzg6ihm1if2qq6i1dmrwfpnwvyr45yrc8ans0ar9jnrgrn3"; - revision = "1"; - editedCabalFile = "08pnfyy4vfwmvyma0h0jwil7p27y5bz9wzihy3kcc6283v9hkh52"; + version = "0.9.9"; + sha256 = "1hsfz93h6d4bzrllgmqr22ankl5pas3vlwg2yhbbcfpf35pdk9vd"; libraryHaskellDepends = [ base bytestring containers foldl hashable primitive transformers unordered-containers vector ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; description = "Abstractions over deferred folds"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -60857,16 +60935,21 @@ self: { "dense-int-set" = callPackage ({ mkDerivation, base, cereal, cereal-vector, deferred-folds - , hashable, vector, vector-algorithms + , hashable, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, vector, vector-algorithms }: mkDerivation { pname = "dense-int-set"; - version = "0.2"; - sha256 = "02gfghbpgfcr8vnbahz9y025cb5cvh4ns5xwz9gavpbi8vbcbyv9"; + version = "0.3"; + sha256 = "04aww0ffsw1mfj7v3qhvfrbllqiwihyipis3zah0m4y47197x8gh"; libraryHaskellDepends = [ base cereal cereal-vector deferred-folds hashable vector vector-algorithms ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; description = "Dense int-set"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -61064,6 +61147,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deque_0_2_4" = callPackage + ({ mkDerivation, base, semigroups }: + mkDerivation { + pname = "deque"; + version = "0.2.4"; + sha256 = "19bz1i8la16an158wwqqg6zjd93d1n6jx6kqb2zd7lm1sk1055l9"; + libraryHaskellDepends = [ base semigroups ]; + description = "Double-ended queue"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dequeue" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck , safe @@ -61318,8 +61413,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "1.0.3"; - sha256 = "1z2yv4476a42xndws1zqw0kmiy4wqw1ydqgp7hf7rk3s067wz33m"; + version = "1.0.5"; + sha256 = "1pyal6rhnyhqx8gwyh42vf66i18y9nplmqka546ikzps439rvmly"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -62229,8 +62324,8 @@ self: { pname = "diagrams-core"; version = "1.4.1.1"; sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1"; - revision = "1"; - editedCabalFile = "0qf0b27lx8w16x85rr4zf3sf4qzkywyi04incv3667054v7y8m25"; + revision = "2"; + editedCabalFile = "1lf7xcq42l4hjksgp1nhj7600shvw9q5a27bh729fyfphmvv3xkf"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -65416,8 +65511,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.2.0.3"; - sha256 = "1vm9rwym2fdl76kwgkh21z2ixfcvza1df4gba2hm7hkk0n4ndcq6"; + version = "0.2.0.4"; + sha256 = "0wbsql0pph74nghnnwwm2p8w4wnqs0iiwqfn3p3i26g6cg8yv1nr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base doctest ]; @@ -66568,8 +66663,8 @@ self: { pname = "dual-tree"; version = "0.2.2"; sha256 = "1sx9p9yr06z7bi7pshjpswizs6bkmfzcpw8xlasriniry86df4kl"; - revision = "1"; - editedCabalFile = "1hkjhij3s2a82b0sd898511lr6iphk3myk1l0hpl42ai32sf606q"; + revision = "2"; + editedCabalFile = "0r8idr1haqixa9nlp8db5iw9vr9sdk6rcargkr7w7s6i99lm6jmh"; libraryHaskellDepends = [ base monoid-extras newtype-generics semigroups ]; @@ -71990,34 +72085,87 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exinst_0_7" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, deepseq + , hashable, profunctors, QuickCheck, singletons, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "exinst"; + version = "0.7"; + sha256 = "01m50pixmrw6mrd04nxw6qwx0z5k857pn3nqfiybpmp4zbc3bwac"; + libraryHaskellDepends = [ + base binary constraints deepseq hashable profunctors QuickCheck + singletons + ]; + testHaskellDepends = [ + base binary bytestring constraints deepseq hashable profunctors + QuickCheck singletons tasty tasty-hunit tasty-quickcheck + ]; + description = "Dependent pairs and their instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exinst-aeson" = callPackage - ({ mkDerivation, aeson, base, constraints, exinst, singletons }: + ({ mkDerivation, aeson, base, bytestring, constraints, exinst + , QuickCheck, singletons, tasty, tasty-quickcheck + }: mkDerivation { pname = "exinst-aeson"; - version = "0.2"; - sha256 = "12qnc7kfr51gxnmyj71m82rh76phj207bd6fl8iwhwvzb5xhnnsr"; + version = "0.7"; + sha256 = "1dn08xqcfp3bsgvrhcv491kdfmky6925wa33zry8aijwxkchva67"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; - description = "Derive instances for the `aeson` library for your existential types"; + testHaskellDepends = [ + aeson base bytestring exinst QuickCheck tasty tasty-quickcheck + ]; + description = "Dependent pairs and their instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exinst-bytes" = callPackage - ({ mkDerivation, base, bytes, constraints, exinst, singletons }: + ({ mkDerivation, base, binary, bytes, bytestring, cereal + , constraints, exinst, exinst-cereal, QuickCheck, singletons, tasty + , tasty-quickcheck + }: mkDerivation { pname = "exinst-bytes"; - version = "0.2"; - sha256 = "0rxjfy3ljkmjnvsvif0wvcwhcgvz1yr5amj10ii08lr3vn6papnj"; + version = "0.7"; + sha256 = "05k2jzlz6aj5wwy3bnysszr6kw85n0j73wkda5vwcrsha4prmf9r"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; - description = "Derive instances for the `bytes` library for your existential types"; + testHaskellDepends = [ + base binary bytes bytestring cereal exinst exinst-cereal QuickCheck + tasty tasty-quickcheck + ]; + description = "Dependent pairs and their instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exinst-cereal" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, constraints + , exinst, QuickCheck, singletons, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "exinst-cereal"; + version = "0.7"; + sha256 = "1qdz4a4qzi3fbkigvng36hz5j322zbbwya2vrs0shja8ry6rvi74"; + libraryHaskellDepends = [ + base cereal constraints exinst singletons + ]; + testHaskellDepends = [ + base binary bytestring cereal exinst QuickCheck tasty + tasty-quickcheck + ]; + description = "Dependent pairs and their instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exinst-deepseq" = callPackage ({ mkDerivation, base, constraints, deepseq, exinst }: mkDerivation { @@ -72044,6 +72192,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exinst-serialise" = callPackage + ({ mkDerivation, base, binary, constraints, exinst, QuickCheck + , serialise, singletons, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "exinst-serialise"; + version = "0.7"; + sha256 = "0a51534sifdhq764qa9hrhwnv48f1y08a7f11mhhx3r23pxh4588"; + libraryHaskellDepends = [ + base constraints exinst serialise singletons + ]; + testHaskellDepends = [ + base binary exinst QuickCheck serialise tasty tasty-quickcheck + ]; + description = "Dependent pairs and their instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "existential" = callPackage ({ mkDerivation, base, cereal, constraints, control-invariants , lens, portable-template-haskell-lens, QuickCheck @@ -72442,8 +72608,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.2"; - sha256 = "1mqkz354w29fyc1sihr8bv10j6igcjhdn807ga9608r1lccgqf2d"; + version = "0.4.2"; + sha256 = "0lps0grvknsp0sfsqnd6kxfh6xf518x9ii11s7fy03qcl0v51da5"; libraryHaskellDepends = [ attoparsec base containers free lattices singletons text transformers @@ -72459,8 +72625,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.2"; - sha256 = "17q4mjlh8dxs1al3mw6xm9maxhbmmqprckqnyq9mwqc5j6c26b84"; + version = "0.4"; + sha256 = "1m3s9rm4767z68wpl92vryhg1sb0pllrv18x5x53amfa7kf6vrvv"; libraryHaskellDepends = [ base containers expressions list-t singletons transformers z3 ]; @@ -73162,8 +73328,8 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.1.1"; - sha256 = "0adnngx0bqbrcsxkgpdfb60p4jhvx0b8ls37g94q6cx9s0n3cmb8"; + version = "0.6.2.2"; + sha256 = "0rdlsl1k6kp766nm85afilwcvkdbi40kvqi5iy9a1ldkdk277vlk"; libraryHaskellDepends = [ base composition-prelude gmpint ]; testHaskellDepends = [ arithmoi base combinat-compat hspec QuickCheck @@ -75711,8 +75877,8 @@ self: { }: mkDerivation { pname = "fixed-vector-binary"; - version = "1.0.0.0"; - sha256 = "1q3rjjgn16fa5d8cqrlaac2b29v3045am1aanyn77vi843xzah98"; + version = "1.0.0.1"; + sha256 = "10s0mc6xdx7n6dmdgpjysbqmk79ssfw9zmaz5j0spjy7dy55zq3m"; libraryHaskellDepends = [ base binary fixed-vector ]; testHaskellDepends = [ base binary fixed-vector tasty tasty-quickcheck @@ -75727,8 +75893,8 @@ self: { }: mkDerivation { pname = "fixed-vector-cborg"; - version = "1.0.0.0"; - sha256 = "0fmdl4vfg65709iw8s18hjayqhdx4zgn36l17z2x9xlh0prspkki"; + version = "1.0.0.1"; + sha256 = "0m5xcy99hydcs99yph6n63517h2asg611rgg0h28blqd1f7bfch8"; libraryHaskellDepends = [ base cborg fixed-vector serialise ]; testHaskellDepends = [ base fixed-vector serialise tasty tasty-quickcheck @@ -75743,8 +75909,8 @@ self: { }: mkDerivation { pname = "fixed-vector-cereal"; - version = "1.0.0.0"; - sha256 = "1vg44xjwf4ffq4jxiqzk5rphbkgys81lzm1nzjsrfr8s7hhn0clp"; + version = "1.0.0.1"; + sha256 = "15vg3kr7fkd6i0swm4lm76gkfdnh0ydl4nci5abj1zss8qcn9gam"; libraryHaskellDepends = [ base cereal fixed-vector ]; testHaskellDepends = [ base cereal fixed-vector tasty tasty-quickcheck @@ -76417,8 +76583,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.15"; - sha256 = "1i3rhjjl8w9xmvckz0qrlbg7jfdz6v5w5cgmhs8xqjys5ssmla2y"; + version = "1.0.17"; + sha256 = "06adx3drx4b283v0aawhzyigvjizbhig8lqxw9cgqfn1pvc1kv46"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Write more understandable Haskell"; @@ -76958,25 +77124,6 @@ self: { }) {}; "fold-debounce-conduit" = callPackage - ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet - , stm, transformers, transformers-base - }: - mkDerivation { - pname = "fold-debounce-conduit"; - version = "0.2.0.2"; - sha256 = "18hxlcm0fixx4iiac26cdbkkqivg71qk3z50k71l9n3yashijjdc"; - libraryHaskellDepends = [ - base conduit fold-debounce resourcet stm transformers - transformers-base - ]; - testHaskellDepends = [ - base conduit hspec resourcet stm transformers - ]; - description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fold-debounce-conduit_0_2_0_3" = callPackage ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet , stm, transformers, transformers-base }: @@ -76993,7 +77140,6 @@ self: { ]; description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldable1" = callPackage @@ -77015,10 +77161,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.4.4"; - sha256 = "0dy8dhpys2bq6pn0m6klsykk4mfxi6q8hr8gqbfcvqk6g4i5wyn7"; - revision = "1"; - editedCabalFile = "1qdllf16djf7w5h8jq1f8sb5a0k5ihr9psai8wgkvnhd9addsk0f"; + version = "1.4.5"; + sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids semigroups text @@ -78198,20 +78342,20 @@ self: { }) {}; "free-algebras" = callPackage - ({ mkDerivation, base, constraints, containers, data-fix, free - , groups, hedgehog, kan-extensions, mtl, natural-numbers + ({ mkDerivation, base, constraints, containers, data-fix, dlist + , free, groups, hedgehog, kan-extensions, mtl, natural-numbers , transformers }: mkDerivation { pname = "free-algebras"; - version = "0.0.4.0"; - sha256 = "1rfrdnwsb1kpdc0ha3a7yrykff6fi3ji6ljdxmijv2n4halmxnly"; + version = "0.0.5.0"; + sha256 = "1aqzah0c95mi9aqlvhl9r56im59jgjl38r199d7zb4lligfzvacr"; libraryHaskellDepends = [ - base constraints containers data-fix free groups kan-extensions mtl - natural-numbers transformers + base constraints containers data-fix dlist free groups + kan-extensions mtl natural-numbers transformers ]; testHaskellDepends = [ - base constraints containers data-fix free groups hedgehog + base constraints containers data-fix dlist free groups hedgehog kan-extensions mtl natural-numbers transformers ]; description = "Free algebras in Haskell"; @@ -81533,6 +81677,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_6_1_0" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: + mkDerivation { + pname = "genvalidity"; + version = "0.6.1.0"; + sha256 = "0wjqwn040yn7wpmcmhfp5slvyspal104p5wgkwwi40ykaj2zhayg"; + libraryHaskellDepends = [ base QuickCheck validity ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; + description = "Testing utilities for the validity library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -81600,8 +81757,8 @@ self: { }: mkDerivation { pname = "genvalidity-containers"; - version = "0.5.0.0"; - sha256 = "1qjqwsmdcwww4fwd3m40cckwq3xgmm37kc6s25z75w768grr51br"; + version = "0.5.1.0"; + sha256 = "098360pcf522xcwa3lk091pyjl6a08cl12z18ybrlai38saskd83"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; @@ -81618,8 +81775,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.1.1"; - sha256 = "0jqdsslag6zz499z5ilra3dklsdvil92kzdx6gb591xvc30a74vs"; + version = "0.6.2.0"; + sha256 = "05dgfivvsfcnrbdkvx7mssi14xsnxck8h2xasbqnn6xng3pc351v"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck transformers validity @@ -81711,8 +81868,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-optics"; - version = "0.1.0.0"; - sha256 = "08p7hv1wr6df8sng906rvys0998nk8j331r2q5v2abw2rg2609m5"; + version = "0.1.1.0"; + sha256 = "13nspyfd8apvqf30dr8zz027d60qh2f25rc6gk8fliiq626ajz17"; libraryHaskellDepends = [ base genvalidity genvalidity-hspec hspec microlens QuickCheck ]; @@ -81772,8 +81929,8 @@ self: { }: mkDerivation { pname = "genvalidity-property"; - version = "0.2.1.0"; - sha256 = "0xwq2wnrxlxcllina9faxxs8svslpxr73z9cw8asgc4b3hf41drm"; + version = "0.2.1.1"; + sha256 = "0cjw5i2pydidda9bnp6x37ylhxdk9g874x5sadr6sscg5kq85a1b"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -81788,8 +81945,8 @@ self: { }: mkDerivation { pname = "genvalidity-scientific"; - version = "0.2.0.1"; - sha256 = "1wxrcpmhcbiklzqf5zjn0q7hpgkds5jjmdhl9kq68vbm96lm8zgn"; + version = "0.2.1.0"; + sha256 = "0gchsn5pvmbk57y7jn33zcbdr78mx3vb8v4cwr8b4pj5af6d84dg"; libraryHaskellDepends = [ base genvalidity QuickCheck scientific validity validity-scientific ]; @@ -81834,6 +81991,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-time_0_2_1_1" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, time, validity-time + }: + mkDerivation { + pname = "genvalidity-time"; + version = "0.2.1.1"; + sha256 = "0x3qddniy2a0qfyaxi1mfw9kqijky2gwyp19bcsp1gfxxl3c4mf5"; + libraryHaskellDepends = [ + base genvalidity QuickCheck time validity-time + ]; + testHaskellDepends = [ base genvalidity-hspec hspec time ]; + description = "GenValidity support for time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-unordered-containers" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity @@ -82036,8 +82210,8 @@ self: { }: mkDerivation { pname = "geojson"; - version = "3.0.3"; - sha256 = "05kifzlw077ggxish1hmpqlk180w46qpj4b2c8pjqngk5j0jd5vv"; + version = "3.0.4"; + sha256 = "0dnk9cb7y8wgnx8wzzln635r9pijljd9h5rinl0s9g4bjhw0rcw5"; libraryHaskellDepends = [ aeson base containers deepseq lens scientific semigroups text transformers validation @@ -82260,26 +82434,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_4_3" = callPackage + "ghc_8_6_1" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci, happy - , hpc, process, template-haskell, terminfo, time, transformers - , unix + , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap + , ghci, happy, hpc, process, template-haskell, terminfo, time + , transformers, unix }: mkDerivation { pname = "ghc"; - version = "8.4.3"; - sha256 = "1yryz21fnx5g1khpa7y2ps58kws3s1wjmz1ipnbv3hdcf6gyq46d"; + version = "8.6.1"; + sha256 = "1s4iggkyki6fd1wv9l5qgpnkyf1wgyf2mcncj6jwl4whrii3r7br"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath - ghc-boot ghc-boot-th ghci hpc process template-haskell terminfo - time transformers unix + ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell + terminfo time transformers unix ]; libraryToolDepends = [ alex happy ]; description = "The GHC API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {ghc-heap = null;}; "ghc-boot_8_6_1" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath @@ -82907,12 +83082,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-prim_0_5_2_0" = callPackage + "ghc-prim_0_5_3" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.5.2.0"; - sha256 = "1ccvzkw3v4xlj7g126wwlc5rvd480hbv1pcq2rfb85k77rzi6bjr"; + version = "0.5.3"; + sha256 = "07s75s4yj33p87zzpvp68hgf72xsxg6rm47g4aaymmlf52aywmv9"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -83353,6 +83528,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghci-hexcalc" = callPackage + ({ mkDerivation, base, doctest, QuickCheck }: + mkDerivation { + pname = "ghci-hexcalc"; + version = "0.1.0.1"; + sha256 = "1mwh4wz3ccmh0fi0k0y19bk33vn8p6ylmkklidpw5vg7k3v9d7s2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "GHCi as a Hex Calculator interactive"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghci-history-parser" = callPackage ({ mkDerivation, base, doctest, hspec, parsec }: mkDerivation { @@ -86361,6 +86548,8 @@ self: { pname = "gloss"; version = "1.13.0.1"; sha256 = "1f19vlx32nkgply25p83n7498lwdpshiibqg7nzkhb2kv7n0y71q"; + revision = "1"; + editedCabalFile = "1nyg324icnlky647zq4c21sqxv2bgnwnzgh2hz5d5ys6ba69j59h"; libraryHaskellDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; @@ -86386,6 +86575,8 @@ self: { pname = "gloss-algorithms"; version = "1.13.0.1"; sha256 = "0vbqcsvyicb409a60fab0c0shixny4l5z2l15n8hrrr1dsvisf95"; + revision = "1"; + editedCabalFile = "140zmk3br0nn98mjc6ri36nk8yl93n4v69zybzv2vc41yxgvnac5"; libraryHaskellDepends = [ base containers ghc-prim gloss ]; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; @@ -86425,8 +86616,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.13.0.1"; - sha256 = "071b75qlppjff9q7b8312wb382gry4dnz1b8p84sb8lxmxr2848w"; + version = "1.13.0.2"; + sha256 = "1g2l3jjj2mmmw9w45bmasqn9nbbsxxny6zhdvda931r6ryanq8db"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86506,14 +86697,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "gloss-raster_1_13_0_1" = callPackage + "gloss-raster_1_13_0_2" = callPackage ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering , repa }: mkDerivation { pname = "gloss-raster"; - version = "1.13.0.1"; - sha256 = "1dyj8r0b3gal54dgyq9jb4s5sqjhp152q63r8nkpzjh1c9d3cp9x"; + version = "1.13.0.2"; + sha256 = "1k4l19c1fn1s14phq2qml5ibsli3jmkk6748k9y96lbrgj5nfp49"; libraryHaskellDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; @@ -86559,6 +86750,8 @@ self: { pname = "gloss-rendering"; version = "1.13.0.2"; sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0"; + revision = "1"; + editedCabalFile = "0r57zc8ryxgjb4ydcdlmq19hl3nj6gjm3z85wrmdkn0wrx16mqih"; libraryHaskellDepends = [ base bmp bytestring containers GLUT OpenGL ]; @@ -90144,8 +90337,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "0.2.1.0"; - sha256 = "03a3rgrzmhc3rh8hwz2pmq3w2q6yf8ypcfzbmqm8cwkix5xx1h8z"; + version = "0.2.1.1"; + sha256 = "0nplscs0gv9isb1z2i8qh50yssvd7kkd669j53491hjw53rwy1cs"; libraryHaskellDepends = [ aeson base greskell-core semigroups text transformers unordered-containers vector @@ -90165,8 +90358,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.2.3"; - sha256 = "026lipvhc4kjcmf1d604f6m71b3hrrkaafdvymmn1fsxa360dw0s"; + version = "0.1.2.4"; + sha256 = "11agvhvpv94rnylc5ch5cg90w5z1i0ywdw47yca83503lmv3y790"; libraryHaskellDepends = [ aeson base containers hashable scientific semigroups text unordered-containers uuid vector @@ -90186,8 +90379,8 @@ self: { }: mkDerivation { pname = "greskell-websocket"; - version = "0.1.1.1"; - sha256 = "133jwmqm5swm214sav8kigg8lqvk64g1nly5zk1xcij6rajxryci"; + version = "0.1.1.2"; + sha256 = "1rydw93dscnq41a1j4l7fchbpxgbqgf2kx8c58kb0m8qxi7v6qlh"; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring greskell-core hashtables safe-exceptions stm text unordered-containers uuid @@ -91813,8 +92006,8 @@ self: { }: mkDerivation { pname = "hOpenPGP"; - version = "2.7.2"; - sha256 = "1fcpzc1ph0nykjs4k5hm6b67698h1n9452wlpm55acdf53mrk1lg"; + version = "2.7.3"; + sha256 = "0qxqq46p4l61chkxk7c6lhnscik3gzsgcvszp6ywspk8zp1yhbi8"; libraryHaskellDepends = [ aeson asn1-encoding attoparsec base base16-bytestring base64-bytestring bifunctors binary binary-conduit bytestring bzlib @@ -102778,8 +102971,8 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.16"; - sha256 = "0i55jw3xcnh48r81jfs6k5ffckar2p85l67n3x6lkz12q8iq8vkn"; + version = "0.17"; + sha256 = "0xp28mm3wxyj3win37nvrjdywkrfzm4l0j441q88bd35vr25yi2k"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -103169,6 +103362,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "heyting-algebras" = callPackage + ({ mkDerivation, base, containers, free-algebras, hashable + , lattices, QuickCheck, tagged, tasty, tasty-quickcheck + , universe-base, unordered-containers + }: + mkDerivation { + pname = "heyting-algebras"; + version = "0.0.1.2"; + sha256 = "132r0k0m8b7f8rkyay57k42kjl7nyzqv7942njkz6nwnhjg8i6ag"; + libraryHaskellDepends = [ + base containers free-algebras hashable lattices QuickCheck tagged + universe-base unordered-containers + ]; + testHaskellDepends = [ + base containers lattices QuickCheck tasty tasty-quickcheck + universe-base + ]; + description = "Heyting and Boolean algebras"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "hfann" = callPackage ({ mkDerivation, base, doublefann, fann }: mkDerivation { @@ -104005,8 +104219,8 @@ self: { }: mkDerivation { pname = "higher-leveldb"; - version = "0.5.0.1"; - sha256 = "0p7rsawd4d5cbsxlj8ddgx5blg2yw853zjfqcy78gdqn6kk8vz24"; + version = "0.5.0.2"; + sha256 = "1wmgz2aqz0vg0fnnigpg27gnzs9i6slyn6lb41myv6m20j0j5z1a"; libraryHaskellDepends = [ base bytestring cereal data-default exceptions leveldb-haskell mtl resourcet transformers transformers-base unliftio-core @@ -104546,6 +104760,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hint_0_9_0" = callPackage + ({ mkDerivation, base, directory, exceptions, extensible-exceptions + , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary + , unix + }: + mkDerivation { + pname = "hint"; + version = "0.9.0"; + sha256 = "1g7q4clzc2pdnbvmm265dindjpynabsykd088qjjzlk6590sy9bl"; + libraryHaskellDepends = [ + base directory exceptions filepath ghc ghc-boot ghc-paths mtl + random temporary unix + ]; + testHaskellDepends = [ + base directory exceptions extensible-exceptions filepath HUnit unix + ]; + description = "Runtime Haskell interpreter (GHC API wrapper)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: @@ -104902,8 +105137,8 @@ self: { }: mkDerivation { pname = "histogram-fill"; - version = "0.9.0.0"; - sha256 = "00j4ncqy0s5wil158wx1f8x0n2mj4ki2hgs4hmkrx0vbkc2pil56"; + version = "0.9.1.0"; + sha256 = "0qcil8lgkzklgbzb9a81kdzsyzrsgzwdgz424mlvp8sbrfmbnz3m"; libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ]; benchmarkHaskellDepends = [ base criterion mwc-random vector ]; description = "Library for histograms creation"; @@ -105278,8 +105513,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.11"; - sha256 = "1kkgvyf4vrj5dy41v4z7xbyxhnw79y1j18d46pldim7iq43643ji"; + version = "1.11.1"; + sha256 = "0cy60ysmydg0ahx6gjmjm97skvjp5a3vgqxsn2l1dp7hk34ac5p9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105329,8 +105564,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.11"; - sha256 = "1a59i6gn70mk124mmzfk4wz464a9r6hni0cd8c04fgp1v9zsa3m1"; + version = "1.11.1"; + sha256 = "1wsbjsdibdwf4bmhbwcql7yiprhz83zj8g7a1labykmdw8lldlqc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105414,8 +105649,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.5.2"; - sha256 = "10ck23d69wxylxbp8cj7ic8slklm9l88xbb4p29nvm5lgjiqidbq"; + version = "1.5.3"; + sha256 = "1ff113z2ir07ihdvfa5fca4x326zwm2jd7sjy6hjpr4qgi1mszvs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105454,8 +105689,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.11"; - sha256 = "0zh0y41cxz6skazfbqb1hw5sqy0kvdciib8d4xa0ny9rx4sjjq6a"; + version = "1.11.1"; + sha256 = "0diz7ygl8zl4bjxq2c627fjvvjcdpkiqp42f5wjmz9pd1nd2da4f"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers @@ -105485,8 +105720,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.11"; - sha256 = "1szn9gx1s331axhg1m51s6v695skblx52fk0i0z03v2xkajn3y2r"; + version = "1.11.1"; + sha256 = "03k62vsjyk2d7nq3lzas4qac2ck09xhk2x752xncls5rfzj8hjcj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105529,8 +105764,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.11"; - sha256 = "0di7imrlpgldbk4hjv5l3b80v5n9qfyjajz9qgfpr0f1d54l0rdn"; + version = "1.11.1"; + sha256 = "1bvhiikz8hlgjvc7s2hk363gjva9izga167bpx074m560q7y77fs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105994,8 +106229,8 @@ self: { ({ mkDerivation, base, doctest, hmatrix, nlopt-haskell, vector }: mkDerivation { pname = "hmatrix-nlopt"; - version = "0.1.2.0"; - sha256 = "1w04gi7shpck8z80a3lx77054i39ig7n3rig66hbpq1wp11snivs"; + version = "0.1.3.0"; + sha256 = "17c6s4q5sldr3mqqbyg4yknqxfgd45a0aw6sac33xcv9dvgyjyfc"; libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ]; testHaskellDepends = [ base doctest ]; description = "Interface HMatrix with the NLOPT minimizer"; @@ -110552,14 +110787,16 @@ self: { }) {}; "hscrtmpl" = callPackage - ({ mkDerivation, base, directory, process, time }: + ({ mkDerivation, base, directory, filepath, process, time }: mkDerivation { pname = "hscrtmpl"; - version = "1.5"; - sha256 = "12b5409gaiasgap0lvykvapjbls1p2p9jz62sqpl70181y4812l0"; + version = "1.6"; + sha256 = "166xp46bxi079h9bpr8xfnlzzivwkhnykv7g7kg7rnp35cmwxshm"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base directory process time ]; + executableHaskellDepends = [ + base directory filepath process time + ]; description = "Haskell shell script template"; license = stdenv.lib.licenses.isc; }) {}; @@ -110816,26 +111053,6 @@ self: { }) {}; "hsexif" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit - , iconv, text, time - }: - mkDerivation { - pname = "hsexif"; - version = "0.6.1.5"; - sha256 = "0vmhd6l9vkzm4pqizqh3hjb86f4vk212plvlzfd6rd5dc08fl4ig"; - revision = "1"; - editedCabalFile = "1q5ppjq8b08ljccg5680h1kklr288wfz52vnmgpcf9hqjm3icgvb"; - libraryHaskellDepends = [ - base binary bytestring containers iconv text time - ]; - testHaskellDepends = [ - base binary bytestring containers hspec HUnit iconv text time - ]; - description = "EXIF handling library in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsexif_0_6_1_6" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit , iconv, text, time }: @@ -110853,7 +111070,6 @@ self: { ]; description = "EXIF handling library in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsfacter" = callPackage @@ -111854,8 +112070,8 @@ self: { }: mkDerivation { pname = "hspec-dirstream"; - version = "1.0.0.1"; - sha256 = "17ac54ac21a5r954zvwxvn1j049q49m4ia7ghmdrcp94q3aczf4n"; + version = "1.0.0.2"; + sha256 = "1df6rjgwj6rw78dh1ihswk7sgh72c8aqnaaj4r9k0gjq30hkdlfr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base dirstream filepath hspec hspec-core pipes pipes-safe @@ -112947,6 +113163,8 @@ self: { pname = "hstatistics"; version = "0.3"; sha256 = "1v7f2844p6bjzcwc2pnjyb8zl42kw1x021gcn688dvdxs6cgdwvs"; + revision = "1"; + editedCabalFile = "0qcp1kgpwnqphqq1fd92lfp8d0vcf3l6ighsdiqin51qg499xz9w"; libraryHaskellDepends = [ array base hmatrix hmatrix-gsl-stats random vector ]; @@ -113808,8 +114026,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "2.1.0.2"; - sha256 = "0m5v4f6djwr6sr9sndfal4gwxl0ryq2cg661ka8br7v1ww2d70yl"; + version = "2.1.0.3"; + sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -113955,7 +114173,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-api-data_0_3_9" = callPackage + "http-api-data_0_3_10" = callPackage ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring , Cabal, cabal-doctest, containers, cookie, directory, doctest , filepath, hashable, hspec, hspec-discover, http-types, HUnit @@ -113964,8 +114182,8 @@ self: { }: mkDerivation { pname = "http-api-data"; - version = "0.3.9"; - sha256 = "013m662vn02vw37gpffnvffwjirhg8lprknav5rinxffq7ra4cr8"; + version = "0.3.10"; + sha256 = "061v98l5j8791jzp6fzhdc0gpmzzf4qxavrjzm7ir8x5h7il3qm8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base bytestring containers cookie @@ -113973,8 +114191,9 @@ self: { unordered-containers uuid-types ]; testHaskellDepends = [ - base bytestring directory doctest filepath hspec HUnit QuickCheck - quickcheck-instances text time unordered-containers uuid-types + base bytestring cookie directory doctest filepath hspec HUnit + QuickCheck quickcheck-instances text time unordered-containers + uuid-types ]; testToolDepends = [ hspec-discover ]; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; @@ -114525,10 +114744,8 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.7.1.2"; - sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy"; - revision = "2"; - editedCabalFile = "0in3xw1hqdz0s8pqvkfqw5qr186cd1yr4zxc5rnr0q95asi8s0rh"; + version = "0.7.1.3"; + sha256 = "0kqjzvh5y8r6x5rw2kgd816w2963c6cbyw2qjvaj2mv59zxzqkrr"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -115706,16 +115923,16 @@ self: { "hw-conduit" = callPackage ({ mkDerivation, array, base, bytestring, conduit - , conduit-combinators, criterion, hspec, mmap, time, vector, word8 + , conduit-combinators, criterion, hspec, mmap, time, transformers + , unliftio-core, vector, word8 }: mkDerivation { pname = "hw-conduit"; - version = "0.2.0.3"; - sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a"; - revision = "1"; - editedCabalFile = "0zr1r7px2qgpf5fgq18l6ziy2xaz773qbxc87cp84x0vpwas0yg7"; + version = "0.2.0.5"; + sha256 = "00fpinpafvrdkmk6gksqd9v6f3lzrqcg79yja0h55gw7qjz5lz84"; libraryHaskellDepends = [ - array base bytestring conduit conduit-combinators time word8 + array base bytestring conduit conduit-combinators time transformers + unliftio-core word8 ]; testHaskellDepends = [ base bytestring conduit hspec ]; benchmarkHaskellDepends = [ @@ -115980,16 +116197,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-json_0_8_1_0" = callPackage + "hw-json_0_9_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, containers, criterion, directory, dlist, hspec - , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim - , hw-rankselect, hw-rankselect-base, mmap, text, vector, word8 + , bytestring, containers, criterion, directory, dlist, generic-lens + , hspec, hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim + , hw-rankselect, hw-rankselect-base, lens, mmap + , optparse-applicative, resourcet, text, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "0.8.1.0"; - sha256 = "1dllysbajkjsyb0rr9rhp2pmyrl99l7n086w8ifkm3491vgph179"; + version = "0.9.0.0"; + sha256 = "0465pc8k4wvvih4z5klq3ign2cznrb837ivqxg9nrzbx8szsnsc7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115998,8 +116216,9 @@ self: { hw-rankselect-base mmap text vector word8 ]; executableHaskellDepends = [ - base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery - hw-prim hw-rankselect hw-rankselect-base mmap vector + base bytestring criterion dlist generic-lens hw-balancedparens + hw-bits hw-mquery hw-prim hw-rankselect hw-rankselect-base lens + mmap optparse-applicative resourcet vector ]; testHaskellDepends = [ attoparsec base bytestring containers hspec hw-balancedparens @@ -119420,6 +119639,8 @@ self: { pname = "incremental-parser"; version = "0.3.1.1"; sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz"; + revision = "1"; + editedCabalFile = "0g6haprqb1w06bazjj107frraxc6bbj8i98im16k66wlx7c9f99i"; libraryHaskellDepends = [ base monoid-subclasses ]; testHaskellDepends = [ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck @@ -119469,8 +119690,8 @@ self: { }: mkDerivation { pname = "indentation"; - version = "0.3.2"; - sha256 = "1knazqvr6bk07j7q7835z2d2vs3zyd7i4hzir6aqcdxwhrqm5q7k"; + version = "0.3.3"; + sha256 = "0iwnz4j4zkr9xpw5f8p42blgifdj6mqbxpqsci76pic6safp3avq"; libraryHaskellDepends = [ base indentation-core indentation-parsec indentation-trifecta mtl parsec parsers trifecta @@ -119484,8 +119705,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "indentation-core"; - version = "0.0.0.1"; - sha256 = "136skn3parvsyfii0ywm8cqfmsysi562944fbb0xsgckx0sq1dr1"; + version = "0.0.0.2"; + sha256 = "1l1zk5wz9x0m4ird1qk8shi1fkcm3sq2nwkjj6wz2sicp0xkx6h9"; libraryHaskellDepends = [ base mtl ]; description = "Indentation sensitive parsing combinators core library"; license = stdenv.lib.licenses.bsd3; @@ -119497,8 +119718,8 @@ self: { }: mkDerivation { pname = "indentation-parsec"; - version = "0.0.0.1"; - sha256 = "12s7ic8i7l2g7knzzab0c6k1s59cjlcdsrwygzh8l6l9azvya5lp"; + version = "0.0.0.2"; + sha256 = "1m7jr1s7h4vrx0lbl88gjrpd6zgzalmqzqsv6rn5s17ay5p88dqf"; libraryHaskellDepends = [ base indentation-core mtl parsec ]; testHaskellDepends = [ base parsec tasty tasty-hunit ]; description = "Indentation sensitive parsing combinators for Parsec"; @@ -119511,8 +119732,8 @@ self: { }: mkDerivation { pname = "indentation-trifecta"; - version = "0.0.2"; - sha256 = "0d2mxd1cdcr0zfz618dh4grin4z2bjfv4659i2zsddxm9li0dqis"; + version = "0.1.0"; + sha256 = "1za8x4w26ifxvfv5xra5xpykr67ari91c4p0vca89y28q54l9qpj"; libraryHaskellDepends = [ base indentation-core mtl parsers trifecta ]; @@ -119633,8 +119854,8 @@ self: { ({ mkDerivation, base, hspec, Only }: mkDerivation { pname = "indexed-list-literals"; - version = "0.2.1.1"; - sha256 = "1b4g2196pi7v347gzl1x68qriwwfgr2iddjqfs49h5swh7qqqpfg"; + version = "0.2.1.2"; + sha256 = "043xl356q9n1nw2bw8a8msymy18d6f7nwcyrrpzak9qr75dsx5nq"; libraryHaskellDepends = [ base Only ]; testHaskellDepends = [ base hspec ]; description = "Type safe indexed list literals"; @@ -122016,24 +122237,24 @@ self: { }) {}; "iridium" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers - , extra, foldl, http-conduit, lifted-base, monad-control - , multistate, process, split, system-filepath, tagged, text - , transformers, transformers-base, turtle, unordered-containers - , vector, xmlhtml, yaml + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , containers, extra, foldl, HTTP, lifted-base, monad-control + , multistate, network-uri, process, split, system-filepath, tagged + , text, transformers, transformers-base, turtle + , unordered-containers, vector, yaml }: mkDerivation { pname = "iridium"; - version = "0.1.5.7"; - sha256 = "0jfsz8j9dq0nfr536wp78k02ffg8xgjm3zqgjgfdm1i0zwi5dcbp"; + version = "0.1.5.8"; + sha256 = "02l18z38n3cbrav7lyi3d27393invc216j78xgg7qfpbvhm3pfgw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-terminal base bytestring Cabal containers extra foldl - http-conduit lifted-base monad-control multistate process split + aeson ansi-terminal base bytestring Cabal containers extra foldl + HTTP lifted-base monad-control multistate network-uri process split system-filepath tagged text transformers transformers-base turtle - unordered-containers vector xmlhtml yaml + unordered-containers vector yaml ]; executableHaskellDepends = [ base extra multistate text transformers unordered-containers yaml @@ -122862,27 +123083,6 @@ self: { }) {}; "ixset-typed" = callPackage - ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck - , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck - , template-haskell - }: - mkDerivation { - pname = "ixset-typed"; - version = "0.4"; - sha256 = "0xjj7vjyp4p6cid5xcin36xd8lwqah0vix4rj2d4mnmbb9ch19aa"; - revision = "1"; - editedCabalFile = "1ldf6bkm085idwp8a8ppxvyawii4gbhyw1pwrcyi3n8jpjh8hqcq"; - libraryHaskellDepends = [ - base containers deepseq safecopy syb template-haskell - ]; - testHaskellDepends = [ - base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Efficient relational queries on Haskell sets"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ixset-typed_0_4_0_1" = callPackage ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck , template-haskell @@ -122899,7 +123099,6 @@ self: { ]; description = "Efficient relational queries on Haskell sets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ixshader" = callPackage @@ -123549,6 +123748,8 @@ self: { pname = "jmacro"; version = "0.6.15"; sha256 = "1b3crf16szj11pcgrg3912xq072vnv0myq6mzg0ypaabdzn3zr7s"; + revision = "1"; + editedCabalFile = "07jghfxn4m26q8rksxn4v6pcc8mwcjdlz1ypy7dqsvhzc3hs2s4i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123933,6 +124134,8 @@ self: { pname = "jsaddle"; version = "0.9.5.0"; sha256 = "1b1d8dvj5lqpn0k6ay90jdgm0a05vbchxy4l3r9s4fn4mx56jp9z"; + revision = "1"; + editedCabalFile = "1f77rxrmd0rqdz81dqaw5rxxcrsjw7ibw5qp93lkgw6yj531ki99"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers deepseq exceptions filepath ghc-prim http-types lens primitive @@ -124613,6 +124816,8 @@ self: { pname = "json-schema"; version = "0.7.4.2"; sha256 = "09bgcc00q1v24rdglw9b24dgi690mlax6abarhcgvgmn22406wp8"; + revision = "1"; + editedCabalFile = "0pwmh48z54n0mrwzmgff95mwy1jbmy1rwsk5kmddby86f0j5873g"; libraryHaskellDepends = [ aeson base base-compat-batteries containers generic-aeson generic-deriving mtl scientific text time unordered-containers @@ -125697,13 +125902,17 @@ self: { }) {}; "kansas-lava-shake" = callPackage - ({ mkDerivation, base, hastache, kansas-lava, shake, text }: + ({ mkDerivation, base, containers, kansas-lava, mustache, shake + , text, vector + }: mkDerivation { pname = "kansas-lava-shake"; - version = "0.2.0"; - sha256 = "197nyj21r2z9a648ljmqkhzdbhy3syzw1rw4xfggn1rhk94px0rl"; + version = "0.3.0"; + sha256 = "00mmk0fsv1vdm3xidmv9wa5dwbnka564bhjp2j3jx5i4l7kw4xrb"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base hastache kansas-lava shake text ]; + libraryHaskellDepends = [ + base containers kansas-lava mustache shake text vector + ]; description = "Shake rules for building Kansas Lava projects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -126966,18 +127175,18 @@ self: { }) {}; "knead" = callPackage - ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record + ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, storable-record , storable-tuple, tfp, transformers, utility-ht }: mkDerivation { pname = "knead"; - version = "0.2.3"; - sha256 = "14wi37i3y8hvfiwfs82mg7nanin84if4wlxi3rdg4w3fkdqm9ycl"; + version = "0.3"; + sha256 = "0pghy04z5ps1m3v6qmq7pilnflrcswm83c68k2f8d4g56v9lcp40"; libraryHaskellDepends = [ - base llvm-extra llvm-tf storable-record storable-tuple tfp + base bool8 llvm-extra llvm-tf storable-record storable-tuple tfp transformers utility-ht ]; - description = "Repa array processing using LLVM JIT"; + description = "Repa-like array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -127139,8 +127348,8 @@ self: { pname = "kraken"; version = "0.1.0"; sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k"; - revision = "1"; - editedCabalFile = "0ycdikk0mwy1ys9v29ybiws4fr59arwkpibdx62p9vpdv9f0p9k6"; + revision = "2"; + editedCabalFile = "141qx2fb3dimv20qsl2q1bagwcn9i0r72z2ha1w7191m557in319"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl ]; @@ -130027,6 +130236,8 @@ self: { pname = "lazysplines"; version = "0.2"; sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y"; + revision = "1"; + editedCabalFile = "0781158jza2q6zdd7z0szsnsw1kvsbhiijivbi61rridjgv1yq23"; libraryHaskellDepends = [ base ]; description = "Differential solving with lazy splines"; license = stdenv.lib.licenses.bsd3; @@ -130609,6 +130820,8 @@ self: { pname = "lens-accelerate"; version = "0.2.0.0"; sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk"; + revision = "1"; + editedCabalFile = "0ggm157i4bmgh7k0dv9zncgn4agwk7zn5wvsknxsnfqzy45qabi9"; libraryHaskellDepends = [ accelerate base lens ]; description = "Instances to mix lens with accelerate"; license = stdenv.lib.licenses.bsd3; @@ -133914,20 +134127,18 @@ self: { }) {}; "llvm-extra" = callPackage - ({ mkDerivation, base, bifunctors, containers, cpuid, llvm-tf - , non-empty, tfp, transformers, unsafe, utility-ht + ({ mkDerivation, base, bifunctors, bool8, containers, cpuid + , llvm-tf, non-empty, tfp, transformers, unsafe, utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.7.3"; - sha256 = "12h3c86i8hps26rgy1s8m7rpmp7v6sms7m3bnq7l22qca7dny58a"; - revision = "1"; - editedCabalFile = "1zsmfzhlcxcn24z3k21lkk3wmb6rw1mnsky2q85kj6xam92lyn73"; + version = "0.8"; + sha256 = "0gy7zl3ln64aypkci5gc1bxy1j98zfj9wj7z07lk9n07s6ddm9k2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors containers cpuid llvm-tf non-empty tfp transformers - unsafe utility-ht + base bifunctors bool8 containers cpuid llvm-tf non-empty tfp + transformers unsafe utility-ht ]; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -134965,29 +135176,6 @@ self: { }) {}; "logging-effect" = callPackage - ({ mkDerivation, async, base, bytestring, criterion, exceptions - , fast-logger, free, lifted-async, monad-control, monad-logger, mtl - , prettyprinter, semigroups, stm, stm-delay, text, time - , transformers, transformers-base, unliftio-core - }: - mkDerivation { - pname = "logging-effect"; - version = "1.3.2"; - sha256 = "1q8mhshz95xckqn4d8wxj0nsg4qrxmc6a826fjzxm1ii0krwpgbd"; - libraryHaskellDepends = [ - async base exceptions free monad-control mtl prettyprinter - semigroups stm stm-delay text time transformers transformers-base - unliftio-core - ]; - benchmarkHaskellDepends = [ - base bytestring criterion fast-logger lifted-async monad-logger - prettyprinter text time - ]; - description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logging-effect_1_3_3" = callPackage ({ mkDerivation, async, base, bytestring, criterion, exceptions , fast-logger, free, lifted-async, monad-control, monad-logger, mtl , prettyprinter, semigroups, stm, stm-delay, text, time @@ -135008,7 +135196,6 @@ self: { ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-effect-extra" = callPackage @@ -140104,24 +140291,6 @@ self: { }) {}; "memory" = callPackage - ({ mkDerivation, base, basement, bytestring, deepseq, foundation - , ghc-prim - }: - mkDerivation { - pname = "memory"; - version = "0.14.16"; - sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v"; - revision = "1"; - editedCabalFile = "10j8737fm287ii0nm4hqnhf87apls3xjczkzdw9qqkb4a2dybsbx"; - libraryHaskellDepends = [ - base basement bytestring deepseq foundation ghc-prim - ]; - testHaskellDepends = [ base basement bytestring foundation ]; - description = "memory and related abstraction stuff"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "memory_0_14_18" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, foundation , ghc-prim }: @@ -140137,7 +140306,6 @@ self: { testHaskellDepends = [ base basement bytestring foundation ]; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memorypool" = callPackage @@ -140795,17 +140963,6 @@ self: { }) {}; "microlens-contra" = callPackage - ({ mkDerivation, base, contravariant, microlens }: - mkDerivation { - pname = "microlens-contra"; - version = "0.1.0.1"; - sha256 = "15gmqxi24jy8w83852y5qf4xymiilkl24sppcaw7r2hn6yfz30s9"; - libraryHaskellDepends = [ base contravariant microlens ]; - description = "True folds and getters for microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-contra_0_1_0_2" = callPackage ({ mkDerivation, base, contravariant, microlens }: mkDerivation { pname = "microlens-contra"; @@ -140814,7 +140971,6 @@ self: { libraryHaskellDepends = [ base contravariant microlens ]; description = "True folds and getters for microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-each" = callPackage @@ -141762,18 +141918,23 @@ self: { }) {}; "mios" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, primitive, vector }: + ({ mkDerivation, base, bytestring, ghc-prim, gitrev, hspec + , primitive, vector + }: mkDerivation { pname = "mios"; - version = "1.6.0"; - sha256 = "1pwcv24csffb734q4z4amjlgv8kkzncz8bjhn4s3wji021ndj1b7"; + version = "1.6.2"; + sha256 = "1q2lz5sir6pcxiqxb3vr1xp6zsld0nfwjymg0zbhszd5w0iprxdh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ghc-prim primitive vector ]; executableHaskellDepends = [ - base bytestring ghc-prim primitive vector + base bytestring ghc-prim gitrev primitive vector + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec primitive vector ]; description = "A Minisat-based CDCL SAT solver in Haskell"; license = stdenv.lib.licenses.gpl3; @@ -142595,6 +142756,8 @@ self: { pname = "mole"; version = "0.0.6"; sha256 = "0shsx1sc6rc5jxijvrc4bzqpjw4xdjq5ghlj8jnmm7gp8b6h6y5b"; + revision = "2"; + editedCabalFile = "1qykba99djdhwm0mmkrfbjdyjcx47gi5clxm8kz87ccx9qs72kfy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143707,8 +143870,8 @@ self: { ({ mkDerivation, base, mtl, stm }: mkDerivation { pname = "monadIO"; - version = "0.11.0.0"; - sha256 = "11pbg83fw5vdlny5w9afmzdhn3ryg1av429gbsk8w6wl8zqhd4n9"; + version = "0.11.1.0"; + sha256 = "1a3gb70fkh28ck13zdkphdip2kzdcivzdrsg9fdn3nci9scbdp2w"; libraryHaskellDepends = [ base mtl stm ]; description = "Overloading of concurrency variables"; license = stdenv.lib.licenses.bsd3; @@ -144241,8 +144404,8 @@ self: { pname = "monoid-extras"; version = "0.5"; sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6"; - revision = "1"; - editedCabalFile = "12dq0flvkw8lqbga3wsygcmkzwc9f16kmq31wh79alybzynz36qw"; + revision = "2"; + editedCabalFile = "1q73ghd12fd451zm4m045h8v3y61jmfhj6k890gnv6z7lyb7xwg2"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion semigroups ]; description = "Various extra monoid-related definitions and utilities"; @@ -144298,8 +144461,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "0.4.6"; - sha256 = "1rsipvaab5wpzi4qxzzb3gihg1gnsdiv0iz00gdskgjifggamh8m"; + version = "0.4.6.1"; + sha256 = "19mfklkdhyv94pfg5i92h0z90sc99rbgpi8z0w55bz3qhxnqg5yh"; libraryHaskellDepends = [ base bytestring containers primes text vector ]; @@ -144339,6 +144502,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monoidal-containers_0_4_0_0" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens + , newtype, semigroups, unordered-containers + }: + mkDerivation { + pname = "monoidal-containers"; + version = "0.4.0.0"; + sha256 = "15mh2hx7a31gr5zb2g30h2fcnb3a2wvv2y8hvzzk5l9cr2nvhcm1"; + libraryHaskellDepends = [ + aeson base containers deepseq hashable lens newtype semigroups + unordered-containers + ]; + description = "Containers with monoidal accumulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monoidplus" = callPackage ({ mkDerivation, base, contravariant, semigroups, transformers }: mkDerivation { @@ -144381,12 +144561,12 @@ self: { }) {}; "monopati" = callPackage - ({ mkDerivation, base, free, split }: + ({ mkDerivation, base, directory, free, split }: mkDerivation { pname = "monopati"; - version = "0.1.1"; - sha256 = "0zpqhxq9vq7svkdrn8aph5i1f8kd9l8jgdg8lpj15c311qrz8cl5"; - libraryHaskellDepends = [ base free split ]; + version = "0.1.2"; + sha256 = "1bimppfh14754a8dra6cjd2ricdyry5fmm0shryf974h9l6wbrp8"; + libraryHaskellDepends = [ base directory free split ]; description = "Well-typed paths"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -146026,10 +146206,8 @@ self: { }: mkDerivation { pname = "multistate"; - version = "0.8.0.0"; - sha256 = "0sax983yjzcbailza3fpjjszg4vn0wb11wjr11jskk22lccbagq1"; - revision = "3"; - editedCabalFile = "0gi4l3765jgsvhr6jj2q1l7v6188kg2xw4zwcaarq3hcg1ncaakw"; + version = "0.8.0.1"; + sha256 = "1s9fs29ki3l1df0ddi04ckbich1xid413sm2zx59aqp92dfpimvm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146769,8 +146947,8 @@ self: { pname = "mwc-random-accelerate"; version = "0.1.0.0"; sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih"; - revision = "2"; - editedCabalFile = "16llz1jvpq841a20wvv2j8kkb357y970i54w340hwk4c187hypic"; + revision = "3"; + editedCabalFile = "1a7xx3mcli9fx5lqg1zxwqbrgzvgbssn3vprh4wp8zg58pqic6ic"; libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; @@ -147520,12 +147698,18 @@ self: { }) {}; "nano-cryptr" = callPackage - ({ mkDerivation, base, bytestring }: + ({ mkDerivation, base, bytestring, HUnit, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: mkDerivation { pname = "nano-cryptr"; - version = "0.1.1.3"; - sha256 = "1pqwzl8l48c4q83jhjj11jd3kwwa0ail2c6kv3k38kig9yvj7ff8"; + version = "0.2.1"; + sha256 = "00c0niyjhkcv942vhm775jml3frhj0i3svgj9xxy0hnfb3nawvjb"; libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit + test-framework-quickcheck2 + ]; description = "A threadsafe binding to glibc's crypt_r function"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -150577,8 +150761,8 @@ self: { ({ mkDerivation, base, nlopt, vector }: mkDerivation { pname = "nlopt-haskell"; - version = "0.1.2.0"; - sha256 = "0hzg2y11lacgn9793zsk0vib3wb9kyqkcp65vfcfwvd90lny3mmn"; + version = "0.1.3.0"; + sha256 = "1lsh2wbl1l291xqwjxdqjpvxss9zzl2ivvwigza7zkbmaz9a0zvx"; libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ nlopt ]; testHaskellDepends = [ base vector ]; @@ -151995,46 +152179,6 @@ self: { }) {}; "nvim-hs" = callPackage - ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit - , containers, data-default, deepseq, directory, dyre, filepath - , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec - , messagepack, mtl, network, optparse-applicative, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck, resourcet - , setenv, stm, streaming-commons, template-haskell, text, time - , time-locale-compat, transformers, transformers-base, unliftio - , unliftio-core, utf8-string, void - }: - mkDerivation { - pname = "nvim-hs"; - version = "1.0.0.2"; - sha256 = "00s8anzazzax8kjsa0ciyvx9c5smwb8a81qh625nf2v9pkp7lr20"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring cereal cereal-conduit conduit containers - data-default deepseq directory dyre filepath foreign-store hslogger - megaparsec messagepack mtl network optparse-applicative - prettyprinter prettyprinter-ansi-terminal process resourcet setenv - stm streaming-commons template-haskell text time time-locale-compat - transformers transformers-base unliftio unliftio-core utf8-string - void - ]; - executableHaskellDepends = [ base data-default ]; - testHaskellDepends = [ - base bytestring cereal cereal-conduit conduit containers - data-default directory dyre filepath foreign-store hslogger hspec - hspec-discover HUnit megaparsec messagepack mtl network - optparse-applicative prettyprinter prettyprinter-ansi-terminal - process QuickCheck resourcet setenv stm streaming-commons - template-haskell text time time-locale-compat transformers - transformers-base unliftio unliftio-core utf8-string - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell plugin backend for neovim"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "nvim-hs_1_0_0_3" = callPackage ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit , containers, data-default, deepseq, directory, dyre, filepath , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec @@ -152072,7 +152216,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvim-hs-contrib" = callPackage @@ -152184,32 +152327,6 @@ self: { }) {}; "o-clock" = callPackage - ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob - , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec - , tiempo, time-units, type-spec - }: - mkDerivation { - pname = "o-clock"; - version = "1.0.0"; - sha256 = "18wmy90fn514dmjsyk8n6q4p1nvks6lbi0077s00p6hv247p353j"; - revision = "1"; - editedCabalFile = "0df6b78y05q8pmlxyfpln01vkm0r38cay1ffsbz1biyfs6s115j5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ghc-prim ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog - tasty-hspec type-spec - ]; - testToolDepends = [ doctest markdown-unlit ]; - benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ]; - description = "Type-safe time library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "o-clock_1_0_0_1" = callPackage ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec , tiempo, time-units, type-spec @@ -154401,8 +154518,8 @@ self: { }: mkDerivation { pname = "optparse-applicative"; - version = "0.14.2.0"; - sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71"; + version = "0.14.3.0"; + sha256 = "0qvn1s7jwrabbpmqmh6d6iafln3v3h9ddmxj2y4m0njmzq166ivj"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -155971,8 +156088,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "1.0.0.0"; - sha256 = "0dcrvzsg6h8pmrk1k3w12hsnh169n0ahlybpg8zhm4xbac5iafc7"; + version = "1.0.0.1"; + sha256 = "1sxksn2b7x1mrgla0c3dn5x9js0yhfg125259kh1iqzlkanj81px"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156115,8 +156232,8 @@ self: { }: mkDerivation { pname = "pangraph"; - version = "0.2.0"; - sha256 = "1zm19gbidi6a27vi7x66dlw3q0syy5vwdykck716kdfka88vr9k5"; + version = "0.2.1"; + sha256 = "09jyhaxl89y8arkm4xmbx3bp859viq00bdnqk3bnvdiwv3klry8l"; libraryHaskellDepends = [ algebraic-graphs attoparsec base bytestring containers fgl hexml html-entities text @@ -157713,26 +157830,28 @@ self: { }) {}; "patch-image" = callPackage - ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda + ({ mkDerivation, accelerate, accelerate-arithmetic , accelerate-cufft, accelerate-fourier, accelerate-io - , accelerate-utility, array, base, bytestring, Cabal, carray - , cassava, containers, enumset, explicit-exception, fft, filepath - , gnuplot, hmatrix, JuicyPixels, knead, llvm-extra, llvm-tf - , non-empty, pqueue, storable-tuple, tfp, unordered-containers - , utility-ht, vector + , accelerate-llvm-ptx, accelerate-utility, array, base, bool8 + , bytestring, Cabal, carray, cassava, containers, dsp, enumset + , explicit-exception, fft, filepath, gnuplot, JuicyPixels, knead + , llvm-extra, llvm-tf, non-empty, pqueue, prelude-compat + , semigroups, storable-complex, storable-tuple, tfp + , unordered-containers, utility-ht, vector }: mkDerivation { pname = "patch-image"; - version = "0.3.1"; - sha256 = "1l7iv83r145wmfhr8mygc7ln78jv669n2klhm1n9p50dinv1gj17"; + version = "0.3.2"; + sha256 = "00zjpbhw5886zc4cmflqw4721kvndyc7r3i7p5493visqr0d1hvk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft - accelerate-fourier accelerate-io accelerate-utility array base - bytestring Cabal carray cassava containers enumset - explicit-exception fft filepath gnuplot hmatrix JuicyPixels knead - llvm-extra llvm-tf non-empty pqueue storable-tuple tfp + accelerate accelerate-arithmetic accelerate-cufft + accelerate-fourier accelerate-io accelerate-llvm-ptx + accelerate-utility array base bool8 bytestring Cabal carray cassava + containers dsp enumset explicit-exception fft filepath gnuplot + JuicyPixels knead llvm-extra llvm-tf non-empty pqueue + prelude-compat semigroups storable-complex storable-tuple tfp unordered-containers utility-ht vector ]; description = "Compose a big image from overlapping parts"; @@ -161849,14 +161968,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes-safe_2_3_0" = callPackage + "pipes-safe_2_3_1" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control, mtl , pipes, primitive, transformers, transformers-base }: mkDerivation { pname = "pipes-safe"; - version = "2.3.0"; - sha256 = "1b8cx8drwnviq2fic2ppldf774awih4wd0m1an0iv2x3l7ndy9jp"; + version = "2.3.1"; + sha256 = "0dfdd3fccfd7wfn5228hbfj3h10xq01sddpy1v2ds63wlg84kwly"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -165865,6 +165984,8 @@ self: { pname = "pretty-sop"; version = "0.2.0.2"; sha256 = "0x1j5ngxwk176kr1qb0vr7zzjph1jxjc3bpzqcnph3rn2j6z4kyn"; + revision = "1"; + editedCabalFile = "16j80587sfq4hm2p24awcv388sm2snrwj3fhg9l3x256fbl4bm4s"; libraryHaskellDepends = [ base generics-sop pretty-show ]; description = "A generic pretty-printer using generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -167182,16 +167303,16 @@ self: { , hashable, hashable-time, haskeline, http-api-data, http-types , HUnit, list-t, megaparsec, monad-parallel, MonadRandom, mtl , network, network-transport, network-transport-tcp, old-locale - , optparse-applicative, parallel, path-pieces, QuickCheck, random - , random-shuffle, resourcet, rset, scotty, semigroups, stm - , stm-containers, template-haskell, temporary, text, time - , transformers, unix, unordered-containers, uuid, vector - , vector-binary-instances, websockets, zlib + , optparse-applicative, parallel, path-pieces, QuickCheck + , quickcheck-instances, random, random-shuffle, resourcet, rset + , scotty, semigroups, stm, stm-containers, template-haskell + , temporary, text, time, transformers, unix, unordered-containers + , uuid, vector, vector-binary-instances, websockets, zlib }: mkDerivation { pname = "project-m36"; - version = "0.5"; - sha256 = "0k9px4f4yn6fgzc7zaig33w4nqnjgrmizbmmq11yg76gk08f7mv1"; + version = "0.5.1"; + sha256 = "1i3g6x3447hy1df6kzh8afpp366lzi9jspqzwi7gjkhkqhxxc94q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167203,10 +167324,10 @@ self: { filepath foldl ghc ghc-boot ghc-paths ghci Glob gnuplot hashable hashable-time haskeline http-api-data list-t monad-parallel MonadRandom mtl network-transport network-transport-tcp old-locale - optparse-applicative parallel path-pieces QuickCheck random-shuffle - resourcet rset semigroups stm stm-containers temporary text time - transformers unix unordered-containers uuid vector - vector-binary-instances zlib + optparse-applicative parallel path-pieces QuickCheck + quickcheck-instances random-shuffle resourcet rset semigroups stm + stm-containers temporary text time transformers unix + unordered-containers uuid vector vector-binary-instances zlib ]; executableHaskellDepends = [ aeson attoparsec base base64-bytestring binary blaze-html @@ -173469,6 +173590,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_3" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.3"; + sha256 = "02g14vv4qbzq9vakkr55960r386jmkivgm5ld782b1bqyvpfsfh7"; + revision = "1"; + editedCabalFile = "1yz51pghns6xanzdnlkagghpzwnkl7wjqnqcp5gs0zs1iywrbl45"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -175111,8 +175256,8 @@ self: { }: mkDerivation { pname = "regexdot"; - version = "0.12.1.0"; - sha256 = "11hv0mc48y42dz0bjfcvjxjxcbag33kvdc2gxbx0lsgyb4lm0q8j"; + version = "0.12.2.0"; + sha256 = "12vbdljm38nnl76byik6fzar51v0nyjm1dp4ky8fh16f5ghnm5b8"; libraryHaskellDepends = [ base data-default deepseq extra parallel parsec toolshed ]; @@ -175990,10 +176135,8 @@ self: { }: mkDerivation { pname = "repa"; - version = "3.4.1.3"; - sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy"; - revision = "2"; - editedCabalFile = "0kmypfnpzjszdzhpd1lskp0plja8zyr8r2y9xyscx4g5md9hh0zp"; + version = "3.4.1.4"; + sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -176005,10 +176148,8 @@ self: { ({ mkDerivation, base, repa, vector }: mkDerivation { pname = "repa-algorithms"; - version = "3.4.1.2"; - sha256 = "11lqq5j4g7p1dd47y65mfhzfsj8r27h7qj6qpc43g7kmf7h9gd87"; - revision = "1"; - editedCabalFile = "1dj9gq4v9y8818d5vx2zlsdl4fspwi4aywfbminr7dvlljhf415k"; + version = "3.4.1.3"; + sha256 = "1bhg1vr85j9mqm9lg1577dvlgzdbkh9f48h0ll6h03jfw7knyn6y"; libraryHaskellDepends = [ base repa vector ]; description = "Algorithms using the Repa array library"; license = stdenv.lib.licenses.bsd3; @@ -176092,10 +176233,8 @@ self: { }: mkDerivation { pname = "repa-examples"; - version = "3.4.1.1"; - sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039"; - revision = "3"; - editedCabalFile = "0vdzcx1fixvgqzmjxra8gfwhzs56qdrzixscq074sddv7jh5iz2f"; + version = "3.4.1.2"; + sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -176153,8 +176292,8 @@ self: { pname = "repa-io"; version = "3.4.1.1"; sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm"; - revision = "2"; - editedCabalFile = "0zslqm87abzrsbrw2dlnsmm8jnpvg7ldi2d83d7p5sih78ksfmmm"; + revision = "3"; + editedCabalFile = "027vn7an0hm3ysnzk19y0dbjpah0wpg96dgb55149x1310vwybxl"; libraryHaskellDepends = [ base binary bmp bytestring old-time repa vector ]; @@ -176703,8 +176842,8 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.2.2"; - sha256 = "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks"; + version = "1.3"; + sha256 = "16c5r69shz9zg01awjpwh7jpw3hqy81p4hh22rwdm0scdc45n5fa"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -177238,8 +177377,8 @@ self: { }: mkDerivation { pname = "restless-git"; - version = "0.6"; - sha256 = "1apg2vd6yw1m02i6fd2m2i6kw08dhds93ky7ncm4psj95wwkw2al"; + version = "0.7"; + sha256 = "0r344f4q9bvqfrh1ls1g90xq7r1p30anwhnwjckz5v26idiynxy3"; libraryHaskellDepends = [ base bytestring clock containers HSH text time ]; @@ -179409,16 +179548,12 @@ self: { }) {}; "rss" = callPackage - ({ mkDerivation, base, HaXml, network, network-uri, old-locale - , time - }: + ({ mkDerivation, base, HaXml, network, network-uri, time }: mkDerivation { pname = "rss"; - version = "3000.2.0.6"; - sha256 = "03crzmi9903w6xsdc00wd9jhsr41b8pglz9n502h68w3jkm6zr4d"; - libraryHaskellDepends = [ - base HaXml network network-uri old-locale time - ]; + version = "3000.2.0.7"; + sha256 = "0z48xb610k1h29rg03q19y08fp78agxp2gr48innw5y3rz00s6ym"; + libraryHaskellDepends = [ base HaXml network network-uri time ]; description = "A library for generating RSS 2.0 feeds."; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -180605,8 +180740,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "1.0.4"; - sha256 = "0q9z7smss3lf33lq982ghrq8dhv71cppc73zi61b22f0b076njvd"; + version = "1.0.6"; + sha256 = "1vgpj0yg27n6hw1gb763hgxv99hpq7511n2ihys0qdi0ri8bpj1j"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Semantic version numbers and constraints"; @@ -184402,6 +184537,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-server_0_4_1_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, bytestring-conversion, case-insensitive, cookie + , crypto-api, data-default-class, entropy, hspec, hspec-discover + , http-api-data, http-client, http-types, jose, lens, lens-aeson + , markdown-unlit, monad-time, mtl, QuickCheck, servant + , servant-auth, servant-server, tagged, text, time, transformers + , unordered-containers, wai, warp, wreq + }: + mkDerivation { + pname = "servant-auth-server"; + version = "0.4.1.0"; + sha256 = "1fxh50fjrdi5j88qs2vsrflqdwq3pc8s5h424nhjrpc24w277bqi"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy http-api-data http-types jose lens + monad-time mtl servant servant-auth servant-server tagged text time + unordered-containers wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive hspec http-client http-types + jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth + servant-server time transformers wai warp wreq + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "servant-server/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-swagger" = callPackage ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck , servant, servant-auth, servant-swagger, swagger2, text @@ -187688,6 +187854,8 @@ self: { pname = "shell-monad"; version = "0.6.4"; sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13"; + revision = "1"; + editedCabalFile = "0hm3nlr9a3n18f7y0pnw4q4x3s8y1jxz9mify7hplpj2fq23wpdm"; libraryHaskellDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -188981,6 +189149,8 @@ self: { pname = "simple-pipe"; version = "0.0.0.29"; sha256 = "0ilc781520h1x65x3cqdzp2067g7rf7vdlnss8wsg2x1f5cxs6yh"; + revision = "1"; + editedCabalFile = "1bp8dwhympy43g43496vgp6dclbfjibdwgqsild681bn83yprsdz"; libraryHaskellDepends = [ base bytestring lifted-base monad-control monads-tf stm transformers-base @@ -195894,8 +196064,8 @@ self: { }: mkDerivation { pname = "stacked-dag"; - version = "0.1.0.4"; - sha256 = "067dbhap8aras9ixrmsaw961mlnq9fd3qyksfi8gj1zld0kxbp7k"; + version = "0.1.1.0"; + sha256 = "0bvifa45dlqnyybydi5lbwhhnkqv1bvjdp6fvsmjnsf7mi5m0fq3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers graphviz text ]; @@ -197014,6 +197184,8 @@ self: { pname = "stm-lifted"; version = "0.1.1.0"; sha256 = "1xp3cfpkhkhpva170vwwrwqm0spwm2g778s98gwbil24icx0p32c"; + revision = "1"; + editedCabalFile = "0mh0gdfwky4qxyhxrysqj1sr913pffvf420mf8cl9i53fsx4f255"; libraryHaskellDepends = [ base stm transformers ]; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; @@ -197715,10 +197887,8 @@ self: { }: mkDerivation { pname = "streaming"; - version = "0.2.1.0"; - sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1"; - revision = "2"; - editedCabalFile = "124nccw28cwzjzl82anbwk7phcyfzlz8yx6wyl4baymzdikvbpgq"; + version = "0.2.2.0"; + sha256 = "04fdw4f51yb16bv3b7z97vqxbns8rv2ag2aphglm29jsd527fsss"; libraryHaskellDepends = [ base containers ghc-prim mmorph mtl semigroups transformers transformers-base @@ -197956,6 +198126,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-fft" = callPackage + ({ mkDerivation, base, contiguous-fft, ghc-prim, prim-instances + , primitive, streaming + }: + mkDerivation { + pname = "streaming-fft"; + version = "0.1.0.0"; + sha256 = "1qphhbap1va897ghcr8v4d3nnpcb4w0b422d24isz8rg138m99wi"; + libraryHaskellDepends = [ + base contiguous-fft ghc-prim prim-instances primitive streaming + ]; + description = "online streaming fft"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "streaming-histogram" = callPackage ({ mkDerivation, base, containers, criterion, tasty, tasty-hunit , tasty-quickcheck @@ -198413,8 +198598,8 @@ self: { }: mkDerivation { pname = "strict-types"; - version = "0.1.2"; - sha256 = "0yapmsia9lmgjgvmcpk9m1z6gc63qic6vvnmnxvmh2k9887n41li"; + version = "0.1.3"; + sha256 = "0rkycz6fxwqnx5lz3ycmd29402iw8p4896lrmwksphqyl957c0ks"; libraryHaskellDepends = [ array base bytestring containers deepseq hashable text unordered-containers vector @@ -199529,32 +199714,6 @@ self: { }) {}; "summoner" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory - , filepath, generic-deriving, hedgehog, neat-interpolation - , optparse-applicative, process, relude, tasty, tasty-discover - , tasty-hedgehog, text, time, tomland - }: - mkDerivation { - pname = "summoner"; - version = "1.0.6"; - sha256 = "0sb877846l34qp2cjl7gayb517fi5igf9vcmksryasnjxlbhs7vx"; - revision = "1"; - editedCabalFile = "08rzxxxfzf5dip9va8wjqgmar5rlmm0fx3wj3vlx0i6rwqq24maz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring directory filepath - generic-deriving neat-interpolation optparse-applicative process - relude text time tomland - ]; - executableHaskellDepends = [ base relude ]; - testHaskellDepends = [ base hedgehog relude tasty tasty-hedgehog ]; - testToolDepends = [ tasty-discover ]; - description = "Tool for creating completely configured production Haskell projects"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "summoner_1_1_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring , directory, filepath, generic-deriving, gitrev, hedgehog , neat-interpolation, optparse-applicative, process, relude, tasty @@ -199580,7 +199739,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Tool for creating completely configured production Haskell projects"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sump" = callPackage @@ -201800,6 +201958,8 @@ self: { pname = "tabl"; version = "1.0.3"; sha256 = "1pxh6g1xjbp37fsab3hl2ldrpnbxdnp4s7pcr3mqxv62qi9b3m2f"; + revision = "1"; + editedCabalFile = "15zmgsylfmm8pf355i0ph1dcczy0z6jw0d9dh4xfmfba8ailvcdg"; libraryHaskellDepends = [ base safe text ]; description = "Table layout"; license = "unknown"; @@ -205551,7 +205711,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-builder_0_6_3" = callPackage + "text-builder_0_6_4" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , deferred-folds, QuickCheck, quickcheck-instances, rerebase , semigroups, tasty, tasty-hunit, tasty-quickcheck, text @@ -205559,8 +205719,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.6.3"; - sha256 = "00i0p155sfii0pl3300xa4af57nhhcz690qr0drwby34xqjy2c1z"; + version = "0.6.4"; + sha256 = "0s3rphrp9d3pbagmlzz3xdm4fym38j8vg55wlqw1j1pkbdvm2cgg"; libraryHaskellDepends = [ base base-prelude bytestring deferred-folds semigroups text transformers @@ -206062,8 +206222,8 @@ self: { }: mkDerivation { pname = "text-replace"; - version = "0.0.0.3"; - sha256 = "0dj024y7qmkmv31n5h6li6wna3gpayr5gmyl6jiiiprdvild2i1n"; + version = "0.0.0.4"; + sha256 = "18hiy0d18wxh8v4zd6vg69fwd8vp9b2yd3ngf04yh9y1bl8wwwhb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -206109,8 +206269,8 @@ self: { pname = "text-show"; version = "3.7.4"; sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry"; - revision = "1"; - editedCabalFile = "0002han9bgcc8m64a3k5wgfmzlma4j3qxqd7m2illyza19hijsj9"; + revision = "2"; + editedCabalFile = "10hmmrm5qjc1lhrqgbh7yyyij9v0rpsv9fakynm5myfcc2ayif82"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -206130,6 +206290,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show_3_7_5" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers + , contravariant, criterion, deepseq, deriving-compat + , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover + , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups + , tagged, template-haskell, text, th-abstraction, th-lift + , transformers, transformers-compat, void + }: + mkDerivation { + pname = "text-show"; + version = "3.7.5"; + sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers contravariant generic-deriving + ghc-boot-th ghc-prim integer-gmp nats semigroups tagged + template-haskell text th-abstraction th-lift transformers + transformers-compat void + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + nats QuickCheck quickcheck-instances semigroups tagged + template-haskell text transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -206166,6 +206359,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-show-instances_3_7" = callPackage + ({ mkDerivation, base, base-compat-batteries, bifunctors, binary + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hpc, hspec, hspec-discover, old-locale, old-time + , pretty, QuickCheck, quickcheck-instances, random, semigroups + , tagged, template-haskell, terminfo, text, text-show, th-orphans + , time, transformers, transformers-compat, unix + , unordered-containers, vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.7"; + sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c"; + libraryHaskellDepends = [ + base base-compat-batteries bifunctors binary containers directory + ghc-boot-th haskeline hpc old-locale old-time pretty random + semigroups tagged template-haskell terminfo text text-show time + transformers transformers-compat unix unordered-containers vector + xhtml + ]; + testHaskellDepends = [ + base base-compat-batteries bifunctors binary containers directory + generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec + old-locale old-time pretty QuickCheck quickcheck-instances random + tagged template-haskell terminfo text-show th-orphans time + transformers transformers-compat unix unordered-containers vector + xhtml + ]; + testToolDepends = [ hspec-discover ]; + description = "Additional instances for text-show"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -207421,17 +207648,17 @@ self: { "threepenny-editors" = callPackage ({ mkDerivation, base, bifunctors, casing, containers, generics-sop - , profunctors, text, threepenny-gui + , profunctors, semigroups, text, threepenny-gui }: mkDerivation { pname = "threepenny-editors"; - version = "0.5.6"; - sha256 = "0gnbzf3a3xykkf8xc5bnn1wznszyrnllf5s6cb4gqz6cbqnf2mnw"; + version = "0.5.6.1"; + sha256 = "0x6x4cfs52lwdcxjyqirrb8ka5pm40l89xsxaz9vvz44hmixqjrj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors text - threepenny-gui + base bifunctors casing containers generics-sop profunctors + semigroups text threepenny-gui ]; description = "Composable algebraic editors"; license = stdenv.lib.licenses.bsd3; @@ -207954,6 +208181,8 @@ self: { pname = "tighttp"; version = "0.0.0.10"; sha256 = "0q0177nm71c6sl7qdw0za740m52bhqavkn4b7f6dxwvfw15icxdz"; + revision = "1"; + editedCabalFile = "077s20c7cl29h65v5sgh4df5r41574srll20r6cmbdbb339jr4nr"; libraryHaskellDepends = [ base bytestring handle-like monads-tf old-locale papillon simple-pipe time @@ -209656,6 +209885,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "toodles" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, cmdargs + , directory, filepath, http-types, megaparsec, MissingH + , regex-posix, servant, servant-blaze, servant-server, strict, text + , transformers, wai, warp, yaml + }: + mkDerivation { + pname = "toodles"; + version = "0.1.0.0"; + sha256 = "0hbmnyym6hrwvacc783hl7s26yqbw8vcify4vna0mmp8y67rwjfx"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base blaze-html bytestring cmdargs directory filepath + http-types megaparsec MissingH regex-posix servant servant-blaze + servant-server strict text transformers wai warp yaml + ]; + description = "Manage the TODO entries in your code"; + license = stdenv.lib.licenses.mit; + }) {}; + "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq , directory, extra, filepath, HUnit, QuickCheck, random @@ -211898,8 +212148,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.11"; - sha256 = "19jn9k70qwhdlzkm8kq1jq37i8ck3q4fnkzn1x75prwhs60rgr0f"; + version = "1.5.12"; + sha256 = "0hacgsgs64fgp8k562gyly8i19zz18fj0v1v2m5g26vaj356ys5k"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -213449,21 +213699,6 @@ self: { }) {}; "typelits-witnesses" = callPackage - ({ mkDerivation, base, base-compat, constraints, reflection - , transformers - }: - mkDerivation { - pname = "typelits-witnesses"; - version = "0.3.0.2"; - sha256 = "0k76ir1c6ga44cj3qmjcsnikzz2nnb2kyzkcirb3ila7yfgwc9kf"; - libraryHaskellDepends = [ - base base-compat constraints reflection transformers - ]; - description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "typelits-witnesses_0_3_0_3" = callPackage ({ mkDerivation, base, constraints, reflection }: mkDerivation { pname = "typelits-witnesses"; @@ -213472,7 +213707,6 @@ self: { libraryHaskellDepends = [ base constraints reflection ]; description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typenums" = callPackage @@ -216034,8 +216268,8 @@ self: { ({ mkDerivation, base, parsec, safe, utf8-string }: mkDerivation { pname = "uri"; - version = "0.1.6.4"; - sha256 = "02g49smrq4j3wnk4f9w73a80fxva4rrlgw9jqw6p8cqxrb9x6359"; + version = "0.1.6.5"; + sha256 = "0gfv54ys1h4ac3dhaypnpnm4w781857n2k8680jflnjbkqlandrr"; libraryHaskellDepends = [ base parsec safe utf8-string ]; description = "Library for working with URIs"; license = stdenv.lib.licenses.bsd3; @@ -217417,6 +217651,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_8_0_0" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.8.0.0"; + sha256 = "0yr342gd8ylji7nqa8w3ssik8qcgb4v3h3j30qf5nbzg900k5rsn"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -217701,16 +217948,16 @@ self: { }) {}; "varying" = callPackage - ({ mkDerivation, base, criterion, hspec, QuickCheck, time - , transformers + ({ mkDerivation, base, contravariant, criterion, hspec, QuickCheck + , time, transformers }: mkDerivation { pname = "varying"; - version = "0.7.0.3"; - sha256 = "0283cjsl7siyjyvppwpss5nc5jwy0lfx47d0sndqy3dksvx1gm3c"; + version = "0.7.1.0"; + sha256 = "0lb76yqhb6jyfi046cy0axadi10n2h155dhi9c8sqrlwyc0n7hlx"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base transformers ]; + libraryHaskellDepends = [ base contravariant transformers ]; executableHaskellDepends = [ base time transformers ]; testHaskellDepends = [ base hspec QuickCheck time transformers ]; benchmarkHaskellDepends = [ base criterion time transformers ]; @@ -218125,16 +218372,14 @@ self: { }: mkDerivation { pname = "vector-binary-instances"; - version = "0.2.4"; - sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb"; - revision = "1"; - editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i"; + version = "0.2.5"; + sha256 = "0l9zj58a4sbpic1dc9if7iwv4rihya2bj4zb4qfna5fb3pf6plwc"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; benchmarkHaskellDepends = [ base binary bytestring criterion deepseq vector ]; - description = "Instances of Data.Binary and Data.Serialize for vector"; + description = "Instances of Data.Binary for vector"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -218403,14 +218648,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-space_0_14" = callPackage + "vector-space_0_15" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.14"; - sha256 = "1kfziqdnsjr540y8iajpfmdkarhmjnc5xm897bswjhrpgyh2k6h3"; - revision = "2"; - editedCabalFile = "0rz23fkpx6fgn3pjmmnz0mj5iyq70wv4j9z0c4c9ar7g72dalch7"; + version = "0.15"; + sha256 = "03swlbn0x8gfb7bilxmh3zckprjc6v64bildmhwzlimjvd1v8jb8"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -221807,6 +222050,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weak-bag" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "weak-bag"; + version = "0.1.0.0"; + sha256 = "0jh5xv02wlifjqdvm2cr9mi3wjj4f14s1ap5pphin2rdzklhl3rc"; + libraryHaskellDepends = [ base containers ]; + description = "Mutable bag backed by weak pointers to each item"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "weather-api" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, HTTP, network , network-uri, utf8-string, vector @@ -223208,24 +223462,6 @@ self: { }) {}; "wild-bind" = callPackage - ({ mkDerivation, base, containers, hspec, microlens, QuickCheck - , semigroups, stm, text, transformers - }: - mkDerivation { - pname = "wild-bind"; - version = "0.1.2.2"; - sha256 = "0s1hwgc1fzr2mgls6na6xsc51iw8xp11ydwgwcaqq527gcij101p"; - libraryHaskellDepends = [ - base containers semigroups text transformers - ]; - testHaskellDepends = [ - base hspec microlens QuickCheck stm transformers - ]; - description = "Dynamic key binding framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind_0_1_2_3" = callPackage ({ mkDerivation, base, containers, hspec, microlens, QuickCheck , semigroups, stm, text, transformers }: @@ -223241,7 +223477,6 @@ self: { ]; description = "Dynamic key binding framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-indicator" = callPackage @@ -223277,25 +223512,6 @@ self: { }) {}; "wild-bind-x11" = callPackage - ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl - , semigroups, stm, text, time, transformers, wild-bind, X11 - }: - mkDerivation { - pname = "wild-bind-x11"; - version = "0.2.0.5"; - sha256 = "0r9nlv96f1aavigd70r33q11a125kn3zah17z5vvsjlw55br0wxy"; - libraryHaskellDepends = [ - base containers fold-debounce mtl semigroups stm text transformers - wild-bind X11 - ]; - testHaskellDepends = [ - async base hspec text time transformers wild-bind X11 - ]; - description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind-x11_0_2_0_6" = callPackage ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl , semigroups, stm, text, time, transformers, wild-bind, X11 }: @@ -223312,7 +223528,6 @@ self: { ]; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wilton-ffi" = callPackage @@ -226606,8 +226821,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.28"; - sha256 = "1xh87asg8y35srvp7d3gyyy4bkxsw122liihxgzgm8pqv2z3h4zd"; + version = "0.28.1"; + sha256 = "1zrpvr1nr6a55sxmjbacacflrxvnw6aibsdal19wx404r74qjgz5"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -227357,6 +227572,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yak" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec, lens + , template-haskell, text, time + }: + mkDerivation { + pname = "yak"; + version = "0.1.0.0"; + sha256 = "1zw522pijmad87986m663myzfkvm40y7w3g04z0f67yfzby4s19a"; + libraryHaskellDepends = [ + attoparsec base bytestring lens template-haskell text time + ]; + testHaskellDepends = [ base bytestring hspec ]; + description = "A strongly typed IRC library"; + license = stdenv.lib.licenses.mit; + }) {}; + "yall" = callPackage ({ mkDerivation, base, categories, transformers }: mkDerivation { @@ -228471,23 +228702,6 @@ self: { }) {}; "yesod-auth-fb" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit - , resourcet, shakespeare, text, time, transformers, unliftio, wai - , yesod-auth, yesod-core, yesod-fb - }: - mkDerivation { - pname = "yesod-auth-fb"; - version = "1.9.0"; - sha256 = "1hj6xb7rv28dz8jzygckqg5m5igy78zx0gpc6zmp7g5j0dvinxg8"; - libraryHaskellDepends = [ - aeson base bytestring conduit fb http-conduit resourcet shakespeare - text time transformers unliftio wai yesod-auth yesod-core yesod-fb - ]; - description = "Authentication backend for Yesod using Facebook"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yesod-auth-fb_1_9_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit , resourcet, shakespeare, text, time, transformers, unliftio, wai , yesod-auth, yesod-core, yesod-fb @@ -228502,7 +228716,6 @@ self: { ]; description = "Authentication backend for Yesod using Facebook"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-hashdb" = callPackage @@ -228932,6 +229145,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_7" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, byteable, bytestring, case-insensitive, cereal + , clientsession, conduit, conduit-extra, containers, cookie + , deepseq, fast-logger, gauge, hspec, hspec-expectations + , http-types, HUnit, monad-logger, mtl, network, parsec + , path-pieces, primitive, random, resourcet, rio, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , unix-compat, unliftio, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.7"; + sha256 = "0smjkfidavm1iggdi4wd47ykbx7jw1qknj6glyjq8cc3p75zc3w7"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup byteable bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types monad-logger mtl + parsec path-pieces primitive random resourcet rio shakespeare + template-haskell text time transformers unix-compat unliftio + unordered-containers vector wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -230309,8 +230559,8 @@ self: { }: mkDerivation { pname = "yet-another-logger"; - version = "0.3.0"; - sha256 = "0j58lamn7rxvkl0nha9mqpykwiklfg2hj9rm1cxfjlxciz1wg0ri"; + version = "0.3.1"; + sha256 = "1dbwrkya2c7wf5ccsvhnk7isc90pp7vwi8ff6yq15vsn4jbirpsq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From b5f43fa04e0f291f83745b1d7592fd037c211d67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2018 18:39:32 +0200 Subject: [PATCH 265/992] all-cabal-hashes: update to Hackage at 2018-10-08T09:07:42Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 3126269a6e7a..079fccadfcb1 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3715ae81be1a8e0c6a1cb5902c054b6cedfb7f41.tar.gz"; - sha256 = "05bsk99d4k2nq8dfiagpby0cllx19crzn2rh29v26p0irzagrqfb"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/70f02ad82349a18e1eff41eea4949be532486f7b.tar.gz"; + sha256 = "1ajqybsl8hfzbhziww57zp9a8kgypj96ngxrargk916v3xpf3x15"; } From a6955ad37a2ed3bab7396b64430765bb8a0a6cee Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 8 Oct 2018 19:02:47 +0200 Subject: [PATCH 266/992] scdoc: Switch to fetchgit because the archive is unavailable The Git repository is still accessible but the webpage [0] and the download link [1] currently return "404 Not Found". [0]: https://git.sr.ht/~sircmpwn/scdoc/ [1]: https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz --- pkgs/tools/typesetting/scdoc/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index bdf074b558e7..225e360b8d34 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { name = "scdoc-${version}"; version = "1.4.2"; - src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz"; - sha256 = "1hhvg9cifx1v8b5i91lgq5cjdcskzl3rz7vwmwdq7ad0nqnykz82"; + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/scdoc"; + rev = version; + sha256 = "00a23kw8d36qik6h5kds13pzfnr58krlblfh9n2f0rldf0m9ldk1"; }; postPatch = '' From 203903343f982d80a372028b9fc897e1294482cf Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 8 Oct 2018 19:11:15 +0200 Subject: [PATCH 267/992] scdoc: 1.4.2 -> 1.5.1 --- pkgs/tools/typesetting/scdoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 225e360b8d34..3a4c7813c695 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "scdoc-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/scdoc"; rev = version; - sha256 = "00a23kw8d36qik6h5kds13pzfnr58krlblfh9n2f0rldf0m9ldk1"; + sha256 = "0fm3x6ma1pzlajfcy32ayqrcab8lwl64nxfaqgc6019mxw87y1ja"; }; postPatch = '' From 9e502600ba88f237f6973d6c0582eac61d77f102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 8 Oct 2018 18:45:33 +0100 Subject: [PATCH 268/992] stack2nix: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 409f159387fd..8ff6aed506f2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1074,6 +1074,10 @@ self: super: { hpack = self.hpack_0_31_0; yaml = self.yaml_0_10_2_0; }); + stack2nix = super.stack2nix.overrideScope (self: super: { + hpack = self.hpack_0_31_0; + yaml = self.yaml_0_10_2_0; + }); # Break out of "aeson <1.3, temporary <1.3". stack = doJailbreak super.stack; From de2f79467d20bd524c915c171cf3c5d381056851 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Mon, 8 Oct 2018 07:06:31 -0700 Subject: [PATCH 269/992] rapidcheck: init at unstable-2018-09-27 rapidcheck is a C++ property-based testing framework inspired by QuickCheck Signed-off-by: William Casarin --- .../libraries/rapidcheck/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/rapidcheck/default.nix diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix new file mode 100644 index 000000000000..9d8ce8cef202 --- /dev/null +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -0,0 +1,27 @@ +{ stdenv, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec{ + name = "rapidcheck-${version}"; + version = "unstable-2018-09-27"; + + src = fetchFromGitHub { + owner = "emil-e"; + repo = "rapidcheck"; + rev = "de54478fa35c0d9cea14ec0c5c9dfae906da524c"; + sha256 = "0n8l0mlq9xqmpkgcj5xicicd1my2cfwxg25zdy8347dqkl1ppgbs"; + }; + + nativeBuildInputs = [ cmake ]; + + postInstall = '' + cp ../extras/boost_test/include/rapidcheck/boost_test.h $out/include/rapidcheck + ''; + + meta = with stdenv.lib; { + description = "A C++ framework for property based testing inspired by QuickCheck"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ jb55 ]; + license = licenses.bsd2; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2548afe22f58..b0e88d39a3a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11958,6 +11958,8 @@ with pkgs; rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + rapidcheck = callPackage ../development/libraries/rapidcheck {}; + rapidjson = callPackage ../development/libraries/rapidjson {}; raul = callPackage ../development/libraries/audio/raul { }; From fe8515de6e8ac33b94917869c668e55a8617eef8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 8 Oct 2018 21:37:27 +0300 Subject: [PATCH 270/992] asymptote: apply upstream patch for compatibility with a newer boehmgc As referenced in https://github.com/NixOS/nixpkgs/pull/45708#issuecomment-427840944 --- pkgs/tools/graphics/asymptote/default.nix | 11 ++++++++++- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a0bf0a434471..102ffae5f9d0 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl +{stdenv, fetchurl, fetchpatch , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz @@ -33,6 +33,15 @@ stdenv.mkDerivation { inherit (s) url sha256; }; + patches = [ + # Remove when updating from 2.47 to 2.48 + # Compatibility with BoehmGC 7.6.8 + (fetchpatch { + url = "https://github.com/vectorgraphics/asymptote/commit/38a59370dc5ac720c29e1424614a10f7384b943f.patch"; + sha256 = "0c3d11hzxxaqh24kfw9y8zvlid54kk40rx2zajx7jwl12gga05s1"; + }) + ]; + preConfigure = '' export HOME="$PWD" patchShebangs . diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22ae50b68663..5b97cd827968 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -569,7 +569,6 @@ with pkgs; asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; }; gsl = gsl_1; - boehmgc = boehmgc_766; }; atomicparsley = callPackage ../tools/video/atomicparsley { }; From 3ae9bf6d0e715be438a2f321784c55cd858d5af0 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Mon, 8 Oct 2018 14:13:26 -0400 Subject: [PATCH 271/992] v42lloopback: 0.11 -> 0.12 --- pkgs/os-specific/linux/v4l2loopback/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 3db2814a0878..2e22b99a95f3 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "v4l2loopback-${version}-${kernel.version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; rev = "v${version}"; - sha256 = "1wb5qmy13w8rl4279bwp69s4sb1x5hk5d2n563p1yk8yi567p2az"; + sha256 = "1rf8dvabksxb2sj14j32h7n7pw7byqfnpqs4m4afj3398y9y23c4"; }; hardeningDisable = [ "format" "pic" ]; From df63fd1627e2906991a71e984a70990105acbaeb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 8 Oct 2018 20:40:15 +0200 Subject: [PATCH 272/992] limesuite: 18.06.0->18.10.0 --- pkgs/applications/misc/limesuite/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix index 070073ea3e2c..e1cdc4a0f863 100644 --- a/pkgs/applications/misc/limesuite/default.nix +++ b/pkgs/applications/misc/limesuite/default.nix @@ -4,7 +4,7 @@ } : let - version = "18.06.0"; + version = "18.10.0"; in stdenv.mkDerivation { name = "limesuite-${version}"; @@ -13,9 +13,11 @@ in stdenv.mkDerivation { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "0j6mxlvij2k6ib1d9jwzvilmqgm1h0q7wy9sf8a6bvidwlphvy25"; + sha256 = "0nbyvcdwvfvln1wic9qwb7y221v3jv454gp5v6ms9112a41zj46h"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -36,10 +38,6 @@ in stdenv.mkDerivation { mkdir -p $out/share/limesuite cp bin/Release/lms7suite_mcu/* $out/share/limesuite - - cp bin/dualRXTX $out/bin - cp bin/basicRX $out/bin - cp bin/singleRX $out/bin ''; meta = with stdenv.lib; { From a29f2f20cd2deabccd3d0352504f828c8b7805a3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 18:43:49 -0700 Subject: [PATCH 273/992] libbsd: 0.8.7 -> 0.9.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from libbsd --- pkgs/development/libraries/libbsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 36410e842a5d..b304b73e7e03 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libbsd-${version}"; - version = "0.8.7"; + version = "0.9.1"; src = fetchurl { url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m"; + sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n"; }; # darwin changes configure.ac which means we need to regenerate From cf1f8b2d0492d21a04aa0b2832be352ea9480b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Mon, 8 Oct 2018 21:09:59 +0200 Subject: [PATCH 274/992] camlp5: remove old version 5.15 --- pkgs/development/tools/ocaml/camlp5/5.15.nix | 46 -------------------- pkgs/top-level/ocaml-packages.nix | 12 ----- 2 files changed, 58 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/camlp5/5.15.nix diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix deleted file mode 100644 index 2e03bb8025ef..000000000000 --- a/pkgs/development/tools/ocaml/camlp5/5.15.nix +++ /dev/null @@ -1,46 +0,0 @@ -{stdenv, fetchurl, ocaml, transitional ? false}: - -let - pname = "camlp5"; - webpage = http://pauillac.inria.fr/~ddr/camlp5/; - metafile = ./META; -in - -assert !stdenv.lib.versionOlder "4.00" ocaml.version; - -stdenv.mkDerivation rec { - - name = "${pname}${if transitional then "_transitional" else ""}-${version}"; - version = "5.15"; - - src = fetchurl { - url = "${webpage}/distrib/src/${pname}-${version}.tgz"; - sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq"; - }; - - buildInputs = [ ocaml ]; - - prefixKey = "-prefix "; - - preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") + - " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)"; - - buildFlags = "world.opt"; - - postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META"; - - meta = { - description = "Preprocessor-pretty-printer for OCaml"; - longDescription = '' - Camlp5 is a preprocessor and pretty-printer for OCaml programs. - It also provides parsing and printing tools. - ''; - homepage = "${webpage}"; - license = stdenv.lib.licenses.bsd3; - branch = "5"; - platforms = ocaml.meta.platforms or []; - maintainers = [ - stdenv.lib.maintainers.z77z - ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7de4bf3fad40..429f9d3155f4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -88,18 +88,6 @@ let then callPackage ../development/tools/ocaml/camlp4 { } else null; - camlp5_old_strict = - if lib.versionOlder "4.00" ocaml.version - then camlp5_6_strict - else callPackage ../development/tools/ocaml/camlp5/5.15.nix { }; - - camlp5_old_transitional = - if lib.versionOlder "4.00" ocaml.version - then camlp5_6_transitional - else callPackage ../development/tools/ocaml/camlp5/5.15.nix { - transitional = true; - }; - camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { }; camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 { From 3d683f33f342a70eb8f03a7077a32ff3cf84e440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Mon, 8 Oct 2018 21:10:04 +0200 Subject: [PATCH 275/992] ocamlPackages_3_08_0: remove --- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92a0f2b45709..682562bfd7b8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -348,7 +348,6 @@ mapAliases ({ gst-ffmpeg = pkgs.gst-ffmpeg; }; } // (with ocaml-ng; { # added 2016-09-14 - ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml; ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml; ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml; ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 429f9d3155f4..be49095dbd47 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1065,8 +1065,6 @@ in rec inherit mkOcamlPackages; - ocamlPackages_3_08_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.08.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); - ocamlPackages_3_10_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.10.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); ocamlPackages_3_11_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.11.2.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); From 62cf2840bdadeeb5aceee4cd3a1947fb22496335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Mon, 8 Oct 2018 21:10:05 +0200 Subject: [PATCH 276/992] ocamlPackages_3_10_0: remove --- pkgs/top-level/aliases.nix | 3 +-- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 682562bfd7b8..f06044829b4d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -329,7 +329,7 @@ mapAliases ({ callPackage_i686 = pkgsi686Linux.callPackage; inherit (ocaml-ng) # added 2016-09-14 - ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 + ocamlPackages_3_11_2 ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 ocamlPackages_4_03 ocamlPackages_latest; @@ -348,7 +348,6 @@ mapAliases ({ gst-ffmpeg = pkgs.gst-ffmpeg; }; } // (with ocaml-ng; { # added 2016-09-14 - ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml; ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml; ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml; ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index be49095dbd47..026bab235065 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1065,8 +1065,6 @@ in rec inherit mkOcamlPackages; - ocamlPackages_3_10_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.10.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); - ocamlPackages_3_11_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.11.2.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); ocamlPackages_3_12_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.12.1.nix { }) (self: super: { camlimages = self.camlimages_4_0; }); From 34394a38efa222bf37192a0326935c1b066f9541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Mon, 8 Oct 2018 21:10:05 +0200 Subject: [PATCH 277/992] ocamlPackages_3_11_2: remove This requires removing also the Coq 8.3 and Matita 0.5.8 packages. Coq 8.3 was released 8 years ago (2010) and there is no trace left of users of this version (contrary to Coq 8.4, released 2012). It is well over time to remove it. Matita 0.5.8 was released in 2010 and because this version was still used for teaching according to the official website, a legacy release (0.5.9) was released in 5 years later to compile with more recent OCaml libraries. Updating to 0.5.9 (or a more recent version like 0.99.3) should allow getting rid of the dependency on older OCaml but it is hard to test given that the package is already broken before this update. --- pkgs/applications/science/logic/coq/8.3.nix | 82 -- .../science/logic/coq/configure.8.3.patch | 1112 ----------------- .../science/logic/coq/no-codesign.patch | 19 - pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 17 +- pkgs/top-level/coq-packages.nix | 7 - pkgs/top-level/ocaml-packages.nix | 2 - 7 files changed, 14 insertions(+), 1228 deletions(-) delete mode 100644 pkgs/applications/science/logic/coq/8.3.nix delete mode 100644 pkgs/applications/science/logic/coq/configure.8.3.patch delete mode 100644 pkgs/applications/science/logic/coq/no-codesign.patch diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix deleted file mode 100644 index 341267b2cebe..000000000000 --- a/pkgs/applications/science/logic/coq/8.3.nix +++ /dev/null @@ -1,82 +0,0 @@ -# - coqide compilation can be disabled by setting lablgtk to null; -# - The csdp program used for the Micromega tactic is statically referenced. -# However, coq can build without csdp by setting it to null. -# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. - -{ stdenv, lib, make, fetchurl -, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null }: - -assert lib.versionOlder ocaml.version "4"; - -let - version = "8.3pl4"; - buildIde = lablgtk != null; - ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; - idePatch = if buildIde then '' - substituteInPlace scripts/coqmktop.ml --replace \ - "\"-I\"; \"+lablgtk2\"" \ - "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\"" - '' else ""; - csdpPatch = if csdp != null then '' - substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" - substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.search_exe_in_path \"csdp\"" "Some \"${csdp}/bin/csdp\"" - '' else ""; -in - -stdenv.mkDerivation { - name = "coq-${version}"; - - src = fetchurl { - url = "https://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; - sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr"; - }; - - buildInputs = [ make ocaml findlib camlp5 ncurses lablgtk ]; - - prefixKey = "-prefix "; - - preConfigure = '' - configureFlagsArray=( - -opt - -camldir ${ocaml}/bin - -camlp5dir $(ocamlfind query camlp5) - ${ideFlags} - ) - ''; - - buildFlags = "world"; # Debug with "world VERBOSE=1"; - - patches = [ ./configure.8.3.patch ]; - - postPatch = '' - UNAME=$(type -tp uname) - RM=$(type -tp rm) - substituteInPlace configure --replace "/bin/uname" "$UNAME" - substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - ${idePatch} - ${csdpPatch} - ''; - - # This post install step is needed to build ssrcoqide from the ssreflect package - # It could be made optional, but I see little harm in including it in the default - # distribution -- roconnor - # This will likely no longer be necessary for coq >= 8.4. -- roconnor - postInstall = if buildIde then '' - cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/ - '' else ""; - - meta = with stdenv.lib; { - description = "Coq proof assistant"; - longDescription = '' - Coq is a formal proof management system. It provides a formal language - to write mathematical definitions, executable algorithms and theorems - together with an environment for semi-interactive development of - machine-checked proofs. - ''; - homepage = http://coq.inria.fr; - license = licenses.lgpl21; - branch = "8.3"; - maintainers = with maintainers; [ roconnor vbgl ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/science/logic/coq/configure.8.3.patch b/pkgs/applications/science/logic/coq/configure.8.3.patch deleted file mode 100644 index 431cccac4b0b..000000000000 --- a/pkgs/applications/science/logic/coq/configure.8.3.patch +++ /dev/null @@ -1,1112 +0,0 @@ -diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure ---- coq-8.3pl3-orig/configure 2011-12-19 22:57:30.000000000 +0100 -+++ coq-8.3pl3/configure 2012-03-17 16:38:16.000000000 +0100 -@@ -395,7 +395,6 @@ - ocamlyaccexec=$CAMLBIN/ocamlyacc - ocamlmktopexec=$CAMLBIN/ocamlmktop - ocamlmklibexec=$CAMLBIN/ocamlmklib -- camlp4oexec=$CAMLBIN/camlp4o - esac - - if test ! -f "$CAMLC" ; then -@@ -628,7 +627,7 @@ - no) LABLGTKLIB=+lablgtk2 # Pour le message - LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile - yes) LABLGTKLIB="$lablgtkdir" # Pour le message -- LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile -+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile - esac;; - no) LABLGTKINCLUDES="";; - esac -diff -Nuar coq-8.3pl3-orig/configure~ coq-8.3pl3/configure~ ---- coq-8.3pl3-orig/configure~ 1970-01-01 01:00:00.000000000 +0100 -+++ coq-8.3pl3/configure~ 2011-12-19 22:57:30.000000000 +0100 -@@ -0,0 +1,1088 @@ -+#!/bin/sh -+ -+################################## -+# -+# Configuration script for Coq -+# -+################################## -+ -+VERSION=8.3pl3 -+VOMAGIC=08300 -+STATEMAGIC=58300 -+DATE=`LANG=C date +"%B %Y"` -+ -+# Create the bin/ directory if non-existent -+test -d bin || mkdir bin -+ -+# a local which command for sh -+which () { -+IFS=":" # set words separator in PATH to be ':' (it allows spaces in dirnames) -+for i in $PATH; do -+ if test -z "$i"; then i=.; fi -+ if [ -f "$i/$1" ] ; then -+ IFS=" " -+ echo "$i/$1" -+ break -+ fi -+done -+} -+ -+usage () { -+ printf "Available options for configure are:\n" -+ echo "-help" -+ printf "\tDisplays this help page\n" -+ echo "-prefix " -+ printf "\tSet installation directory to \n" -+ echo "-local" -+ printf "\tSet installation directory to the current source tree\n" -+ echo "-coqrunbyteflags" -+ printf "\tSet link flags for VM-dependent bytecode (coqtop)\n" -+ echo "-coqtoolsbyteflags" -+ printf "\tSet link flags for VM-independant bytecode (coqdep, coqdoc, ...)\n" -+ echo "-custom" -+ printf "\tGenerate all bytecode executables with -custom (not recommended)\n" -+ echo "-src" -+ printf "\tSpecifies the source directory\n" -+ echo "-bindir" -+ echo "-libdir" -+ echo "-mandir" -+ echo "-docdir" -+ printf "\tSpecifies where to install bin/lib/man/doc files resp.\n" -+ echo "-emacslib" -+ echo "-emacs" -+ printf "\tSpecifies where emacs files are to be installed\n" -+ echo "-coqdocdir" -+ printf "\tSpecifies where Coqdoc style files are to be installed\n" -+ echo "-camldir" -+ printf "\tSpecifies the path to the OCaml library\n" -+ echo "-lablgtkdir" -+ printf "\tSpecifies the path to the Lablgtk library\n" -+ echo "-camlp5dir" -+ printf "\tSpecifies where to look for the Camlp5 library and tells to use it\n" -+ echo "-arch" -+ printf "\tSpecifies the architecture\n" -+ echo "-opt" -+ printf "\tSpecifies whether or not to use OCaml *.opt optimized compilers\n" -+ echo "-natdynlink (yes|no)" -+ printf "\tSpecifies whether or not to use dynamic loading of native code\n" -+ echo "-coqide (opt|byte|no)" -+ printf "\tSpecifies whether or not to compile Coqide\n" -+ echo "-browser " -+ printf "\tUse to open URL %%s\n" -+ echo "-with-doc (yes|no)" -+ printf "\tSpecifies whether or not to compile the documentation\n" -+ echo "-with-geoproof (yes|no)" -+ printf "\tSpecifies whether or not to use Geoproof binding\n" -+ echo "-with-cc " -+ echo "-with-ar " -+ echo "-with-ranlib " -+ printf "\tTells configure where to find gcc/ar/ranlib executables\n" -+ echo "-byte-only" -+ printf "\tCompiles only bytecode version of Coq\n" -+ echo "-debug" -+ printf "\tAdd debugging information in the Coq executables\n" -+ echo "-profile" -+ printf "\tAdd profiling information in the Coq executables\n" -+ echo "-annotate" -+ printf "\tCompiles Coq with -dtypes option\n" -+} -+ -+ -+# Default OCaml binaries -+bytecamlc=ocamlc -+nativecamlc=ocamlopt -+ocamlmklibexec=ocamlmklib -+ocamlexec=ocaml -+ocamldepexec=ocamldep -+ocamldocexec=ocamldoc -+ocamllexexec=ocamllex -+ocamlyaccexec=ocamlyacc -+ocamlmktopexec=ocamlmktop -+camlp4oexec=camlp4o -+ -+ -+coq_debug_flag= -+coq_debug_flag_opt= -+coq_profile_flag= -+coq_annotate_flag= -+best_compiler=opt -+cflags="-fno-defer-pop -Wall -Wno-unused" -+natdynlink=yes -+ -+gcc_exec=gcc -+ar_exec=ar -+ranlib_exec=ranlib -+ -+local=false -+coqrunbyteflags_spec=no -+coqtoolsbyteflags_spec=no -+custom_spec=no -+src_spec=no -+prefix_spec=no -+bindir_spec=no -+libdir_spec=no -+mandir_spec=no -+docdir_spec=no -+emacslib_spec=no -+emacs_spec=no -+camldir_spec=no -+lablgtkdir_spec=no -+coqdocdir_spec=no -+arch_spec=no -+coqide_spec=no -+browser_spec=no -+wwwcoq_spec=no -+with_geoproof=false -+with_doc=all -+with_doc_spec=no -+force_caml_version=no -+force_caml_version_spec=no -+ -+COQSRC=`pwd` -+ -+# Parse command-line arguments -+ -+while : ; do -+ case "$1" in -+ "") break;; -+ -help|--help) usage -+ exit;; -+ -prefix|--prefix) prefix_spec=yes -+ prefix="$2" -+ shift;; -+ -local|--local) local=true;; -+ -coqrunbyteflags|--coqrunbyteflags) coqrunbyteflags_spec=yes -+ coqrunbyteflags="$2" -+ shift;; -+ -coqtoolsbyteflags|--coqtoolsbyteflags) coqtoolsbyteflags_spec=yes -+ coqtoolsbyteflags="$2" -+ shift;; -+ -custom|--custom) custom_spec=yes -+ shift;; -+ -src|--src) src_spec=yes -+ COQSRC="$2" -+ shift;; -+ -bindir|--bindir) bindir_spec=yes -+ bindir="$2" -+ shift;; -+ -libdir|--libdir) libdir_spec=yes -+ libdir="$2" -+ shift;; -+ -mandir|--mandir) mandir_spec=yes -+ mandir="$2" -+ shift;; -+ -docdir|--docdir) docdir_spec=yes -+ docdir="$2" -+ shift;; -+ -emacslib|--emacslib) emacslib_spec=yes -+ emacslib="$2" -+ shift;; -+ -emacs |--emacs) emacs_spec=yes -+ emacs="$2" -+ shift;; -+ -coqdocdir|--coqdocdir) coqdocdir_spec=yes -+ coqdocdir="$2" -+ shift;; -+ -camldir|--camldir) camldir_spec=yes -+ camldir="$2" -+ shift;; -+ -lablgtkdir|--lablgtkdir) lablgtkdir_spec=yes -+ lablgtkdir="$2" -+ shift;; -+ -camlp5dir|--camlp5dir) -+ camlp5dir="$2" -+ shift;; -+ -arch|--arch) arch_spec=yes -+ arch=$2 -+ shift;; -+ -opt|--opt) bytecamlc=ocamlc.opt -+ camlp4oexec=camlp4o # can't add .opt since dyn load'll be required -+ nativecamlc=ocamlopt.opt;; -+ -natdynlink|--natdynlink) case "$2" in -+ yes) natdynlink=yes;; -+ *) natdynlink=no -+ esac -+ shift;; -+ -coqide|--coqide) coqide_spec=yes -+ case "$2" in -+ byte|opt) COQIDE=$2;; -+ *) COQIDE=no -+ esac -+ shift;; -+ -browser|--browser) browser_spec=yes -+ BROWSER=$2 -+ shift;; -+ -coqwebsite|--coqwebsite) wwwcoq_spec=yes -+ WWWCOQ=$2 -+ shift;; -+ -with-doc|--with-doc) with_doc_spec=yes -+ case "$2" in -+ yes|all) with_doc=all;; -+ *) with_doc=no -+ esac -+ shift;; -+ -with-geoproof|--with-geoproof) -+ case "$2" in -+ yes) with_geoproof=true;; -+ no) with_geoproof=false;; -+ esac -+ shift;; -+ -with-cc|-with-gcc|--with-cc|--with-gcc) -+ gcc_spec=yes -+ gcc_exec=$2 -+ shift;; -+ -with-ar|--with-ar) -+ ar_spec=yes -+ ar_exec=$2 -+ shift;; -+ -with-ranlib|--with-ranlib) -+ ranlib_spec=yes -+ ranlib_exec=$2 -+ shift;; -+ -byte-only|-byteonly|--byteonly|--byte-only) best_compiler=byte;; -+ -debug|--debug) coq_debug_flag=-g;; -+ -profile|--profile) coq_profile_flag=-p;; -+ -annotate|--annotate) coq_annotate_flag=-dtypes;; -+ -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) -+ force_caml_version_spec=yes -+ force_caml_version=yes;; -+ *) echo "Unknown option \"$1\"." 1>&2; usage; exit 2;; -+ esac -+ shift -+done -+ -+if [ $prefix_spec = yes -a $local = true ] ; then -+ echo "Options -prefix and -local are incompatible." -+ echo "Configure script failed!" -+ exit 1 -+fi -+ -+# compile date -+DATEPGM=`which date` -+case $DATEPGM in -+ "") echo "I can't find the program \"date\" in your path." -+ echo "Please give me the current date" -+ read COMPILEDATE;; -+ *) COMPILEDATE=`date +"%h %d %Y %H:%M:%S"`;; -+esac -+ -+# Architecture -+ -+case $arch_spec in -+ no) -+ # First we test if we are running a Cygwin system -+ if [ `uname -s | cut -c -6` = "CYGWIN" ] ; then -+ ARCH="win32" -+ else -+ # If not, we determine the architecture -+ if test -x /bin/arch ; then -+ ARCH=`/bin/arch` -+ elif test -x /usr/bin/arch ; then -+ ARCH=`/usr/bin/arch` -+ elif test -x /usr/ucb/arch ; then -+ ARCH=`/usr/ucb/arch` -+ elif test -x /bin/uname ; then -+ ARCH=`/bin/uname -s` -+ elif test -x /usr/bin/uname ; then -+ ARCH=`/usr/bin/uname -s` -+ else -+ echo "I can not automatically find the name of your architecture." -+ printf "%s"\ -+ "Give me a name, please [win32 for Win95, Win98 or WinNT]: " -+ read ARCH -+ fi -+ fi;; -+ yes) ARCH=$arch -+esac -+ -+# executable extension -+ -+case $ARCH in -+ win32) -+ EXE=".exe" -+ DLLEXT=".dll";; -+ *) EXE="" -+ DLLEXT=".so" -+esac -+ -+# Is the source tree checked out from a recognised -+# version control system ? -+if test -e .svn/entries ; then -+ checkedout=svn -+elif [ -d '{arch}' ]; then -+ checkedout=gnuarch -+elif [ -z "${GIT_DIR}" ] && [ -d .git ] || [ -d "${GIT_DIR}" ]; then -+ checkedout=git -+else -+ checkedout=0 -+fi -+ -+# make command -+ -+MAKE=`which make` -+if [ "$MAKE" != "" ]; then -+ MAKEVERSION=`$MAKE -v | head -1 | cut -d" " -f3` -+ MAKEVERSIONMAJOR=`echo $MAKEVERSION | cut -d. -f1` -+ MAKEVERSIONMINOR=`echo $MAKEVERSION | cut -d. -f2` -+ if [ "$MAKEVERSIONMAJOR" -eq 3 -a "$MAKEVERSIONMINOR" -ge 81 ]; then -+ echo "You have GNU Make $MAKEVERSION. Good!" -+ else -+ OK="no" -+ if [ -x ./make ]; then -+ MAKEVERSION=`./make -v | head -1` -+ if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi -+ fi -+ if [ $OK = "no" ]; then -+ echo "GNU Make >= 3.81 is needed." -+ echo "Make 3.81 can be downloaded from ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz" -+ echo "then locally installed on a Unix-style system by issuing:" -+ echo " tar xzvf make-3.81.tar.gz" -+ echo " cd make-3.81" -+ echo " ./configure" -+ echo " make" -+ echo " mv make .." -+ echo " cd .." -+ echo "Restart then the configure script and later use ./make instead of make." -+ exit 1 -+ else -+ echo "You have locally installed GNU Make 3.81. Good!" -+ fi -+ fi -+else -+ echo "Cannot find GNU Make >= 3.81." -+fi -+ -+# Browser command -+ -+if [ "$browser_spec" = "no" ]; then -+ case $ARCH in -+ win32) BROWSER='C:\PROGRA~1\INTERN~1\IEXPLORE %s' ;; -+ *) BROWSER='firefox -remote "OpenURL(%s,new-tab)" || firefox %s &' ;; -+ esac -+fi -+ -+if [ "$wwwcoq_spec" = "no" ]; then -+ WWWCOQ="http://coq.inria.fr/" -+fi -+ -+######################################### -+# Objective Caml programs -+ -+case $camldir_spec in -+ no) CAMLC=`which $bytecamlc` -+ case "$CAMLC" in -+ "") echo "$bytecamlc is not present in your path!" -+ echo "Give me manually the path to the $bytecamlc executable [/usr/local/bin by default]: " -+ read CAMLC -+ -+ case "$CAMLC" in -+ "") CAMLC=/usr/local/bin/$bytecamlc;; -+ */ocamlc|*/ocamlc.opt) true;; -+ */) CAMLC="${CAMLC}"$bytecamlc;; -+ *) CAMLC="${CAMLC}"/$bytecamlc;; -+ esac -+ esac -+ CAMLBIN=`dirname "$CAMLC"`;; -+ yes) CAMLC=$camldir/$bytecamlc -+ -+ CAMLBIN=`dirname "$CAMLC"` -+ bytecamlc="$CAMLC" -+ nativecamlc=$CAMLBIN/$nativecamlc -+ ocamlexec=$CAMLBIN/ocaml -+ ocamldepexec=$CAMLBIN/ocamldep -+ ocamldocexec=$CAMLBIN/ocamldoc -+ ocamllexexec=$CAMLBIN/ocamllex -+ ocamlyaccexec=$CAMLBIN/ocamlyacc -+ ocamlmktopexec=$CAMLBIN/ocamlmktop -+ ocamlmklibexec=$CAMLBIN/ocamlmklib -+ camlp4oexec=$CAMLBIN/camlp4o -+esac -+ -+if test ! -f "$CAMLC" ; then -+ echo "I can not find the executable '$CAMLC'. Have you installed it?" -+ echo "Configuration script failed!" -+ exit 1 -+fi -+ -+# Under Windows, OCaml only understands Windows filenames (C:\...) -+case $ARCH in -+ win32) CAMLBIN=`cygpath -m ${CAMLBIN}`;; -+esac -+ -+CAMLVERSION=`"$bytecamlc" -version` -+ -+case $CAMLVERSION in -+ 1.*|2.*|3.00|3.01|3.02|3.03|3.03alpha|3.04|3.05beta|3.05|3.06|3.07*|3.08*|3.09*) -+ echo "Your version of Objective-Caml is $CAMLVERSION." -+ if [ "$force_caml_version" = "yes" ]; then -+ echo "*Warning* You are compiling Coq with an outdated version of Objective-Caml." -+ else -+ echo " You need Objective-Caml 3.10.2 or later." -+ echo " Configuration script failed!" -+ exit 1 -+ fi;; -+ ?*) -+ CAMLP4COMPAT="-loc loc" -+ echo "You have Objective-Caml $CAMLVERSION. Good!";; -+ *) -+ echo "I found the Objective-Caml compiler but cannot find its version number!" -+ echo "Is it installed properly?" -+ echo "Configuration script failed!" -+ exit 1;; -+esac -+ -+CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"` -+ -+# For coqmktop & bytecode compiler -+ -+case $ARCH in -+ win32) # Awfull trick to get around a ^M problem at the end of CAMLLIB -+ CAMLLIB=`"$CAMLC" -where | sed -e 's/^\(.*\)$/\1/'` ;; -+ *) -+ CAMLLIB=`"$CAMLC" -where` -+esac -+ -+if [ "$coq_debug_flag" = "-g" ]; then -+ case $CAMLTAG in -+ OCAML31*) -+ # Compilation debug flag -+ coq_debug_flag_opt="-g" -+ ;; -+ esac -+fi -+ -+# Native dynlink -+if [ "$natdynlink" = "yes" -a -f `"$CAMLC" -where`/dynlink.cmxa ]; then -+ HASNATDYNLINK=true -+else -+ HASNATDYNLINK=false -+fi -+ -+case $HASNATDYNLINK,`uname -s`,`uname -r`,$CAMLVERSION in -+ true,Darwin,9.*,3.11.*) # ocaml 3.11.0 dynlink on MacOS 10.5 is buggy -+ NATDYNLINKFLAG=os5fixme;; -+ #Possibly a problem on 10.6.0/10.6.1/10.6.2 -+ #May just be a 32 vs 64 problem for all 10.6.* -+ true,Darwin,10.0.*,3.11.*) # Possibly a problem on 10.6.0 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.1.*,3.11.*) # Possibly a problem on 10.6.1 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.2.*,3.11.*) # Possibly a problem on 10.6.2 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.*,3.11.*) -+ if [ `getconf LONG_BIT` = "32" ]; then -+ # Still a problem for x86_32 -+ NATDYNLINKFLAG=os5fixme -+ else -+ # Not a problem for x86_64 -+ NATDYNLINKFLAG=$HASNATDYNLINK -+ fi;; -+ *) -+ NATDYNLINKFLAG=$HASNATDYNLINK;; -+esac -+ -+# Camlp4 / Camlp5 configuration -+ -+if [ "$camlp5dir" != "" ]; then -+ CAMLP4=camlp5 -+ CAMLP4LIB=$camlp5dir -+ if [ ! -f $camlp5dir/camlp5.cma ]; then -+ echo "Cannot find camlp5 libraries in $camlp5dir (camlp5.cma not found)." -+ echo "Configuration script failed!" -+ exit 1 -+ fi -+ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` -+else -+ case $CAMLTAG in -+ OCAML31*) -+ if [ -x "${CAMLLIB}/camlp5" ]; then -+ CAMLP4LIB=+camlp5 -+ elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then -+ CAMLP4LIB=+site-lib/camlp5 -+ else -+ echo "Objective Caml $CAMLVERSION found but no Camlp5 installed." -+ echo "Configuration script failed!" -+ exit 1 -+ fi -+ CAMLP4=camlp5 -+ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` -+ ;; -+ *) -+ CAMLP4=camlp4 -+ CAMLP4LIB=+camlp4 -+ ;; -+ esac -+fi -+ -+if [ "$CAMLP4" = "camlp5" ] && `$camlp4oexec -v 2>&1 | grep -q 5.00`; then -+ echo "Camlp5 version 5.00 not supported: versions 4.0x or >= 5.01 are OK" -+ echo "(depending also on your ocaml version)." -+ echo "Configuration script failed!" -+ exit 1 -+fi -+ -+ -+case $CAMLP4LIB in -+ +*) FULLCAMLP4LIB=$CAMLLIB/`echo $CAMLP4LIB | cut -b 2-`;; -+ *) FULLCAMLP4LIB=$CAMLP4LIB;; -+esac -+ -+# Assume that camlp(4|5) binaries are at the same place as ocaml ones -+# (this should become configurable some day) -+CAMLP4BIN=${CAMLBIN} -+ -+# do we have a native compiler: test of ocamlopt and its version -+ -+if [ "$best_compiler" = "opt" ] ; then -+ if test -e "$nativecamlc" || test -e "`which $nativecamlc`"; then -+ CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` -+ if [ "`uname -s`" = "Darwin" -a "$ARCH" = "i386" ]; then -+ case $CAMLOPTVERSION in -+ 3.09.3|3.1?*) ;; -+ *) echo "Native compilation on MacOS X Pentium requires Objective-Caml >= 3.09.3," -+ best_compiler=byte -+ echo "only the bytecode version of Coq will be available." -+ esac -+ elif [ ! -f $FULLCAMLP4LIB/gramlib.cmxa ]; then -+ best_compiler=byte -+ echo "Cannot find native-code $CAMLP4," -+ echo "only the bytecode version of Coq will be available." -+ else -+ if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then -+ echo "Native and bytecode compilers do not have the same version!" -+ fi -+ echo "You have native-code compilation. Good!" -+ fi -+ else -+ best_compiler=byte -+ echo "You have only bytecode compilation." -+ fi -+fi -+ -+# OS dependent libraries -+ -+case $ARCH in -+ sun4*) OS=`uname -r` -+ case $OS in -+ 5*) OS="Sun Solaris $OS" -+ OSDEPLIBS="-cclib -lunix -cclib -lnsl -cclib -lsocket";; -+ *) OS="Sun OS $OS" -+ OSDEPLIBS="-cclib -lunix" -+ esac;; -+ alpha) OSDEPLIBS="-cclib -lunix";; -+ win32) OS="Win32" -+ OSDEPLIBS="-cclib -lunix" -+ cflags="-mno-cygwin $cflags";; -+ *) OSDEPLIBS="-cclib -lunix" -+esac -+ -+# lablgtk2 and CoqIDE -+ -+# -byte-only should imply -coqide byte, unless the user decides otherwise -+ -+if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then -+ coqide_spec=yes -+ COQIDE=byte -+fi -+ -+# Which coqide is asked ? which one is possible ? -+ -+if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then -+ echo "CoqIde disabled as requested." -+else -+ case $lablgtkdir_spec in -+ no) -+ if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then -+ lablgtkdir=${CAMLLIB}/lablgtk2 -+ elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then -+ lablgtkdir=${CAMLLIB}/site-lib/lablgtk2 -+ fi;; -+ yes) -+ if [ ! -f "$lablgtkdir/glib.mli" ]; then -+ echo "Incorrect LablGtk2 library (glib.mli not found)." -+ echo "Configuration script failed!" -+ exit 1 -+ fi;; -+ esac -+ if [ "$lablgtkdir" = "" ]; then -+ echo "LablGtk2 not found: CoqIde will not be available." -+ COQIDE=no -+ elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then -+ echo "LablGtk2 found but too old: CoqIde will not be available." -+ COQIDE=no; -+ elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then -+ echo "LablGtk2 found, bytecode CoqIde will be used as requested." -+ COQIDE=byte -+ elif [ ! -f "${CAMLLIB}/threads/threads.cmxa" ]; then -+ echo "LablGtk2 found, no native threads: bytecode CoqIde will be available." -+ COQIDE=byte -+ else -+ echo "LablGtk2 found, native threads: native CoqIde will be available." -+ COQIDE=opt -+ fi -+fi -+ -+case $COQIDE in -+ byte|opt) -+ case $lablgtkdir_spec in -+ no) LABLGTKLIB=+lablgtk2 # Pour le message -+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile -+ yes) LABLGTKLIB="$lablgtkdir" # Pour le message -+ LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile -+ esac;; -+ no) LABLGTKINCLUDES="";; -+esac -+ -+# strip command -+ -+case $ARCH in -+ win32) -+ # true -> strip : it exists under cygwin ! -+ STRIPCOMMAND="strip";; -+ *) -+ if [ "$coq_profile_flag" = "-p" ] || [ "$coq_debug_flag" = "-g" ] || -+ [ "`uname -s`" = "Darwin" -a "$HASNATDYNLINK" = "true" ] -+ then -+ STRIPCOMMAND="true" -+ else -+ STRIPCOMMAND="strip" -+ fi -+esac -+ -+# mktexlsr -+#MKTEXLSR=`which mktexlsr` -+#case $MKTEXLSR in -+# "") MKTEXLSR=true;; -+#esac -+ -+# " -+### Test if documentation can be compiled (latex, hevea) -+ -+if test "$with_doc" = "all" -+then -+ for cmd in "latex" "hevea" ; do -+ if test ! -x "`which $cmd`" -+ then -+ echo "$cmd was not found; documentation will not be available" -+ with_doc=no -+ break -+ fi -+ done -+fi -+ -+########################################### -+# bindir, libdir, mandir, docdir, etc. -+ -+case $src_spec in -+ no) COQTOP=${COQSRC} -+esac -+ -+# OCaml only understand Windows filenames (C:\...) -+case $ARCH in -+ win32) COQTOP=`cygpath -m ${COQTOP}` -+esac -+ -+case $ARCH in -+ win32) -+ bindir_def='C:\coq\bin' -+ libdir_def='C:\coq\lib' -+ mandir_def='C:\coq\man' -+ docdir_def='C:\coq\doc' -+ emacslib_def='C:\coq\emacs' -+ coqdocdir_def='C:\coq\latex';; -+ *) -+ bindir_def=/usr/local/bin -+ libdir_def=/usr/local/lib/coq -+ mandir_def=/usr/local/man -+ docdir_def=/usr/local/share/doc/coq -+ emacslib_def=/usr/local/share/emacs/site-lisp -+ coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;; -+esac -+ -+emacs_def=emacs -+ -+case $bindir_spec/$prefix_spec/$local in -+ yes/*/*) BINDIR=$bindir ;; -+ */yes/*) BINDIR=$prefix/bin ;; -+ */*/true) BINDIR=$COQTOP/bin ;; -+ *) printf "Where should I install the Coq binaries [$bindir_def]? " -+ read BINDIR -+ case $BINDIR in -+ "") BINDIR=$bindir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $libdir_spec/$prefix_spec/$local in -+ yes/*/*) LIBDIR=$libdir;; -+ */yes/*) -+ case $ARCH in -+ win32) LIBDIR=$prefix ;; -+ *) LIBDIR=$prefix/lib/coq ;; -+ esac ;; -+ */*/true) LIBDIR=$COQTOP ;; -+ *) printf "Where should I install the Coq library [$libdir_def]? " -+ read LIBDIR -+ case $LIBDIR in -+ "") LIBDIR=$libdir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $mandir_spec/$prefix_spec/$local in -+ yes/*/*) MANDIR=$mandir;; -+ */yes/*) MANDIR=$prefix/man ;; -+ */*/true) MANDIR=$COQTOP/man ;; -+ *) printf "Where should I install the Coq man pages [$mandir_def]? " -+ read MANDIR -+ case $MANDIR in -+ "") MANDIR=$mandir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $docdir_spec/$prefix_spec/$local in -+ yes/*/*) DOCDIR=$docdir; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ */yes/*) DOCDIR=$prefix/share/doc/coq; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ */*/true) DOCDIR=$COQTOP/doc; HTMLREFMANDIR=$DOCDIR/refman/html;; -+ *) printf "Where should I install the Coq documentation [$docdir_def]? " -+ read DOCDIR -+ case $DOCDIR in -+ "") DOCDIR=$docdir_def; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ *) true;; -+ esac;; -+esac -+ -+case $emacslib_spec/$prefix_spec/$local in -+ yes/*/*) EMACSLIB=$emacslib;; -+ */yes/*) -+ case $ARCH in -+ win32) EMACSLIB=$prefix/emacs ;; -+ *) EMACSLIB=$prefix/share/emacs/site-lisp ;; -+ esac ;; -+ */*/true) EMACSLIB=$COQTOP/tools/emacs ;; -+ *) printf "Where should I install the Coq Emacs mode [$emacslib_def]? " -+ read EMACSLIB -+ case $EMACSLIB in -+ "") EMACSLIB=$emacslib_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $coqdocdir_spec/$prefix_spec/$local in -+ yes/*/*) COQDOCDIR=$coqdocdir;; -+ */yes/*) -+ case $ARCH in -+ win32) COQDOCDIR=$prefix/latex ;; -+ *) COQDOCDIR=$prefix/share/emacs/site-lisp ;; -+ esac ;; -+ */*/true) COQDOCDIR=$COQTOP/tools/coqdoc ;; -+ *) printf "Where should I install Coqdoc TeX/LaTeX files [$coqdocdir_def]? " -+ read COQDOCDIR -+ case $COQDOCDIR in -+ "") COQDOCDIR=$coqdocdir_def;; -+ *) true;; -+ esac;; -+esac -+ -+# Determine if we enable -custom by default (Windows and MacOS) -+CUSTOM_OS=no -+if [ "$ARCH" = "win32" ] || [ "`uname -s`" = "Darwin" ]; then -+ CUSTOM_OS=yes -+fi -+ -+BUILDLDPATH="# you might want to set CAML_LD_LIBRARY_PATH by hand!" -+case $coqrunbyteflags_spec/$local/$custom_spec/$CUSTOM_OS in -+ yes/*/*/*) COQRUNBYTEFLAGS="$coqrunbyteflags";; -+ */*/yes/*|*/*/*/yes) COQRUNBYTEFLAGS="-custom";; -+ */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$COQTOP'/kernel/byterun";; -+ *) -+ COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$LIBDIR'" -+ BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun";; -+esac -+case $coqtoolsbyteflags_spec/$custom_spec/$CUSTOM_OS in -+ yes/*/*) COQTOOLSBYTEFLAGS="$coqtoolsbyteflags";; -+ */yes/*|*/*/yes) COQTOOLSBYTEFLAGS="-custom";; -+ *) COQTOOLSBYTEFLAGS="";; -+esac -+ -+# case $emacs_spec in -+# no) printf "Which Emacs command should I use to compile coq.el [$emacs_def]? " -+# read EMACS -+ -+# case $EMACS in -+# "") EMACS=$emacs_def;; -+# *) true;; -+# esac;; -+# yes) EMACS=$emacs;; -+# esac -+ -+ -+ -+########################################### -+# Summary of the configuration -+ -+echo "" -+echo " Coq top directory : $COQTOP" -+echo " Architecture : $ARCH" -+if test ! -z "$OS" ; then -+ echo " Operating system : $OS" -+fi -+echo " Coq VM bytecode link flags : $COQRUNBYTEFLAGS" -+echo " Coq tools bytecode link flags : $COQTOOLSBYTEFLAGS" -+echo " OS dependent libraries : $OSDEPLIBS" -+echo " Objective-Caml/Camlp4 version : $CAMLVERSION" -+echo " Objective-Caml/Camlp4 binaries in : $CAMLBIN" -+echo " Objective-Caml library in : $CAMLLIB" -+echo " Camlp4 library in : $CAMLP4LIB" -+if test "$best_compiler" = opt ; then -+echo " Native dynamic link support : $HASNATDYNLINK" -+fi -+if test "$COQIDE" != "no"; then -+echo " Lablgtk2 library in : $LABLGTKLIB" -+fi -+if test "$with_doc" = "all"; then -+echo " Documentation : All" -+else -+echo " Documentation : None" -+fi -+echo " CoqIde : $COQIDE" -+echo " Web browser : $BROWSER" -+echo " Coq web site : $WWWCOQ" -+echo "" -+ -+echo " Paths for true installation:" -+echo " binaries will be copied in $BINDIR" -+echo " library will be copied in $LIBDIR" -+echo " man pages will be copied in $MANDIR" -+echo " documentation will be copied in $DOCDIR" -+echo " emacs mode will be copied in $EMACSLIB" -+echo "" -+ -+################################################## -+# Building the $COQTOP/dev/ocamldebug-coq file -+################################################## -+ -+OCAMLDEBUGCOQ=$COQSRC/dev/ocamldebug-coq -+ -+if test "$coq_debug_flag" = "-g" ; then -+ rm -f $OCAMLDEBUGCOQ -+ sed -e "s|COQTOPDIRECTORY|$COQTOP|" \ -+ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ -+ -e "s|CAMLBINDIRECTORY|$CAMLBIN|" \ -+ -e "s|CAMLP4LIBDIRECTORY|$FULLCAMLP4LIB|"\ -+ $OCAMLDEBUGCOQ.template > $OCAMLDEBUGCOQ -+ chmod a-w,a+x $OCAMLDEBUGCOQ -+fi -+ -+#################################################### -+# Fixing lablgtk types (before/after 2.6.0) -+#################################################### -+ -+if [ ! "$COQIDE" = "no" ]; then -+ if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then -+ if grep -q "?accepts_tab:bool" "$lablgtkdir/gText.mli" ; then -+ cp -f ide/undo_lablgtk_ge212.mli ide/undo.mli -+ else -+ cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli -+ fi -+ else -+ cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli -+ fi -+fi -+ -+############################################## -+# Creation of configuration files -+############################################## -+ -+mlconfig_file="$COQSRC/config/coq_config.ml" -+config_file="$COQSRC/config/Makefile" -+config_template="$COQSRC/config/Makefile.template" -+ -+ -+### Warning !! -+### After this line, be careful when using variables, -+### since some of them (e.g. $COQSRC) will be escaped -+ -+ -+# An escaped version of a variable -+escape_var () { -+"$ocamlexec" 2>&1 1>/dev/null < $mlconfig_file -+(* DO NOT EDIT THIS FILE: automatically generated by ../configure *) -+ -+let local = $local -+let coqrunbyteflags = "$COQRUNBYTEFLAGS" -+let coqlib = "$LIBDIR" -+let coqsrc = "$COQSRC" -+let ocaml = "$ocamlexec" -+let ocamlc = "$bytecamlc" -+let ocamlopt = "$nativecamlc" -+let ocamlmklib = "$ocamlmklibexec" -+let ocamldep = "$ocamldepexec" -+let ocamldoc = "$ocamldocexec" -+let ocamlyacc = "$ocamlyaccexec" -+let ocamllex = "$ocamllexexec" -+let camlbin = "$CAMLBIN" -+let camllib = "$CAMLLIB" -+let camlp4 = "$CAMLP4" -+let camlp4o = "$camlp4oexec" -+let camlp4bin = "$CAMLP4BIN" -+let camlp4lib = "$CAMLP4LIB" -+let camlp4compat = "$CAMLP4COMPAT" -+let coqideincl = "$LABLGTKINCLUDES" -+let cflags = "$cflags" -+let best = "$best_compiler" -+let arch = "$ARCH" -+let has_coqide = "$COQIDE" -+let has_natdynlink = $HASNATDYNLINK -+let natdynlinkflag = "$NATDYNLINKFLAG" -+let osdeplibs = "$OSDEPLIBS" -+let version = "$VERSION" -+let caml_version = "$CAMLVERSION" -+let date = "$DATE" -+let compile_date = "$COMPILEDATE" -+let vo_magic_number = $VOMAGIC -+let state_magic_number = $STATEMAGIC -+let exec_extension = "$EXE" -+let with_geoproof = ref $with_geoproof -+let browser = "$BROWSER" -+let wwwcoq = "$WWWCOQ" -+let wwwrefman = wwwcoq ^ "distrib/" ^ version ^ "/refman/" -+let wwwstdlib = wwwcoq ^ "distrib/" ^ version ^ "/stdlib/" -+let localwwwrefman = "file://$HTMLREFMANDIR/" -+ -+END_OF_COQ_CONFIG -+ -+# to be sure printf is found on windows when spaces occur in PATH variable -+PRINTF=`which printf` -+ -+# Subdirectories of theories/ added in coq_config.ml -+subdirs () { -+ (cd $1; find * \( -name .svn -prune \) -o \( -type d -exec $PRINTF "\"%s\";\n" {} \; \) >> "$mlconfig_file") -+} -+ -+echo "let theories_dirs = [" >> "$mlconfig_file" -+subdirs theories -+echo "]" >> "$mlconfig_file" -+ -+echo "let plugins_dirs = [" >> "$mlconfig_file" -+subdirs plugins -+echo "]" >> "$mlconfig_file" -+ -+chmod a-w "$mlconfig_file" -+ -+ -+############################################### -+# Building the $COQTOP/config/Makefile file -+############################################### -+ -+rm -f "$config_file" -+ -+sed -e "s|LOCALINSTALLATION|$local|" \ -+ -e "s|XCOQRUNBYTEFLAGS|$COQRUNBYTEFLAGS|" \ -+ -e "s|XCOQTOOLSBYTEFLAGS|$COQTOOLSBYTEFLAGS|" \ -+ -e "s|COQSRCDIRECTORY|$COQSRC|" \ -+ -e "s|COQVERSION|$VERSION|" \ -+ -e "s|BINDIRDIRECTORY|$BINDIR|" \ -+ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ -+ -e "s|BUILDLDPATH=|$BUILDLDPATH|" \ -+ -e "s|MANDIRDIRECTORY|$MANDIR|" \ -+ -e "s|DOCDIRDIRECTORY|$DOCDIR|" \ -+ -e "s|EMACSLIBDIRECTORY|$EMACSLIB|" \ -+ -e "s|EMACSCOMMAND|$EMACS|" \ -+ -e "s|COQDOCDIRECTORY|$COQDOCDIR|" \ -+ -e "s|MKTEXLSRCOMMAND|$MKTEXLSR|" \ -+ -e "s|ARCHITECTURE|$ARCH|" \ -+ -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \ -+ -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \ -+ -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \ -+ -e "s|CAMLTAG|$CAMLTAG|" \ -+ -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \ -+ -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \ -+ -e "s|CAMLP4TOOL|$camlp4oexec|" \ -+ -e "s|CAMLP4COMPATFLAGS|$CAMLP4COMPAT|" \ -+ -e "s|LABLGTKINCLUDES|$LABLGTKINCLUDES|" \ -+ -e "s|COQDEBUGFLAGOPT|$coq_debug_flag_opt|" \ -+ -e "s|COQDEBUGFLAG|$coq_debug_flag|" \ -+ -e "s|COQPROFILEFLAG|$coq_profile_flag|" \ -+ -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \ -+ -e "s|CCOMPILEFLAGS|$cflags|" \ -+ -e "s|BESTCOMPILER|$best_compiler|" \ -+ -e "s|DLLEXTENSION|$DLLEXT|" \ -+ -e "s|EXECUTEEXTENSION|$EXE|" \ -+ -e "s|BYTECAMLC|$bytecamlc|" \ -+ -e "s|OCAMLMKLIBEXEC|$ocamlmklibexec|" \ -+ -e "s|NATIVECAMLC|$nativecamlc|" \ -+ -e "s|OCAMLEXEC|$ocamlexec|" \ -+ -e "s|OCAMLDEPEXEC|$ocamldepexec|" \ -+ -e "s|OCAMLDOCEXEC|$ocamldocexec|" \ -+ -e "s|OCAMLLEXEXEC|$ocamllexexec|" \ -+ -e "s|OCAMLYACCEXEC|$ocamlyaccexec|" \ -+ -e "s|CAMLMKTOPEXEC|$ocamlmktopexec|" \ -+ -e "s|CCEXEC|$gcc_exec|" \ -+ -e "s|AREXEC|$ar_exec|" \ -+ -e "s|RANLIBEXEC|$ranlib_exec|" \ -+ -e "s|STRIPCOMMAND|$STRIPCOMMAND|" \ -+ -e "s|COQIDEOPT|$COQIDE|" \ -+ -e "s|CHECKEDOUTSOURCETREE|$checkedout|" \ -+ -e "s|WITHDOCOPT|$with_doc|" \ -+ -e "s|HASNATIVEDYNLINK|$NATDYNLINKFLAG|" \ -+ "$config_template" > "$config_file" -+ -+chmod a-w "$config_file" -+ -+################################################## -+# The end -+#################################################### -+ -+echo "If anything in the above is wrong, please restart './configure'." -+echo -+echo "*Warning* To compile the system for a new architecture" -+echo " don't forget to do a 'make archclean' before './configure'." -+ -+# $Id: configure 14833 2011-12-19 21:57:30Z notin $ diff --git a/pkgs/applications/science/logic/coq/no-codesign.patch b/pkgs/applications/science/logic/coq/no-codesign.patch deleted file mode 100644 index 0f917fbf56d4..000000000000 --- a/pkgs/applications/science/logic/coq/no-codesign.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/Makefile.build b/Makefile.build -index 2963a3d..876479c 100644 ---- a/Makefile.build -+++ b/Makefile.build -@@ -101,13 +101,8 @@ BYTEFLAGS=$(CAMLDEBUG) $(USERFLAGS) - OPTFLAGS=$(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS) - DEPFLAGS= $(LOCALINCLUDES) -I ide -I ide/utils - --ifeq ($(ARCH),Darwin) --LINKMETADATA=-ccopt "-sectcreate __TEXT __info_plist config/Info-$(notdir $@).plist" --CODESIGN=codesign -s - --else - LINKMETADATA= - CODESIGN=true --endif - - define bestocaml - $(if $(OPT),\ - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f06044829b4d..1617f9330b49 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -329,7 +329,7 @@ mapAliases ({ callPackage_i686 = pkgsi686Linux.callPackage; inherit (ocaml-ng) # added 2016-09-14 - ocamlPackages_3_11_2 ocamlPackages_3_12_1 + ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 ocamlPackages_4_03 ocamlPackages_latest; @@ -348,7 +348,6 @@ mapAliases ({ gst-ffmpeg = pkgs.gst-ffmpeg; }; } // (with ocaml-ng; { # added 2016-09-14 - ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml; ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml; ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ed05e4972f1..632b88c8012c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21148,12 +21148,11 @@ with pkgs; boogie = dotnetPackages.Boogie; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_3_12_1 - ocamlPackages_4_02 + inherit (ocaml-ng) ocamlPackages_4_02 ocamlPackages_4_05 ; }) mkCoqPackages - coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 + coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 coqPackages coq ; @@ -21232,7 +21231,17 @@ with pkgs; ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; - inherit (ocaml-ng.ocamlPackages_3_11_2) matita; + #inherit (ocaml-ng.ocamlPackages_3_11_2) matita; + + # Current version is 0.5.8. Official website says: + + # Version 0.5.9, released on December 23, 2014, is an update of version 0.5.8 + # to compile with the latter OCaml version and libraries. + # It is unsupported, but still used for teaching at the University of Bologna. + + # It should allow us removing the dependency on OCaml 3.11 but I haven't been + # able to confirm because Matita depends on lablgtkmathview-0.7.2 which + # already reports as broken. matita_130312 = lowPrio ocamlPackages.matita_130312; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index bc21137903af..305d9ba351ba 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,6 +1,5 @@ { lib, callPackage, newScope, recurseIntoAttrs , gnumake3 -, ocamlPackages_3_12_1 , ocamlPackages_4_02 , ocamlPackages_4_05 }: @@ -56,12 +55,6 @@ in rec { let self = mkCoqPackages' self coq; in filterCoqPackages coq self; - coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { - make = gnumake3; - inherit (ocamlPackages_3_12_1) ocaml findlib; - camlp5 = ocamlPackages_3_12_1.camlp5_transitional; - lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; - }; coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { inherit (ocamlPackages_4_02) ocaml findlib lablgtk; camlp5 = ocamlPackages_4_02.camlp5_transitional; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 026bab235065..ee0f554efa3f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1065,8 +1065,6 @@ in rec inherit mkOcamlPackages; - ocamlPackages_3_11_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.11.2.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); - ocamlPackages_3_12_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.12.1.nix { }) (self: super: { camlimages = self.camlimages_4_0; }); ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { }) (self: super: { }); From 0f8ef669ac3988bc731e9722609f80994755ffc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Mon, 8 Oct 2018 21:10:05 +0200 Subject: [PATCH 278/992] ocamlPackages_3_12_1: remove --- pkgs/top-level/aliases.nix | 2 -- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1617f9330b49..fe0d3816413e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -329,7 +329,6 @@ mapAliases ({ callPackage_i686 = pkgsi686Linux.callPackage; inherit (ocaml-ng) # added 2016-09-14 - ocamlPackages_3_12_1 ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 ocamlPackages_4_03 ocamlPackages_latest; @@ -348,7 +347,6 @@ mapAliases ({ gst-ffmpeg = pkgs.gst-ffmpeg; }; } // (with ocaml-ng; { # added 2016-09-14 - ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml; ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ee0f554efa3f..4de581e2932d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1065,8 +1065,6 @@ in rec inherit mkOcamlPackages; - ocamlPackages_3_12_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.12.1.nix { }) (self: super: { camlimages = self.camlimages_4_0; }); - ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { }) (self: super: { }); ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { }) (self: super: { }); From e2407c1e057c46c65db8ff71979292b7b1f4bb5e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 8 Oct 2018 21:32:14 +0200 Subject: [PATCH 279/992] dbus-sharp-[glib]: add license --- .../libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix | 1 + pkgs/development/libraries/dbus-sharp-glib/default.nix | 1 + pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix | 1 + pkgs/development/libraries/dbus-sharp/default.nix | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix index 208288bfca1d..0f897d97467f 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus for .NET: GLib integration module"; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix index ef1ddd9bfff5..cd020317f4c2 100644 --- a/pkgs/development/libraries/dbus-sharp-glib/default.nix +++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus for .NET: GLib integration module"; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix index 013913e52972..18ea3ad3ecb7 100644 --- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus for .NET"; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index 855dd9f3832e..2704ef2de9fd 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus for .NET"; platforms = platforms.linux; + license = licenses.mit; }; } From e6c947ad7065eceb1a8c56563db1cb96d66d44f1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 8 Oct 2018 21:11:14 +0200 Subject: [PATCH 280/992] opensm: use native shell to run autogen.sh --- pkgs/tools/networking/opensm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index 075ceff3555e..ea20306e26f2 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ rdma-core ]; - preConfigure = "bash ./autogen.sh"; + preConfigure = '' + patchShebangs ./autogen.sh + ./autogen.sh + ''; enableParallelBuilding = true; From a3962299f14944a0e9ccf8fd84bd7be524b74cd6 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 8 Oct 2018 15:52:21 -0400 Subject: [PATCH 281/992] vscode: 1.27.2 -> 1.28.0 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 3f23021b6d82..b8a717fc0e70 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.27.2"; + version = "1.28.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "33704d089b03c636e8c46d434068c97b66e5a9d323b991bd327067aa90e87afa"; - "x86_64-linux" = "11023c652dd89bde1b7fbc8a7dc04fd4f87df3bfe6952a1c0ad75ab861e3196d"; - "x86_64-darwin" = "d1f2d046775406e6f339883dab432fcaa149e763ccfcd017556a46e890de6476"; + "i686-linux" = "0f54py00lmw96x47nk823gwxxc9kr9haaa821ggi974ycr54af0y"; + "x86_64-linux" = "07bbzm1159k2gkajj6z7dsr0kmadd5gx721w92r252i5hcwg5sx4"; + "x86_64-darwin" = "019cl2rswls3gwwa8y70cllc4jnd8xj0y2m9rvg2rz695snp6rcm"; }.${stdenv.hostPlatform.system}; archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz"; From 5a8a98252612cb1de63d3ce6dec1a488aaeb057c Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sun, 7 Oct 2018 17:37:59 +0100 Subject: [PATCH 282/992] gramps: add support for recommended packages The GRAMPS readme indicates there are a number of recommended packages (graphviz, ghostscript, PyICU and osm-gps-map which was already supported). These default to true. --- pkgs/applications/misc/gramps/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index b12b84d106dc..dd8cdef4df1a 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, pango, gobjectIntrospection, wrapGAppsHook, # Optional packages: - enableOSM ? true, osm-gps-map + enableOSM ? true, osm-gps-map, + enableGraphviz ? true, graphviz, + enableGhostscript ? true, ghostscript }: let @@ -14,6 +16,11 @@ in buildPythonApplication rec { buildInputs = [ intltool gtk3 gobjectIntrospection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map + # Graphviz support + ++ stdenv.lib.optional enableGraphviz graphviz + # Ghostscript support + ++ stdenv.lib.optional enableGhostscript ghostscript + ; src = fetchFromGitHub { From 2b93aed3ccfddc1516d5d8be35ff171f5fbcd181 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Sun, 7 Oct 2018 17:46:29 +0100 Subject: [PATCH 283/992] gramps: add joncojonathan to package maintainers --- pkgs/applications/misc/gramps/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index dd8cdef4df1a..413679afd219 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -60,5 +60,6 @@ in buildPythonApplication rec { description = "Genealogy software"; homepage = https://gramps-project.org; license = licenses.gpl2; + maintainers = with maintainers; [ joncojonathan ]; }; } From 82fa8d90afb5012fe6e9ffea321cb58c925132a3 Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Mon, 8 Oct 2018 22:08:54 +0200 Subject: [PATCH 284/992] ansible-lint: 3.4.20 -> 3.4.23 --- pkgs/development/tools/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix index 16d2782b7340..c460662f4f88 100644 --- a/pkgs/development/tools/ansible-lint/default.nix +++ b/pkgs/development/tools/ansible-lint/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { pname = "ansible-lint"; - version = "3.4.20"; + version = "3.4.23"; src = fetchFromGitHub { owner = "willthames"; repo = "ansible-lint"; rev = "v${version}"; - sha256 = "0wgczijrg5azn2f63hjbkas1w0f5hbvxnk3ia53w69mybk0gy044"; + sha256 = "0cnfgxh5m7alzm811hc95jigbca5vc1pf8fjazmsakmhdjyfbpb7"; }; propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ]; From 788c070012918172e7a69fb3d7ef47a29ac41709 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 8 Oct 2018 22:09:55 +0200 Subject: [PATCH 285/992] dclxvi: add license --- pkgs/development/libraries/dclxvi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index 47f3794f5ad5..1f8f9a4e69cc 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; maintainers = with maintainers; [ wkennington ]; platforms = platforms.x86_64; + license = licenses.publicDomain; }; } From 0d57159eca8f3bfc2d009da57a253298d127d0e4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 8 Oct 2018 22:21:09 +0200 Subject: [PATCH 286/992] dwarf-fortress: fix build error --- pkgs/games/dwarf-fortress/wrapper/default.nix | 65 +++++++++---------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 8d9f06ffe143..058bb5f72ae6 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildEnv, substituteAll +{ stdenv, lib, buildEnv, substituteAll, runCommand , dwarf-fortress, dwarf-fortress-unfuck , dwarf-therapist , enableDFHack ? false, dfhack @@ -33,44 +33,41 @@ let ++ lib.optional enableTWBT twbt.art ++ [ dwarf-fortress ]; + fixup = lib.singleton (runCommand "fixup" {} '' + mkdir -p $out/data/init + cp ${dwarf-fortress}/data/init/init.txt $out/data/init/init.txt + '' + lib.optionalString enableDFHack '' + mkdir -p $out/hack + + # Patch the MD5 + orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig") + patched_md5=$(cat "${dwarf-fortress}/hash.md5") + input_file="${dfhack_}/hack/symbols.xml" + output_file="$out/hack/symbols.xml" + + echo "[DFHack Wrapper] Fixing Dwarf Fortress MD5:" + echo " Input: $input_file" + echo " Search: $orig_md5" + echo " Output: $output_file" + echo " Replace: $patched_md5" + + substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5" + '' + lib.optionalString enableTWBT '' + substituteInPlace $out/data/init/init.txt \ + --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' + '' + '' + substituteInPlace $out/data/init/init.txt \ + --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ + --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ + --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' + ''); + env = buildEnv { name = "dwarf-fortress-env-${dwarf-fortress.dfVersion}"; - paths = themePkg ++ pkgs; + paths = fixup ++ themePkg ++ pkgs; pathsToLink = [ "/" "/hack" "/hack/scripts" ]; - postBuild = '' - # De-symlink init.txt - cp $out/data/init/init.txt init.txt - rm -f $out/data/init/init.txt - mv init.txt $out/data/init/init.txt - '' + lib.optionalString enableDFHack '' - # De-symlink symbols.xml - rm $out/hack/symbols.xml - - # Patch the MD5 - orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig") - patched_md5=$(cat "${dwarf-fortress}/hash.md5") - input_file="${dfhack_}/hack/symbols.xml" - output_file="$out/hack/symbols.xml" - - echo "[DFHack Wrapper] Fixing Dwarf Fortress MD5:" - echo " Input: $input_file" - echo " Search: $orig_md5" - echo " Output: $output_file" - echo " Replace: $patched_md5" - - substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5" - '' + lib.optionalString enableTWBT '' - substituteInPlace $out/data/init/init.txt \ - --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' - '' + '' - substituteInPlace $out/data/init/init.txt \ - --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \ - --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ - --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' - ''; - ignoreCollisions = true; }; in From 9428c28f7a37038b594c5ff36b1669b0f21afe41 Mon Sep 17 00:00:00 2001 From: joncojonathan Date: Mon, 8 Oct 2018 18:18:58 +0100 Subject: [PATCH 287/992] CONTRIBUTING.md: add clarification on periods in commit messages --- .github/CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 576beb18de6a..2b88f15d276e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -20,6 +20,8 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. (Motivation for change. Additional information.) ``` + For consistency, there should not be a period at the end of the commit message. + Examples: * nginx: init at 2.0.1 From cd2145b33229d6d4f0ad77759083699570e67f51 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 8 Oct 2018 22:37:05 +0200 Subject: [PATCH 288/992] enchant: add license --- pkgs/development/libraries/enchant/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix index c51475ecc2a9..a9446306d335 100644 --- a/pkgs/development/libraries/enchant/default.nix +++ b/pkgs/development/libraries/enchant/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ aspell glib hunspell hspell ]; - meta = { + meta = with stdenv.lib; { description = "Generic spell checking library"; homepage = http://www.abisource.com/enchant; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl21; }; } From abbc68a7560a085637e68cc26b7bee1594457d55 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 8 Oct 2018 22:38:48 +0200 Subject: [PATCH 289/992] farstream: add license --- pkgs/development/libraries/farstream/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 020d04542864..924fb52b0900 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -24,10 +24,10 @@ in stdenv.mkDerivation rec { gst-plugins-good gst-plugins-bad gst-libav ]; - meta = { + meta = with stdenv.lib; { homepage = https://www.freedesktop.org/wiki/Software/Farstream; description = "Audio/Video Communications Framework formely known as farsight"; - maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.lgpl21; }; } From 5ebf16dc9e20e5ef3d6f15fce47cea724ce523d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Mon, 8 Oct 2018 22:42:31 +0200 Subject: [PATCH 290/992] slic3r-prusa3d: mark as broken on aarch64 --- pkgs/applications/misc/slic3r/prusa3d.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 15517de3aed1..7df4007cf403 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { description = "G-code generator for 3D printer"; homepage = https://github.com/prusa3d/Slic3r; license = licenses.agpl3; - platforms = subtractLists ["aarch64-linux"] platforms.linux; maintainers = with maintainers; [ tweber ]; + broken = stdenv.hostPlatform.isAarch64; }; } From 01a0b1f0c31f74b1744e40123cd0e7740c4c81e2 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Tue, 17 Jul 2018 00:10:15 +0000 Subject: [PATCH 291/992] kdbg: init at 3.0.0 --- pkgs/development/tools/misc/kdbg/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/misc/kdbg/default.nix diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix new file mode 100644 index 000000000000..b431e804d8dc --- /dev/null +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, cmake, extra-cmake-modules, qt5, + ki18n, kconfig, kiconthemes, kxmlgui, kwindowsystem, +}: + +stdenv.mkDerivation rec { + name = "kdbg-${version}"; + version = "3.0.0"; + src = fetchurl { + url = "mirror://sourceforge/kdbg/${version}/${name}.tar.gz"; + sha256 = "0lxfal6jijdcrf0hc81gmapfmz0kq4569d5qzfm4p72rq9s4r5in"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ qt5.qtbase ki18n kconfig kiconthemes kxmlgui kwindowsystem ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.kdbg.org/; + description = '' + A graphical user interface to gdb, the GNU debugger. It provides an + intuitive interface for setting breakpoints, inspecting variables, and + stepping through code. + ''; + license = licenses.gpl2; + maintainers = [ maintainers.catern ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15c4a5944a16..e41f2dcb69ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3624,6 +3624,8 @@ with pkgs; lvmsync = callPackage ../tools/backup/lvmsync { }; + kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; + kippo = callPackage ../servers/kippo { }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; From 0ad87d7ae0b1e559a176b3f4c726a010604f04f2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 8 Oct 2018 22:54:55 +0200 Subject: [PATCH 292/992] bitlbee-discord: 2017-12-27 -> 0.4.1 --- .../instant-messengers/bitlbee-discord/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 00636c7c1e9a..4dd26103cbe6 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -2,13 +2,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-discord-2017-12-27"; + name = "bitlbee-discord-${version}"; + version = "0.4.1"; src = fetchFromGitHub { - rev = "6a03db169ad44fee55609ecd16e19f3c0f99a182"; + rev = version; owner = "sm00th"; repo = "bitlbee-discord"; - sha256 = "1ci9a12c6zg8d6i9f95pq6dal79cp4klmmsyj8ag2gin90kl3x95"; + sha256 = "1n3xw5mcmg7224r09gbm39bd6h2158dwl6jx21290636b4345f4c"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From c8a2533516b4174455601572c80298d0c23b08c8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 19:34:26 +0200 Subject: [PATCH 293/992] opencv3: Reduce closure size from 520 to 154 MiB --- pkgs/development/libraries/opencv/3.x.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index dd87fa932604..64aa11e17634 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -165,6 +165,11 @@ stdenv.mkDerivation rec { ${installExtraFiles face} ''); + postConfigure = '' + [ -e modules/core/version_string.inc ] + echo '"(build info elided)"' > modules/core/version_string.inc + ''; + buildInputs = [ zlib pcre hdf5 glog boost google-gflags protobuf ] ++ lib.optional enablePython pythonPackages.python From cd3a0b7f38e3872872db91556b6d277265e95b8e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 20:23:02 +0200 Subject: [PATCH 294/992] libqtav: Reduce closure size from 734 to 457 MiB --- pkgs/development/libraries/libqtav/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index b291ec2fdf0b..048ba48bb674 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools -, libGLU_combined, libX11 +, libGL, libX11 , libass, openal, ffmpeg, libuchardet , alsaLib, libpulseaudio, libva }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase qtmultimedia qtquick1 - libGLU_combined libX11 + libGL libX11 libass openal ffmpeg libuchardet alsaLib libpulseaudio libva ]; @@ -27,18 +27,20 @@ mkDerivation rec { fetchSubmodules = true; }; - # Make sure libqtav finds its libGL dependancy at both link and run time - # by adding libGLU_combined to rpath. Not sure why it wasn't done automatically like - # the other libraries as `libGLU_combined` is part of our `buildInputs`. - NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGLU_combined}/lib"]; + # Make sure libqtav finds its libGL dependency at both link and run time + # by adding libGL to rpath. Not sure why it wasn't done automatically like + # the other libraries as `libGL` is part of our `buildInputs`. + NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGL}/lib"]; preFixup = '' mkdir -p "$out/bin" cp -a "./bin/"* "$out/bin" ''; + stripDebugList = [ "lib" "libexec" "bin" "qml" ]; + meta = { - description = "A multimedia playback framework based on Qt + FFmpeg."; + description = "A multimedia playback framework based on Qt + FFmpeg"; #license = licenses.lgpl21; # For the libraries / headers only. license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. homepage = http://www.qtav.org/; From 13c1f26807140e3821262022d43378864543ebb4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 21:20:34 +0200 Subject: [PATCH 295/992] marble: Add dev output --- pkgs/applications/kde/marble.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index e0e80b05ebce..ea140cad5ee5 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -8,6 +8,7 @@ mkDerivation { name = "marble"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; propagatedBuildInputs = [ qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts From a3382a85b38227f9c82ce325150c57250c9514bb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 21:50:48 +0200 Subject: [PATCH 296/992] digikam: libGLU_combined -> libGL + libGLU This prevents a runtime dependency on a large number of -dev outputs. --- pkgs/applications/graphics/digikam/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index a31bbe8caeb6..fb99d3e38322 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -34,7 +34,8 @@ , libqtav , libusb1 , marble -, libGLU_combined +, libGL +, libGLU , opencv3 , pcre , threadweaver @@ -75,7 +76,8 @@ mkDerivation rec { liblqr1 libqtav libusb1 - libGLU_combined + libGL + libGLU opencv3 pcre From 1eff910a15c58873fc9bbb46934ba354bef612a3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 21:59:26 +0200 Subject: [PATCH 297/992] lsof: Don't record compiler flags / build kernel This removed glibc.dev from the closure and improves binary reproducibility. --- pkgs/development/tools/misc/lsof/default.nix | 2 +- .../tools/misc/lsof/no-build-info.patch | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/lsof/no-build-info.patch diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 0a5a3c487810..63003f338eb9 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; + patches = [ ./no-build-info.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1 diff --git a/pkgs/development/tools/misc/lsof/no-build-info.patch b/pkgs/development/tools/misc/lsof/no-build-info.patch new file mode 100644 index 000000000000..cf785e248f2a --- /dev/null +++ b/pkgs/development/tools/misc/lsof/no-build-info.patch @@ -0,0 +1,43 @@ +diff -ru -x '*~' lsof_4.91_src-orig/usage.c lsof_4.91_src/usage.c +--- lsof_4.91_src-orig/usage.c 2018-02-14 15:20:32.000000000 +0100 ++++ lsof_4.91_src/usage.c 2018-10-08 21:57:45.718560869 +0200 +@@ -930,26 +930,6 @@ + (void) fprintf(stderr, " configuration info: %s\n", cp); + #endif /* defined(LSOF_CINFO) */ + +- if ((cp = isnullstr(LSOF_CCDATE))) +- (void) fprintf(stderr, " constructed: %s\n", cp); +- cp = isnullstr(LSOF_HOST); +- if (!(cp1 = isnullstr(LSOF_LOGNAME))) +- cp1 = isnullstr(LSOF_USER); +- if (cp || cp1) { +- if (cp && cp1) +- cp2 = "by and on"; +- else if (cp) +- cp2 = "on"; +- else +- cp2 = "by"; +- (void) fprintf(stderr, " constructed %s: %s%s%s\n", +- cp2, +- cp1 ? cp1 : "", +- (cp && cp1) ? "@" : "", +- cp ? cp : "" +- ); +- } +- + #if defined(LSOF_BLDCMT) + if ((cp = isnullstr(LSOF_BLDCMT))) + (void) fprintf(stderr, " builder's comment: %s\n", cp); +@@ -959,12 +939,8 @@ + (void) fprintf(stderr, " compiler: %s\n", cp); + if ((cp = isnullstr(LSOF_CCV))) + (void) fprintf(stderr, " compiler version: %s\n", cp); +- if ((cp = isnullstr(LSOF_CCFLAGS))) +- (void) fprintf(stderr, " compiler flags: %s\n", cp); + if ((cp = isnullstr(LSOF_LDFLAGS))) + (void) fprintf(stderr, " loader flags: %s\n", cp); +- if ((cp = isnullstr(LSOF_SYSINFO))) +- (void) fprintf(stderr, " system info: %s\n", cp); + (void) report_SECURITY(" ", ".\n"); + (void) report_WARNDEVACCESS(" ", "are", ".\n"); + (void) report_HASKERNIDCK(" K", "is"); From 642b68cfcc8479903ce9db9f1735452ce523425c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 22:40:56 +0200 Subject: [PATCH 298/992] nfs-utils: Reduce closure size from 269 to 135 MiB --- pkgs/os-specific/linux/nfs-utils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 86e9e0d3d4d0..a86c7d75f043 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -94,6 +94,8 @@ in stdenv.mkDerivation rec { $out/etc/systemd/system/* ''; + stripDebugList = [ "bin" "lib" "etc" ]; + # One test fails on mips. doCheck = !stdenv.isMips; From 5352cb3748a80a5471f7ed216372aaa0cd1b465e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Mon, 8 Oct 2018 16:59:49 -0400 Subject: [PATCH 299/992] pythonPackages.av: 0.4.1 -> 0.5.3 --- pkgs/development/python-modules/av/default.nix | 12 ++++++------ pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 7e68265eed83..4440edc22362 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -4,7 +4,7 @@ , nose , pillow , numpy -, ffmpeg_2 +, ffmpeg_4 , git , libav , pkgconfig @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "av"; - version = "0.4.1"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "bf9a8d113392c6a445f424e16f9e64ac53d1db1548731e6326763d555647c24f"; + sha256 = "0k5nbff8c2wxc8wnyn1qghndbd2rjck1y3552s63w41mccj1k1qr"; }; - buildInputs = [ nose pillow numpy ffmpeg_2 git libav pkgconfig ]; + buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ]; - # Because of https://github.com/mikeboers/PyAV/issues/152 + # Tests require downloading files from internet doCheck = false; meta = { @@ -29,4 +29,4 @@ buildPythonPackage rec { homepage = https://github.com/mikeboers/PyAV/; license = lib.licenses.bsd2; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f04a0e710d5..37ea0c59fa62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -744,9 +744,7 @@ in { autopep8 = callPackage ../development/python-modules/autopep8 { }; - av = callPackage ../development/python-modules/av { - inherit (pkgs) ffmpeg_2 git libav pkgconfig; - }; + av = callPackage ../development/python-modules/av { }; avro = callPackage ../development/python-modules/avro {}; From c40ba6355e244ffc120eea12b440bed9c96fb6b4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2018 23:02:51 +0200 Subject: [PATCH 300/992] Revert "nfs-utils: Reduce closure size from 269 to 135 MiB" This reverts commit 642b68cfcc8479903ce9db9f1735452ce523425c. --- pkgs/os-specific/linux/nfs-utils/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index a86c7d75f043..86e9e0d3d4d0 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -94,8 +94,6 @@ in stdenv.mkDerivation rec { $out/etc/systemd/system/* ''; - stripDebugList = [ "bin" "lib" "etc" ]; - # One test fails on mips. doCheck = !stdenv.isMips; From 5a752ad8797f27e87490894a862b001560ab3c14 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 8 Oct 2018 23:05:15 +0200 Subject: [PATCH 301/992] nixos/gnome3: don't autoenable gdm This seems to cause problems if people have other display-managers enabled --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index eb86f7b53bb6..0d5b860d4617 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -133,7 +133,6 @@ in { fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; - services.xserver.displayManager.gdm.enable = mkDefault true; services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]; services.xserver.displayManager.sessionCommands = '' From b04da30d6554063e3483c45b2728dc86fd1935e5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 8 Oct 2018 23:05:56 +0200 Subject: [PATCH 302/992] libungif: add license + description --- pkgs/development/libraries/giflib/libungif.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix index 357ca751ccf1..6336d30aebad 100644 --- a/pkgs/development/libraries/giflib/libungif.nix +++ b/pkgs/development/libraries/giflib/libungif.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Library and utilities for processing GIFs"; + platforms = platforms.unix; + license = licenses.mit; }; } From 154e9e11f7517fe0824e8ebc5aa3cee32cae4610 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 8 Oct 2018 23:08:14 +0200 Subject: [PATCH 303/992] gobject-introspection: add licenses --- pkgs/development/libraries/gobject-introspection/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index b2c0a9f89a48..482710f18df5 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { homepage = http://live.gnome.org/GObjectIntrospection; maintainers = with maintainers; [ lovek323 lethalman ]; platforms = platforms.unix; + license = with licenses; [ gpl2 lgpl2 ]; longDescription = '' GObject introspection is a middleware layer between C libraries (using From 03bcca7a457e60bbfd80272347a2a85ff821b832 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Wed, 3 Oct 2018 18:19:21 -0700 Subject: [PATCH 304/992] nodePackages_8_x: add gulp-cli --- .../node-packages/node-packages-v8.json | 1 + .../node-packages/node-packages-v8.nix | 1636 +++++++++++------ 2 files changed, 1120 insertions(+), 517 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 40d70f198abf..779e6389bd39 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -36,6 +36,7 @@ , "grunt-cli" , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } , "gulp" +, "gulp-cli" , "hipache" , "htmlhint" , "html-minifier" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index c419a0db44e1..de90e1d188c5 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -103,13 +103,13 @@ let sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA=="; }; }; - "@commitlint/cli-7.1.2" = { + "@commitlint/cli-7.2.0" = { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.1.2.tgz"; - sha512 = "Dck7MqJCzrATYm4UqIKPdJvLVUuVZcpFw9KicrLw+a9YNIjsaXG9XojgPomTxFBNJZabAYBqKWkqNoFLrFA77w=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.2.0.tgz"; + sha512 = "qFTXZoyi+XFkUXRj1pgcfRw5ao31kPkP/V3c7O8SU52GUVxFo2LM8sFiTF9WEqlgSd7WJA0SGl5tOX/VtCMYEA=="; }; }; "@commitlint/config-conventional-7.1.2" = { @@ -121,13 +121,13 @@ let sha512 = "DmA4ixkpv03qA1TVs1Bl25QsVym2bPL6pKapesALWIVggG3OpwqGZ55vN75Tx8xZoG7LFKrVyrt7kwhA7X8njQ=="; }; }; - "@commitlint/ensure-7.1.2" = { + "@commitlint/ensure-7.2.0" = { name = "_at_commitlint_slash_ensure"; packageName = "@commitlint/ensure"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-7.1.2.tgz"; - sha512 = "F0U4UEMgB5lnscgiZtuUolFkQ/dRD4RzXs8KgCik2D0wL3fUXSB5hmfbrbMF9ERseVQCHsxCHWm7bKzxKmXgIA=="; + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-7.2.0.tgz"; + sha512 = "j2AJE4eDeLP6O/Z1CdPwEXAzcrRRoeeHLuvW8bldQ4J2nHiX9hzmSe87H87Ob8Avm+zIegsqVPGaBAtRmbODYw=="; }; }; "@commitlint/execute-rule-7.1.2" = { @@ -139,40 +139,40 @@ let sha512 = "EP/SqX2U2L4AQHglZ2vGM1pvHJOh3sbYtHn1QhtllqEpsdmhuNpVPSGHP/r9OD2h4i90vtnWgZQoskt2MkbknA=="; }; }; - "@commitlint/format-7.1.2" = { + "@commitlint/format-7.2.0" = { name = "_at_commitlint_slash_format"; packageName = "@commitlint/format"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-7.1.2.tgz"; - sha512 = "l+eQChtIeNOddi4t5p+T9ViFXQMMFWIbzKh708YCI8BoByhqedhLsEhEn1nzGq1cVYT2AdGRhY8ed6/Nc5z85w=="; + url = "https://registry.npmjs.org/@commitlint/format/-/format-7.2.0.tgz"; + sha512 = "Vx10wFyP3yfE4tq1x0HWb/vqkZc5+79uWak91sARSu5wG5JVzBvQXxfqOhefOKbVqXGKXlP2yXrSq8fM6YUQ3w=="; }; }; - "@commitlint/is-ignored-7.1.2" = { + "@commitlint/is-ignored-7.2.0" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.1.2.tgz"; - sha512 = "29SHreGSAKxOTtIdG1swo9E14E8KZbyE0Y1u0wz9iKjb6i0m7ahZW0l4Ty+j3pACiYDOOXDW1BWSOFaBwwKlxQ=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.2.0.tgz"; + sha512 = "6HCkLSuh4hms72x0EJp9mt9UXq27MRpZtmf7exhBnYqNyd76vMMA7/nGjdULxldr2xyzlzKNjMbh2lpQRD4aog=="; }; }; - "@commitlint/lint-7.1.2" = { + "@commitlint/lint-7.2.0" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.1.2.tgz"; - sha512 = "HCkMlnUZD4yVnGDHcJQN/PkJRQpKgsiLojUaUHE8b1YjWW+qviolizbZjcqs/nimzCWlAkaU5KPs+3pzGBfVug=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.2.0.tgz"; + sha512 = "aZAiQggpF638/XmY7EJe5yTEhg4C4GrxWktcdEDMQrRG1phFUPp+AKXBqljDYzrpmptiL9glY3fLO1m5XzA+BA=="; }; }; - "@commitlint/load-7.1.2" = { + "@commitlint/load-7.2.0" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-7.1.2.tgz"; - sha512 = "BEQ9k3iZjB1NDAblmB88WU+256p8xHCWYuqZmJOerx6Upbam7XrpDTurMOKFUxk8tZU9OBqHQtBapX8UxJWi9A=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-7.2.0.tgz"; + sha512 = "+7rh1jeYhSMj6+zzZVbo5bMnuWx1nL4c5JJdEq3rMQT6ILI169xlL94sPdkz0to6dDmi4yLgC4/kipyLyynriA=="; }; }; "@commitlint/message-7.1.2" = { @@ -211,13 +211,13 @@ let sha512 = "zwbifMB9DeHP4sYQdrkx+XJh5Q1lyP/OdlErUCC34NV4Lkxw/XxXF4St3e+y1X28/SgrEc2XSOS6n/vQQfUlLA=="; }; }; - "@commitlint/rules-7.1.2" = { + "@commitlint/rules-7.2.0" = { name = "_at_commitlint_slash_rules"; packageName = "@commitlint/rules"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-7.1.2.tgz"; - sha512 = "O9fONZXiJ6NN2mfy+enHmeTzBHcfDVVYjxTdBJFp99yUSvVyHaD+jc2r795gcMv3oP5594BDXSKcD/3yb8sLzA=="; + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-7.2.0.tgz"; + sha512 = "c15Q9H5iYE9fnncLnFnMuvPLYA/i0pve5moV0uxJJGr4GgJoBKyldd4CCDhoE80C1k8ABuqr2o2qsopzVEp3Ww=="; }; }; "@commitlint/to-lines-7.1.2" = { @@ -310,49 +310,40 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@ionic/cli-framework-1.0.7" = { + "@ionic/cli-framework-1.1.1" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "1.0.7"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.0.7.tgz"; - sha512 = "e6yaPkqom2KVNgUpJJMJbClkc8n4r4pOieiVEgfVmjC0ZC1wRZ3hYHzUMbsY/QOnB3UceCBGuYZMScaF/QNY8g=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.1.tgz"; + sha512 = "atY7TZO7Lh00iz9TIkEuzAg+h+onaf9tR5Xdq365grIDlOD6iRm1xAYKkLOzlObzNQ3WqDW5vqKmtiVrvg3Kfg=="; }; }; - "@ionic/cli-utils-2.2.1" = { - name = "_at_ionic_slash_cli-utils"; - packageName = "@ionic/cli-utils"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-2.2.1.tgz"; - sha512 = "/fAsYbgNOVcQhihW3EBy//FtBD/uhZyLA/fCd42UbHloR1uNo0KsGW7dh2i5NBYsaYsOequV5ZxGk2p0Wr5HWw=="; - }; - }; - "@ionic/discover-1.0.4" = { + "@ionic/discover-1.0.6" = { name = "_at_ionic_slash_discover"; packageName = "@ionic/discover"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.4.tgz"; - sha512 = "/9WbB31cv0nr2M8Vi4O2coDiX27IJ5EXwGKrgnV0X0/dfavObNVqV9ksNcHnZTuNArqBXywOsWPIES0+tHXIhA=="; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.6.tgz"; + sha512 = "7OsJ4Kr6G9PWVOFdlfXuM7Cz39qFff60dOOzPpIwDXInive+jk42pZ9aKPz/3NMrwWULUOY8pSZ4leiZJNPFpg=="; }; }; - "@ionic/utils-fs-0.0.1" = { + "@ionic/utils-fs-0.0.3" = { name = "_at_ionic_slash_utils-fs"; packageName = "@ionic/utils-fs"; - version = "0.0.1"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.1.tgz"; - sha512 = "l5+RM7lEIKSsxAUyNiarHuNJBioJhFM4CAezZ7YRyFoX6J7Y4paZIfZzoFa6UdNsyucE51lZ1X/6ZOf/gVj73Q=="; + url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.3.tgz"; + sha512 = "nj976Lms/0ocagWkfizM/zSWwfYRMOnT+wgNO3B9LMW8OjOH/llxTulBvTih0epqgLl9jjU7moW310BeECVC4g=="; }; }; - "@ionic/utils-network-0.0.1" = { + "@ionic/utils-network-0.0.3" = { name = "_at_ionic_slash_utils-network"; packageName = "@ionic/utils-network"; - version = "0.0.1"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.1.tgz"; - sha512 = "qpzZ+k94PCWbWmub2XHP0XJKcoBflGeOAW64RlIbthoIzj0SRwoYjn4DrFVbYhScQ/xmLe1hSD2Hq8NZ4HEM5g=="; + url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.3.tgz"; + sha512 = "jc71iYRTg+st9K39rHtT2FWcgtVP9QIWTaDt4o+WFDD1lUicscosFncx5DEzHsb3Shn24SgbiqhcfQ2F//nfyw=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -364,13 +355,13 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.3.2" = { + "@lerna/add-3.4.1" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.3.2.tgz"; - sha512 = "nKRRRKb4wt/GAywi8P++NY1TUiyhMs2g2KHSb41I4/qiCFQnTj2zkeshPyNmtBGjKzFXnOqrmc/8Wa2vmHHZVg=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.4.1.tgz"; + sha512 = "Vf54B42jlD6G52qnv/cAGH70cVQIa+LX//lfsbkxHvzkhIqBl5J4KsnTOPkA9uq3R+zP58ayicCHB9ReiEWGJg=="; }; }; "@lerna/batch-packages-3.1.2" = { @@ -382,22 +373,22 @@ let sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ=="; }; }; - "@lerna/bootstrap-3.3.2" = { + "@lerna/bootstrap-3.4.1" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.3.2.tgz"; - sha512 = "f0/FZ6iCXHNpHoUiM3wfmiJebHetrquP9mdNT7t//2iTGm1nz8iuKSLhfu9APazDXtqo3aDFx7JvuYKMg+GiXQ=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.4.1.tgz"; + sha512 = "yZDJgNm/KDoRH2klzmQGmpWMg/XMzWgeWvauXkrfW/mj1wwmufOuh5pN4fBFxVmUUa/RFZdfMeaaJt3+W3PPBw=="; }; }; - "@lerna/changed-3.3.2" = { + "@lerna/changed-3.4.1" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.3.2.tgz"; - sha512 = "wLH6RzYPQAryrsJakc9I3k0aFWE/cJyWoUD8dQy186jxwtLgeQdVc0+NegNyab7MIPi7Hsv9A3hx6lM1rPH94A=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.4.1.tgz"; + sha512 = "gT7fhl4zQWyGETDO4Yy5wsFnqNlBSsezncS1nkMW1uO6jwnolwYqcr1KbrMR8HdmsZBn/00Y0mRnbtbpPPey8w=="; }; }; "@lerna/check-working-tree-3.3.0" = { @@ -454,22 +445,22 @@ let sha512 = "NTOkLEKlWcBLHSvUr9tzVpV7RJ4GROLeOuZ6RfztGOW/31JPSwVVBD2kPifEXNZunldOx5GVWukR+7+NpAWhsg=="; }; }; - "@lerna/conventional-commits-3.3.0" = { + "@lerna/conventional-commits-3.4.1" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.3.0.tgz"; - sha512 = "nUFardc5G4jG5LI/Jlw0kblzlRLJ08ut6uJjHXTnUE/QJuKYaqBZm6goGG8OSxp/WltklndkQUOtThyZpefviA=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.4.1.tgz"; + sha512 = "3NETrA58aUkaEW3RdwdJ766Bg9NVpLzb26mtdlsJQcvB5sQBWH5dJSHIVQH1QsGloBeH2pE/mDUEVY8ZJXuR4w=="; }; }; - "@lerna/create-3.3.1" = { + "@lerna/create-3.4.1" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.3.1.tgz"; - sha512 = "4VASkTLvN66euTcWMPN2vIzEoP07hgutx7V70CXSOc+DiWV8S22z0PjXATi2yli83TC/Qj4gHYtU2futQrdY1A=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.4.1.tgz"; + sha512 = "l+4t2SRO5nvW0MNYY+EWxbaMHsAN8bkWH3nyt7EzhBjs4+TlRAJRIEqd8o9NWznheE3pzwczFz1Qfl3BWbyM5A=="; }; }; "@lerna/create-symlink-3.3.0" = { @@ -607,13 +598,13 @@ let sha512 = "vVQHgMagE2wnbxhNY9nFkdu+Cx2TsyWalkJfkxbNzmo6gOCrDsxCBDj9vTEV8Q+4aWx0C0Bsc0sB2Eb8y/+ofA=="; }; }; - "@lerna/npm-conf-3.0.0" = { + "@lerna/npm-conf-3.4.1" = { name = "_at_lerna_slash_npm-conf"; packageName = "@lerna/npm-conf"; - version = "3.0.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.0.0.tgz"; - sha512 = "xXG7qt349t+xzaHTQELmIDjbq8Q49HOMR8Nx/gTDBkMl02Fno91LXFnA4A7ErPiyUSGqNSfLw+zgij0hgpeN7w=="; + url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.4.1.tgz"; + sha512 = "i9G6DnbCqiAqxKx2rSXej/n14qxlV/XOebL6QZonxJKzNTB+Q2wglnhTXmfZXTPJfoqimLaY4NfAEtbOXRWOXQ=="; }; }; "@lerna/npm-dist-tag-3.3.0" = { @@ -697,13 +688,13 @@ let sha512 = "eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ=="; }; }; - "@lerna/publish-3.4.0" = { + "@lerna/publish-3.4.1" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.0.tgz"; - sha512 = "wcqWDKbkDjyj6F9Mw4/LL2CtpCN61RazNKxYm+fyJ20P2zfcAwLEwxttA6ZWIO8xUiLXkCTFIhwOulHyAPAq3w=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.1.tgz"; + sha512 = "Nd5PT2Ksngo1GHqT6ccmGVfMvoA9MplBvqyzPFIjFIJOgODrJ9IGJAMobxgBQ6xXXShflQ/1dHWk8faTOYKLoQ=="; }; }; "@lerna/resolve-symlink-3.3.0" = { @@ -733,13 +724,13 @@ let sha512 = "cruwRGZZWnQ5I0M+AqcoT3Xpq2wj3135iVw4n59/Op6dZu50sMFXZNLiTTTZ15k8rTKjydcccJMdPSpTHbH7/A=="; }; }; - "@lerna/run-lifecycle-3.3.1" = { + "@lerna/run-lifecycle-3.4.1" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.3.1.tgz"; - sha512 = "xy4K3amlXk0LjSa5d3VqmrW9SsxMyvI7lw2dHDMb5PqjjcjMQgb6+nFbycwyJMhCP8u7MwQIZ4hFYF9XYbWSzQ=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.4.1.tgz"; + sha512 = "N/hi2srM9A4BWEkXccP7vCEbf4MmIuALF00DTBMvc0A/ccItwUpl3XNuM7+ADDRK0mkwE3hDw89lJ3A7f8oUQw=="; }; }; "@lerna/run-parallel-batches-3.0.0" = { @@ -778,13 +769,13 @@ let sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA=="; }; }; - "@lerna/version-3.3.2" = { + "@lerna/version-3.4.1" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.3.2.tgz"; - sha512 = "2MHP6mA1f0t3UdzqPpfgAhsT1L64HOedlJxrQUoHrkou/G25Od4wjmKr9OZ0Oc4CLDbXD/sYEmE/9fZi1GGgKg=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.4.1.tgz"; + sha512 = "oefNaQLBJSI2WLZXw5XxDXk4NyF5/ct0V9ys/J308NpgZthPgwRPjk9ZR0o1IOxW1ABi6z3E317W/dxHDjvAkg=="; }; }; "@lerna/write-log-file-3.0.0" = { @@ -1048,22 +1039,22 @@ let sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="; }; }; - "@types/node-10.11.3" = { + "@types/node-10.11.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.11.3"; + version = "10.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.11.3.tgz"; - sha512 = "3AvcEJAh9EMatxs+OxAlvAEs7OTy6AG94mcH1iqyVDwVVndekLxzwkWQ/Z4SDbY6GO2oyUXyWW8tQ4rENSSQVQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.11.4.tgz"; + sha512 = "ojnbBiKkZFYRfQpmtnnWTMw+rzGp/JiystjluW9jgN3VzRwilXddJ6aGQ9V/7iuDG06SBgn7ozW9k3zcAnYjYQ=="; }; }; - "@types/node-8.10.30" = { + "@types/node-8.10.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.30"; + version = "8.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.30.tgz"; - sha512 = "Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.34.tgz"; + sha512 = "alypNiaAEd0RBGXoWehJ2gchPYCITmw4CYBoB5nDlji8l8on7FsklfdfIs4DDmgpKLSX3OF3ha6SV+0W7cTzUA=="; }; }; "@types/range-parser-1.2.2" = { @@ -2074,6 +2065,15 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; + "ansi-regex-4.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz"; + sha512 = "iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w=="; + }; + }; "ansi-split-1.0.1" = { name = "ansi-split"; packageName = "ansi-split"; @@ -2218,13 +2218,13 @@ let sha512 = "xEDrUvo3U2mQKSzA8NzQmgeqK4ytwFnTGl2YKGKPfG0+r8fZdswKp6CDBue29KLO8KkSuqW/hntveWrAdK51FQ=="; }; }; - "apollo-cache-inmemory-1.3.0" = { + "apollo-cache-inmemory-1.3.5" = { name = "apollo-cache-inmemory"; packageName = "apollo-cache-inmemory"; - version = "1.3.0"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.0.tgz"; - sha512 = "7NXKkICo/JswTfTf7E3XAt5qcmt8xydUk86LbFrNiM9w3mHNIJnCJZdycuy34bx4DWsA+Bex4oYDB4H70v4maQ=="; + url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.5.tgz"; + sha512 = "CD4Dl9vcCp7N05KUqR3rNDj2WJ1DQNNfeyBUIo5T6XTiUhfBQp5x+CL7S+ezy5mPp+xo4TnwFzLFh/vy2LdDog=="; }; }; "apollo-client-2.4.2" = { @@ -2812,6 +2812,15 @@ let sha512 = "B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w=="; }; }; + "array-sort-1.0.0" = { + name = "array-sort"; + packageName = "array-sort"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz"; + sha512 = "ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg=="; + }; + }; "array-union-1.0.2" = { name = "array-union"; packageName = "array-union"; @@ -3253,13 +3262,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.325.0" = { + "aws-sdk-2.330.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.325.0"; + version = "2.330.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.325.0.tgz"; - sha512 = "26V/4vzInQ5EO/+HCoZaXO5YB6XWo4sRXbNtc3bFEcUfMZ5Psin2M8McY/zasJyYbZuNisK608kjio+AXm8vig=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.330.0.tgz"; + sha512 = "biW3J8S9/b9uqeED2jbBHEbscwIclc0PBiylUkd3lJ5s226Yuv7mwSOfoI2Eogpyg/i97phK3uiUb/Q89/pCpQ=="; }; }; "aws-sign-0.2.1" = { @@ -4392,7 +4401,7 @@ let packageName = "bl"; version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; + url = "http://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; }; }; @@ -4401,7 +4410,7 @@ let packageName = "bl"; version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + url = "http://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; }; }; @@ -4410,7 +4419,7 @@ let packageName = "bl"; version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; + url = "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; }; }; @@ -4419,7 +4428,7 @@ let packageName = "bl"; version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; + url = "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz"; sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; }; }; @@ -4720,6 +4729,15 @@ let sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e"; }; }; + "bplist-creator-0.0.7" = { + name = "bplist-creator"; + packageName = "bplist-creator"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz"; + sha1 = "37df1536092824b87c42f957b01344117372ae45"; + }; + }; "bplist-parser-0.1.1" = { name = "bplist-parser"; packageName = "bplist-parser"; @@ -6889,6 +6907,15 @@ let sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ=="; }; }; + "commander-2.19.0" = { + name = "commander"; + packageName = "commander"; + version = "2.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"; + sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; + }; + }; "commander-2.3.0" = { name = "commander"; packageName = "commander"; @@ -7475,40 +7502,49 @@ let sha512 = "suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg=="; }; }; - "conventional-changelog-core-2.0.11" = { + "conventional-changelog-angular-5.0.1" = { + name = "conventional-changelog-angular"; + packageName = "conventional-changelog-angular"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.1.tgz"; + sha512 = "q4ylJ68fWZDdrFC9z4zKcf97HW6hp7Mo2YlqD4owfXhecFKy/PJCU/1oVFF4TqochchChqmZ0Vb0e0g8/MKNlA=="; + }; + }; + "conventional-changelog-core-3.1.0" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "2.0.11"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz"; - sha512 = "HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg=="; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.1.0.tgz"; + sha512 = "bcZkcFXkqVgG2W8m/1wjlp2wn/BKDcrPgw3/mvSEQtzs8Pax8JbAPFpEQReHY92+EKNNXC67wLA8y2xcNx0rDA=="; }; }; - "conventional-changelog-preset-loader-1.1.8" = { + "conventional-changelog-preset-loader-2.0.1" = { name = "conventional-changelog-preset-loader"; packageName = "conventional-changelog-preset-loader"; - version = "1.1.8"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz"; - sha512 = "MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw=="; + url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.1.tgz"; + sha512 = "HiSfhXNzAzG9klIqJaA97MMiNBR4js+53g4Px0k7tgKeCNVXmrDrm+CY+nIqcmG5NVngEPf8rAr7iji1TWW7zg=="; }; }; - "conventional-changelog-writer-3.0.9" = { + "conventional-changelog-writer-4.0.0" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "3.0.9"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz"; - sha512 = "n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.0.tgz"; + sha512 = "hMZPe0AQ6Bi05epeK/7hz80xxk59nPA5z/b63TOHq2wigM0/akreOc8N4Jam5b9nFgKWX1e9PdPv2ewgW6bcfg=="; }; }; - "conventional-commits-filter-1.1.6" = { + "conventional-commits-filter-2.0.0" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "1.1.6"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz"; - sha512 = "KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q=="; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.0.tgz"; + sha512 = "Cfl0j1/NquB/TMVx7Wrmyq7uRM+/rPQbtVVGwzfkhZ6/yH6fcMmP0Q/9044TBZPTNdGzm46vXFXL14wbET0/Mg=="; }; }; "conventional-commits-parser-2.1.7" = { @@ -7520,13 +7556,22 @@ let sha512 = "BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ=="; }; }; - "conventional-recommended-bump-2.0.9" = { + "conventional-commits-parser-3.0.0" = { + name = "conventional-commits-parser"; + packageName = "conventional-commits-parser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz"; + sha512 = "GWh71U26BLWgMykCp+VghZ4s64wVbtseECcKQ/PvcPZR2cUnz+FUc2J9KjxNl7/ZbCxST8R03c9fc+Vi0umS9Q=="; + }; + }; + "conventional-recommended-bump-4.0.1" = { name = "conventional-recommended-bump"; packageName = "conventional-recommended-bump"; - version = "2.0.9"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-2.0.9.tgz"; - sha512 = "YE6/o+648qkX3fTNvfBsvPW3tSnbZ6ec3gF0aBahCPgyoVHU2Mw0nUAZ1h1UN65GazpORngrgRC8QCltNYHPpQ=="; + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-4.0.1.tgz"; + sha512 = "9waJvW01TUs4HQJ3khwGSSlTlKsY+5u7OrxHL+oWEoGNvaNO/0qL6qqnhS3J0Fq9fNKA9bmlf5cOXjCQoW+I4Q=="; }; }; "convert-source-map-1.1.3" = { @@ -7718,6 +7763,15 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; + "copy-props-2.0.4" = { + name = "copy-props"; + packageName = "copy-props"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz"; + sha512 = "7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A=="; + }; + }; "cordova-app-hello-world-3.12.0" = { name = "cordova-app-hello-world"; packageName = "cordova-app-hello-world"; @@ -7763,13 +7817,13 @@ let sha512 = "Qy0O3w/gwbIqIJzlyCy60nPwJlF1c74ELpsfDIGXB92/uST5nQSSUDVDP4UOfb/c6OU7yPqxhCWOGROyTYKPDw=="; }; }; - "cordova-lib-8.1.0" = { + "cordova-lib-8.1.1" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.1.0.tgz"; - sha512 = "VLLRhEaqi5bD1AxAndlPGiRD5ZX2EwUnxGxIvEUUbgZxwOceGWHM2wdI4V2nJOieJ0N8CbDRsLsOwFJQsRLOyQ=="; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.1.1.tgz"; + sha512 = "PcrlEGRGubV2c9ThcSwoVtN/1hKQ0qtwRopl4188rD10gjtt8K+NSKrnRqh6Ia5PouVUUOZBrlhBxDd5BRbfeg=="; }; }; "cordova-registry-mapper-1.1.15" = { @@ -8798,13 +8852,13 @@ let sha512 = "D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg=="; }; }; - "debug-4.0.1" = { + "debug-4.1.0" = { name = "debug"; packageName = "debug"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.0.1.tgz"; - sha512 = "K23FHJ/Mt404FSlp6gSZCevIbTMLX0j3fmHhUEhQ3Wq0FMODW3+cUSoLdy1Gx4polAf4t/lphhmHH35BB8cLYw=="; + url = "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz"; + sha512 = "heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg=="; }; }; "debug-fabulous-1.1.0" = { @@ -9028,7 +9082,7 @@ let packageName = "deepmerge"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz"; + url = "http://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz"; sha512 = "Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw=="; }; }; @@ -9041,6 +9095,15 @@ let sha512 = "urQxA1smbLZ2cBbXbaYObM1dJ82aJ2H57A1C/Kklfh/ZN1bgH4G/n5KWhdNfOK11W98gqZfyYj7W4frJJRwA2w=="; }; }; + "deepmerge-2.2.1" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz"; + sha512 = "R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="; + }; + }; "default-browser-id-1.0.4" = { name = "default-browser-id"; packageName = "default-browser-id"; @@ -9050,6 +9113,15 @@ let sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a"; }; }; + "default-compare-1.0.0" = { + name = "default-compare"; + packageName = "default-compare"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz"; + sha512 = "QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ=="; + }; + }; "default-uid-1.0.0" = { name = "default-uid"; packageName = "default-uid"; @@ -9968,6 +10040,15 @@ let sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473"; }; }; + "each-props-1.3.2" = { + name = "each-props"; + packageName = "each-props"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz"; + sha512 = "vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA=="; + }; + }; "eachr-3.2.0" = { name = "eachr"; packageName = "eachr"; @@ -10446,13 +10527,13 @@ let sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; }; }; - "envinfo-3.4.2" = { + "envinfo-5.10.0" = { name = "envinfo"; packageName = "envinfo"; - version = "3.4.2"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-3.4.2.tgz"; - sha512 = "yqKl+qfQ849zLua/aRGIs4TzNah6ypvdX6KPmK9LPP54Ea+Hqx2gFzSBmGhka8HvWcmCmffGIshG4INSh0ku6g=="; + url = "https://registry.npmjs.org/envinfo/-/envinfo-5.10.0.tgz"; + sha512 = "rXbzXWvnQxy+TcqZlARbWVQwgGVVouVJgFZhLVN5htjLxl1thstrP2ZGi0pXC309AbK7gVOPU+ulz/tmpCI7iw=="; }; }; "epidemic-broadcast-trees-6.3.4" = { @@ -11733,13 +11814,13 @@ let sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; - "fast-diff-1.1.2" = { + "fast-diff-1.2.0" = { name = "fast-diff"; packageName = "fast-diff"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz"; - sha512 = "KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="; + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; "fast-future-1.0.2" = { @@ -11751,13 +11832,13 @@ let sha1 = "8435a9aaa02d79248d17d704e76259301d99280a"; }; }; - "fast-glob-2.2.2" = { + "fast-glob-2.2.3" = { name = "fast-glob"; packageName = "fast-glob"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz"; - sha512 = "TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.3.tgz"; + sha512 = "NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA=="; }; }; "fast-json-parse-1.0.3" = { @@ -11805,13 +11886,13 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fast-redact-1.2.0" = { + "fast-redact-1.3.0" = { name = "fast-redact"; packageName = "fast-redact"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.2.0.tgz"; - sha512 = "k/uSk9PtFmvYx0m7bRk5B2gZChQk4euWhrn7Mf3vYSmwZBLh7cGNuMuc/vhH1MKMPyVJMMtl9oMwPnwlKqs7CQ=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.3.0.tgz"; + sha512 = "ci4qKDR8nDzQCQTPw4hviyDFaSwTgSYiqddRh/EslkUQa0otpzM8IGnuG+LwiUE54t4OjU2T7bYKmjtd7632Wg=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -11963,7 +12044,7 @@ let packageName = "file-type"; version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; + url = "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"; sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; }; }; @@ -12318,13 +12399,13 @@ let sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }; }; - "flatmap-stream-0.1.0" = { + "flatmap-stream-0.1.1" = { name = "flatmap-stream"; packageName = "flatmap-stream"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.0.tgz"; - sha512 = "Nlic4ZRYxikqnK5rj3YoxDVKGGtUjcNDUtvQ7XsdGLZmMwdUYnXf10o1zcXtzEZTBgc6GxeRpQxV/Wu3WPIIHA=="; + url = "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.1.tgz"; + sha512 = "lAq4tLbm3sidmdCN8G3ExaxH7cUCtP5mgDvrYowsx84dcYkJJ4I28N7gkxA6+YlSXzaGLJYIDEi9WGfXzMiXdw=="; }; }; "flatstr-1.0.8" = { @@ -12444,13 +12525,13 @@ let sha512 = "lk3Gs5wf6BwZKDafjE95/r0wv4nkMRsZULmulDCybFu1mPFeqUMR4H+ENcg+fgOpQBGaiNRTyHPQyg0OLur2wA=="; }; }; - "flumeview-reduce-1.3.13" = { + "flumeview-reduce-1.3.14" = { name = "flumeview-reduce"; packageName = "flumeview-reduce"; - version = "1.3.13"; + version = "1.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.13.tgz"; - sha512 = "QN/07+ia3uXpfy8/xWjLI2XGIG67Aiwp9VaOTIqYt6NHP6OfdGfl8nGRPkJRHlkfFbzEouRvJcQBFohWEXMdNQ=="; + url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.14.tgz"; + sha512 = "hMk9g42JrD92PCmNDiET6JGjur09wQrlAUQRPjmsk8LNqDz/tC5upvCfiynIgWUphe8dZMhUHIzOTh75xa1WKA=="; }; }; "flush-write-stream-1.0.3" = { @@ -13241,7 +13322,7 @@ let packageName = "get-stream"; version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + url = "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; }; }; @@ -13250,17 +13331,17 @@ let packageName = "get-stream"; version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + url = "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; }; }; - "get-stream-4.0.0" = { + "get-stream-4.1.0" = { name = "get-stream"; packageName = "get-stream"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-4.0.0.tgz"; - sha512 = "FneLKMENeOR7wOK0/ZXCh+lwqtnPwkeunJjRN28LPqzGvNAhYvrTAhXv6xDm4vsJ0M7lcRbIYHQudKsSy2RtSQ=="; + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; "get-uri-2.0.2" = { @@ -13353,6 +13434,15 @@ let sha512 = "svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg=="; }; }; + "git-raw-commits-2.0.0" = { + name = "git-raw-commits"; + packageName = "git-raw-commits"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz"; + sha512 = "w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg=="; + }; + }; "git-remote-origin-url-2.0.0" = { name = "git-remote-origin-url"; packageName = "git-remote-origin-url"; @@ -13380,13 +13470,13 @@ let sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; }; }; - "git-semver-tags-1.3.6" = { + "git-semver-tags-2.0.0" = { name = "git-semver-tags"; packageName = "git-semver-tags"; - version = "1.3.6"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.6.tgz"; - sha512 = "2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig=="; + url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.0.tgz"; + sha512 = "lSgFc3zQTul31nFje2Q8XdNcTOI6B4I3mJRPCgFzHQQLfxfqdWTYzdtCaynkK5Xmb2wQlSJoKolhXJ1VhKROnQ=="; }; }; "git-ssb-web-2.8.0" = { @@ -13669,13 +13759,13 @@ let sha512 = "glWGTgPzsOQs0mPRxHnWIwqYrEuQcxYpUFWF7BJxJL+c2F4fW304vdn53pqgod4PzOqZKDr1cex+a/pXCwrncA=="; }; }; - "globals-11.7.0" = { + "globals-11.8.0" = { name = "globals"; packageName = "globals"; - version = "11.7.0"; + version = "11.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz"; - sha512 = "K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg=="; + url = "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz"; + sha512 = "io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA=="; }; }; "globals-9.18.0" = { @@ -14020,13 +14110,13 @@ let sha512 = "+ytmryoHF1LVf58NKEaNPRUzYyXplm120ntxfPcgOBC7TnK7Tv/4VRHeh4FAR9iL+O1bqhZs4nkibxQ+OA5cDQ=="; }; }; - "graphql-tag-2.9.2" = { + "graphql-tag-2.10.0" = { name = "graphql-tag"; packageName = "graphql-tag"; - version = "2.9.2"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.9.2.tgz"; - sha512 = "qnNmof9pAqj/LUzs3lStP0Gw1qhdVCUS7Ab7+SUB6KD5aX1uqxWQRwMnOGTkhKuLvLNIs1TvNz+iS9kUGl1MhA=="; + url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.0.tgz"; + sha512 = "9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w=="; }; }; "graphql-tools-3.1.1" = { @@ -14115,7 +14205,7 @@ let packageName = "gulp"; version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; + url = "http://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; }; }; @@ -15091,13 +15181,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.19.1" = { + "hypercore-6.19.2" = { name = "hypercore"; packageName = "hypercore"; - version = "6.19.1"; + version = "6.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.19.1.tgz"; - sha512 = "CnpaH6+qlt0w1ynt3y+q9alZh23lK0nD7bbuG0vNtQzFefmTYoLexq/Vpss8CYjoQfh6qeG90g2F8GjCl8/Eag=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.19.2.tgz"; + sha512 = "AQS6mtwI7RDKRT3u68EEcehtI1VpaavWXxfnGDyOrR/AVBDUMdIUw8wcYCZdiZZVHarh5xKS4+VRCdJjS67LuA=="; }; }; "hypercore-crypto-1.0.0" = { @@ -19601,13 +19691,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-3.0.5" = { + "log4js-3.0.6" = { name = "log4js"; packageName = "log4js"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-3.0.5.tgz"; - sha512 = "IX5c3G/7fuTtdr0JjOT2OIR12aTESVhsH6cEsijloYwKgcPRlO6DgOU72v0UFhWcoV1HN6+M3dwT89qVPLXm0w=="; + url = "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz"; + sha512 = "ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ=="; }; }; "lokijs-1.5.3" = { @@ -20186,6 +20276,15 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; + "matchdep-2.0.0" = { + name = "matchdep"; + packageName = "matchdep"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz"; + sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; + }; + }; "matcher-collection-1.0.5" = { name = "matcher-collection"; packageName = "matcher-collection"; @@ -20218,10 +20317,19 @@ let packageName = "md5.js"; version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; + url = "http://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; }; }; + "md5.js-1.3.5" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + }; + }; "mdmanifest-1.0.8" = { name = "mdmanifest"; packageName = "mdmanifest"; @@ -21244,7 +21352,7 @@ let packageName = "ms"; version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; + url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2"; }; }; @@ -21253,7 +21361,7 @@ let packageName = "ms"; version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; }; }; @@ -21262,7 +21370,7 @@ let packageName = "ms"; version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; @@ -21271,7 +21379,7 @@ let packageName = "ms"; version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; @@ -21554,6 +21662,15 @@ let sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef"; }; }; + "mute-stdout-1.0.1" = { + name = "mute-stdout"; + packageName = "mute-stdout"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz"; + sha512 = "kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg=="; + }; + }; "mute-stream-0.0.4" = { name = "mute-stream"; packageName = "mute-stream"; @@ -21725,13 +21842,13 @@ let sha512 = "N1IBreECNaxmsaOLMqqm01K7XIp+sMvoVX8mvmT/p1VjM2FLcBU0lj0FalKooi2/2i+ph9WsEoEogOJevqQ6LQ=="; }; }; - "nanoid-1.2.5" = { + "nanoid-1.2.6" = { name = "nanoid"; packageName = "nanoid"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.5.tgz"; - sha512 = "mOYdCQS3xdgu81Hg3EQEhORykMk53Pkzg15Y6I+O9T3db9qHPf9z6nXzQBCUaHXlQs57eRKotDTzYlYACL+5uA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.6.tgz"; + sha512 = "um9vXiM407BaRbBNa0aKPzFBSD2fDbVmmA9TzCWWlxZvEBzTbixM7ss6GDS4G/cNMYeZSNFx5SzAgWoG1uHU9g=="; }; }; "nanolru-1.0.0" = { @@ -22144,13 +22261,13 @@ let sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ=="; }; }; - "node-abi-2.4.4" = { + "node-abi-2.4.5" = { name = "node-abi"; packageName = "node-abi"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.4.tgz"; - sha512 = "DQ9Mo2mf/XectC+s6+grPPRQ1Z9gI3ZbrGv6nyXRkjwT3HrE0xvtvrfnH7YHYBLgC/KLadg+h3XHnhZw1sv88A=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.5.tgz"; + sha512 = "aa/UC6Nr3+tqhHGRsAuw/edz7/q9nnetBrKWxj6rpTtm+0X9T1qU7lIEHMS3yN9JwAbRiKUbRRFy1PLz/y3aaA=="; }; }; "node-alias-1.0.4" = { @@ -22351,13 +22468,13 @@ let sha512 = "5+MtH9t8tX6Aw6M+SeoyGR23XplNTOln3aTQ7El9tj/606bxea4GxYyvV4ymTmuoODz3GXQlLLQVdGkFLyIdDQ=="; }; }; - "node-red-node-twitter-1.1.2" = { + "node-red-node-twitter-1.1.3" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.1.2.tgz"; - sha512 = "6qyeZluZCn3SBkmDFGNm3Zf5Y21FosRQ0AMHv9UM9KOf1v9gFS82Ybyah2Z85NHaXqTvyIM5R7zJbvsK2GMq9g=="; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.1.3.tgz"; + sha512 = "H4q6wfIeDkDp7ykFh4nK7vrnJa9NI3FmC2rASabup/9LEJ5XD5KXH07eqo+B3Cf3jAzJDmL7RFEFucA8C1oqCw=="; }; }; "node-request-by-swagger-1.1.3" = { @@ -22720,13 +22837,13 @@ let sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="; }; }; - "npm-packlist-1.1.11" = { + "npm-packlist-1.1.12" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz"; - sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz"; + sha512 = "WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g=="; }; }; "npm-path-2.0.4" = { @@ -23342,13 +23459,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "ono-4.0.9" = { + "ono-4.0.10" = { name = "ono"; packageName = "ono"; - version = "4.0.9"; + version = "4.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/ono/-/ono-4.0.9.tgz"; - sha512 = "HuSv0Z//JsX3246ykva50NDq2dw2UOaUKRK/CrD3UN96FQ3kr9msI5wR0lMezAIKgfN9+utK+iDfWzj1df3TZg=="; + url = "https://registry.npmjs.org/ono/-/ono-4.0.10.tgz"; + sha512 = "4Xz4hlbq7MzV0I3vKfZwRvyj8tCbXODqBNzFqtkjP+KTV93zzDRju8kw1qnf6P5kcZ2+xlIq6wSCqA+euSKxhA=="; }; }; "open-0.0.2" = { @@ -23891,6 +24008,15 @@ let sha512 = "cDNAN1Ehjbf5EHkNY5qnRhGPUCp6SnpyVof5fRzN800QV1Y2OkzbH9rmjZkbBRa8igof903yOnjIl6z0SlAhxA=="; }; }; + "pac-proxy-agent-3.0.0" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz"; + sha512 = "AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q=="; + }; + }; "pac-resolver-3.0.0" = { name = "pac-resolver"; packageName = "pac-resolver"; @@ -25530,6 +25656,15 @@ let sha512 = "CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg=="; }; }; + "proxy-agent-3.0.3" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.3.tgz"; + sha512 = "PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA=="; + }; + }; "proxy-from-env-1.0.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -25611,13 +25746,13 @@ let sha512 = "q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q=="; }; }; - "public-encrypt-4.0.2" = { + "public-encrypt-4.0.3" = { name = "public-encrypt"; packageName = "public-encrypt"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; - sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q=="; + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; }; }; "pug-2.0.3" = { @@ -26552,7 +26687,7 @@ let packageName = "query-string"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz"; + url = "http://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz"; sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; }; }; @@ -26561,7 +26696,7 @@ let packageName = "query-string"; version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; + url = "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; }; }; @@ -26799,13 +26934,13 @@ let sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw=="; }; }; - "raw-socket-1.6.2" = { + "raw-socket-1.6.3" = { name = "raw-socket"; packageName = "raw-socket"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz"; - sha512 = "JbmNAXPFNI+yJv3Kx0Lsl+ao2doZ/kdz9J4Ba9+ggC1U4e50BK0GfHHYuLFj8acnYzqXgKiLzhi2ixOPk6/kcw=="; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.3.tgz"; + sha512 = "OcplcSbIIyEZxW6YFsqbvyrUrqvwFNmA4jhA9ZmMhquLrd9VBzIrFRRZ2qaD98UpyVk/VYJLemO8haECHMmEgQ=="; }; }; "rc-0.4.0" = { @@ -27024,13 +27159,13 @@ let sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.0.3" = { + "readable-stream-3.0.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.0.3"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.3.tgz"; - sha512 = "CzN1eAu5Pmh4EaDlJp1g5E37LIHR24b82XlMWRQlPFjhvOYKa4HhClRsQO21zhdDWUpdWfiKt9/L/ZL2+vwxCw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz"; + sha512 = "9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg=="; }; }; "readdir-scoped-modules-1.0.2" = { @@ -27245,17 +27380,17 @@ let packageName = "regexpp"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; + url = "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz"; sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw=="; }; }; - "regexpp-2.0.0" = { + "regexpp-2.0.1" = { name = "regexpp"; packageName = "regexpp"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz"; - sha512 = "g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA=="; + url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz"; + sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; }; }; "registry-auth-token-3.3.2" = { @@ -27456,6 +27591,15 @@ let sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; }; }; + "replace-homedir-1.0.0" = { + name = "replace-homedir"; + packageName = "replace-homedir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz"; + sha1 = "e87f6d513b928dde808260c12be7fec6ff6e798c"; + }; + }; "replaceall-0.1.6" = { name = "replaceall"; packageName = "replaceall"; @@ -27582,6 +27726,15 @@ let sha1 = "5281770f68e0c9719e5163fd3fab482215f4fda5"; }; }; + "requestretry-3.0.1" = { + name = "requestretry"; + packageName = "requestretry"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/requestretry/-/requestretry-3.0.1.tgz"; + sha512 = "vJUdB4xucpx+Hc5N1hV44/fHmT4ovhrwGWfG9MtZR6AeO1G350IqPUXJL4gfZND6RtqoSqB+Zs9EeCsMizYf9A=="; + }; + }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -28347,13 +28500,13 @@ let sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; }; }; - "secure-scuttlebutt-18.3.3" = { + "secure-scuttlebutt-18.4.0" = { name = "secure-scuttlebutt"; packageName = "secure-scuttlebutt"; - version = "18.3.3"; + version = "18.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.3.3.tgz"; - sha512 = "f1APqe25N1Te++xtP1ZFnZ9hff/9lbj1o2fMnvFcGD+BezvwkKuR2RURRdu1NApDp0Xmglki45UeVqMfvs73iw=="; + url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.4.0.tgz"; + sha512 = "v74wJIcscPYRG+OF7cQPUi3wCBIy0lRT0e7w+bleFpAPvPL3LTlKtPqt9Stbjrtj5LKV7yWALjoLrkWT0eg+xg=="; }; }; "seek-bzip-1.0.5" = { @@ -28491,6 +28644,15 @@ let sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; }; }; + "semver-greatest-satisfied-range-1.1.0" = { + name = "semver-greatest-satisfied-range"; + packageName = "semver-greatest-satisfied-range"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz"; + sha1 = "13e8c2658ab9691cb0cd71093240280d36f77a5b"; + }; + }; "semver-regex-1.0.0" = { name = "semver-regex"; packageName = "semver-regex"; @@ -29049,13 +29211,13 @@ let sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; - "simple-git-1.103.0" = { + "simple-git-1.104.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.103.0"; + version = "1.104.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.103.0.tgz"; - sha512 = "5QKrOtoXLTA3CdFG//8ZIGIVIVRRMBfSyMXDn1t3y+TOf+Kg39mfzfU4t0CRJBcxBGynjNWVwsx6W04+biIUmg=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.104.0.tgz"; + sha512 = "KTELLFyhLhN1qZGQkglx1e0YezYKNabCY4oKrTVb9y0BllkWwruK2qFCQDm2zpT7rE4IPd4/hzZt/6+0ykQIdA=="; }; }; "simple-lru-cache-0.0.2" = { @@ -29085,6 +29247,15 @@ let sha512 = "MUWWno5o5cvISKOH4pYQ18PQJLpDaNWoKUbrPPKuspCLCkkh+zhtuQyTE8h2U2Ags+/OUN5wnUe92+9B8/Sm2Q=="; }; }; + "simple-plist-0.2.1" = { + name = "simple-plist"; + packageName = "simple-plist"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; + sha1 = "71766db352326928cf3a807242ba762322636723"; + }; + }; "simple-sha1-2.1.1" = { name = "simple-sha1"; packageName = "simple-sha1"; @@ -29409,13 +29580,13 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.99.1" = { + "snyk-1.102.0" = { name = "snyk"; packageName = "snyk"; - version = "1.99.1"; + version = "1.102.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.99.1.tgz"; - sha512 = "vN2jUGwHPHAbqqOeZQsBrnWgTvuCnbxsP8i9BIaqZxINeKbuBOS1t5Kg9KMMCRJyqqCB/y76PQSdoqavh4yxkg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.102.0.tgz"; + sha512 = "OZfjEJeMdrYj7KVXaNhLwVi1vv5omRyrLv469BD6Bc6mvOK4/JVEcJGoNgn3MyWazgpOy8/4Xi9mMQvrdwfRfQ=="; }; }; "snyk-config-2.2.0" = { @@ -29445,13 +29616,13 @@ let sha512 = "XWajcSh6Ld+I+WdcyU3DGDuE2ydThQd8ORkESy0nQ2LwekygLYVYN66OBy0uxpqYfd4qoqeg+J8lb4oGzCmyGA=="; }; }; - "snyk-gradle-plugin-2.0.1" = { + "snyk-gradle-plugin-2.1.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.0.1.tgz"; - sha512 = "dL9MRlwmDP4OmOk4b61pMqvbu8gG+HVCBTryBEU+vkvjloX0lslKvA5NTUPAM2M8SShnOic54cSegGQChBhYHw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.1.0.tgz"; + sha512 = "9gYJluomFZ5kaww5FoBvp4zUIsr27pEJ12jQJaVf0FJ0BmyYHmbCoxvHdqjCSYS2fVtF+fmPnvw0XKQOIwA1SA=="; }; }; "snyk-module-1.8.2" = { @@ -29508,13 +29679,13 @@ let sha512 = "CEioNnDzccHyid7UIVl3bJ1dnG4co4ofI+KxuC1mo0IUXy64gxnBTeVoZF5gVLWbAyxGxSeW8f0+8GmWMHVb7w=="; }; }; - "snyk-python-plugin-1.8.1" = { + "snyk-python-plugin-1.8.2" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.8.1.tgz"; - sha512 = "DsUBkQZiPlXGkwzhxxEo2Tvfq6XhygWQThWM0yRBythi9M5n8UimZEwdkBHPj7xKC1clsB8boM3+sT/E1x6XGA=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.8.2.tgz"; + sha512 = "LBvjztnXarSHKyhivzM567icOOLOB98I7S9EEnjepuG+EZ0jiZzqOEMVRmzuYi+hRq3Cwh0hhjkwgJAQpKDz+g=="; }; }; "snyk-resolve-1.0.1" = { @@ -29526,13 +29697,13 @@ let sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw=="; }; }; - "snyk-resolve-deps-3.1.0" = { + "snyk-resolve-deps-4.0.1" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; - version = "3.1.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz"; - sha512 = "YVAelR+dTpqLgfk6lf6WgOlw+MGmGI0r3/Dny8tUbJJ9uVTHTRAOdZCbUyTFqJG7oEmEZxUwmfjqgAuniYwx8Q=="; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.1.tgz"; + sha512 = "gieaYoOuJLXzUmDDKfQJAqfwaxa43KmSqN2d9abRfgMXnLlX9IqyoZ1wqZMbd3WN7tsHSkpWvVwc4FHdQEkUKA=="; }; }; "snyk-sbt-plugin-2.0.0" = { @@ -30066,22 +30237,22 @@ let sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; }; }; - "spdx-correct-3.0.1" = { + "spdx-correct-3.0.2" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.1.tgz"; - sha512 = "hxSPZbRZvSDuOvADntOElzJpenIR7wXJkuoUcUtS0erbgt2fgeaoPIYretfKpslMhfFDY4k0MZ2F5CUzhBsSvQ=="; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz"; + sha512 = "q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ=="; }; }; - "spdx-exceptions-2.1.0" = { + "spdx-exceptions-2.2.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; - sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; }; }; "spdx-expression-parse-3.0.0" = { @@ -30264,13 +30435,13 @@ let sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA=="; }; }; - "ssb-config-2.3.3" = { + "ssb-config-2.3.4" = { name = "ssb-config"; packageName = "ssb-config"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.3.tgz"; - sha512 = "w4tdXE7xEpYe9M071G60Wr/6lf59OTwrsTykUGFySh9Y7Prcu4pORmOIBgQUttZ86QvGMxJO1qdl7toIK53RMA=="; + url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.4.tgz"; + sha512 = "Yp0DKsc9eSaU+9+5xMO4/NVdOFyBtHD+QgraZ+1Id2K4f0eUiKpJ2ogLNmGanTvkLVhm/vq27TLI27Fq83njWQ=="; }; }; "ssb-ebt-5.2.3" = { @@ -31101,6 +31272,15 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; + "strip-ansi-5.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz"; + sha512 = "Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow=="; + }; + }; "strip-bom-1.0.0" = { name = "strip-bom"; packageName = "strip-bom"; @@ -31326,13 +31506,13 @@ let sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA=="; }; }; - "superagent-proxy-1.0.3" = { + "superagent-proxy-2.0.0" = { name = "superagent-proxy"; packageName = "superagent-proxy"; - version = "1.0.3"; + version = "2.0.0"; src = fetchurl { - url = "http://registry.npmjs.org/superagent-proxy/-/superagent-proxy-1.0.3.tgz"; - sha512 = "79Ujg1lRL2ICfuHUdX+H2MjIw73kB7bXsIkxLwHURz3j0XUmEEEoJ+u/wq+mKwna21Uejsm2cGR3OESA00TIjA=="; + url = "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz"; + sha512 = "TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw=="; }; }; "supports-color-0.2.0" = { @@ -31416,6 +31596,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "sver-compat-1.5.0" = { + name = "sver-compat"; + packageName = "sver-compat"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz"; + sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"; + }; + }; "swagger-converter-0.1.7" = { name = "swagger-converter"; packageName = "swagger-converter"; @@ -31547,7 +31736,7 @@ let packageName = "tabtab"; version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz"; + url = "http://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz"; sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7"; }; }; @@ -31822,13 +32011,13 @@ let sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; }; }; - "thriftrw-3.11.2" = { + "thriftrw-3.11.3" = { name = "thriftrw"; packageName = "thriftrw"; - version = "3.11.2"; + version = "3.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.2.tgz"; - sha512 = "3iCowlHgCEXjabCkurHTaECb2+U0V+NzqBmwfKHn8fzJJwXd/oDo7Wh6Vs0kaESN7YNJMRPC8ObL3AfQ1gxKmQ=="; + url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.3.tgz"; + sha512 = "mnte80Go5MCfYyOQ9nk6SljaEicCXlwLchupHR+/zlx0MKzXwAiyt38CHjLZVvKtoyEzirasXuNYtkEjgghqCw=="; }; }; "throat-3.2.0" = { @@ -32002,13 +32191,13 @@ let sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg=="; }; }; - "timers-ext-0.1.5" = { + "timers-ext-0.1.7" = { name = "timers-ext"; packageName = "timers-ext"; - version = "0.1.5"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz"; - sha512 = "tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg=="; + url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz"; + sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; }; }; "timespan-2.3.0" = { @@ -33105,7 +33294,7 @@ let packageName = "underscore.string"; version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; }; }; @@ -33114,7 +33303,7 @@ let packageName = "underscore.string"; version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; @@ -33793,6 +33982,15 @@ let sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; + "uuid-3.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; + sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + }; + }; "uuid-3.1.0" = { name = "uuid"; packageName = "uuid"; @@ -33847,6 +34045,15 @@ let sha512 = "6sgSKoFw1UpUPd3cFdF7QGnrH6tDeBgW1F3v9gy8gLY0mlbiBXq8soy8aQpY6xeeCjH5K+JvC62Acp7gtl7wWA=="; }; }; + "v8flags-3.1.1" = { + name = "v8flags"; + packageName = "v8flags"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz"; + sha512 = "iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ=="; + }; + }; "valid-identifier-0.0.1" = { name = "valid-identifier"; packageName = "valid-identifier"; @@ -34932,7 +35139,7 @@ let packageName = "ws"; version = "0.4.31"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; + url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz"; sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927"; }; }; @@ -34941,7 +35148,7 @@ let packageName = "ws"; version = "0.4.32"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; + url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; }; }; @@ -34981,13 +35188,13 @@ let sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; - "ws-6.0.0" = { + "ws-6.1.0" = { name = "ws"; packageName = "ws"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.0.0.tgz"; - sha512 = "c2UlYcAZp1VS8AORtpq6y4RJIkJ9dQz18W32SpR/qXGfLDZ2jU4y4wKvvZwqbi7U6gxFQTeE+urMbXU/tsDy4w=="; + url = "https://registry.npmjs.org/ws/-/ws-6.1.0.tgz"; + sha512 = "H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg=="; }; }; "wtf-8-1.0.0" = { @@ -35008,6 +35215,15 @@ let sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; }; }; + "xcode-1.0.0" = { + name = "xcode"; + packageName = "xcode"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xcode/-/xcode-1.0.0.tgz"; + sha1 = "e1f5b1443245ded38c180796df1a10fdeda084ec"; + }; + }; "xdg-basedir-2.0.0" = { name = "xdg-basedir"; packageName = "xdg-basedir"; @@ -35491,7 +35707,7 @@ let packageName = "yargs-parser"; version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + url = "http://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; }; }; @@ -35842,10 +36058,10 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "0.14.4"; + version = "0.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-0.14.4.tgz"; - sha512 = "U+Bd2VY5LkLM3DUpLtlQgS+goiXBmSU4P41xUdck/vyHqhMfxBVAXTMLksDGoWvhx7LPgboSUVF0ujHCVsturw=="; + url = "https://registry.npmjs.org/asar/-/asar-0.14.5.tgz"; + sha512 = "2Di/TnY1sridHFKMFgxBh0Wk0gVxSZN4qQhRhjJn3UywZAvP5MHI0RNVSkpzmJ+n6t0BC8w/+1257wtSgQ3Kdg=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -35963,7 +36179,7 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ - sources."@types/node-8.10.30" + sources."@types/node-8.10.34" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -36507,8 +36723,8 @@ in sources."signal-exit-3.0.2" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" @@ -36626,7 +36842,7 @@ in sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.1" sources."lodash.memoize-3.0.4" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -36646,7 +36862,7 @@ in sources."pbkdf2-3.0.17" sources."process-0.11.10" sources."process-nextick-args-2.0.0" - sources."public-encrypt-4.0.2" + sources."public-encrypt-4.0.3" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -37013,8 +37229,8 @@ in }) sources."single-line-log-0.4.1" sources."sntp-0.1.4" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."speedometer-0.1.4" @@ -37202,10 +37418,10 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-8.1.1.tgz"; - sha512 = "YmsGlgz8yiPFcRphTW3LO+6YaCZU5FmoVMOxIti5tbd4Td3JiXiJblpklijryc7jCY6B6seifu9xCVCpfc0AMA=="; + url = "https://registry.npmjs.org/cordova/-/cordova-8.1.2.tgz"; + sha512 = "IfslM3MP42CA/ebVJVlit6FhQ2P6Fercwx9NNQjkVs0wahEwqamL4bcqh1gKiTti7+/ZsDtBRSVmRv+y7LcTbg=="; }; dependencies = [ sources."JSONStream-1.3.4" @@ -37247,6 +37463,7 @@ in sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" + sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.2" (sources."boxen-1.3.0" // { @@ -37256,6 +37473,7 @@ in sources."supports-color-5.5.0" ]; }) + sources."bplist-creator-0.0.7" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" @@ -37289,7 +37507,6 @@ in sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-1.1.3" - sources."chownr-1.1.1" sources."ci-info-1.6.0" sources."cipher-base-1.0.4" sources."cli-boxes-1.0.0" @@ -37334,7 +37551,7 @@ in ]; }) sources."cordova-js-4.2.4" - (sources."cordova-lib-8.1.0" // { + (sources."cordova-lib-8.1.1" // { dependencies = [ sources."base64-js-1.1.2" sources."elementtree-0.1.7" @@ -37416,8 +37633,8 @@ in }) sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" sources."get-stream-3.0.0" @@ -37511,13 +37728,9 @@ in sources."lodash.memoize-3.0.4" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" - (sources."lru-cache-4.1.3" // { - dependencies = [ - sources."yallist-2.1.2" - ]; - }) + sources."lru-cache-4.1.3" sources."make-dir-1.3.0" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -37529,8 +37742,6 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."minipass-2.3.4" - sources."minizlib-1.1.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -37574,6 +37785,7 @@ in sources."path-platform-0.11.15" sources."path-to-regexp-0.1.7" sources."pbkdf2-3.0.17" + sources."pegjs-0.10.0" sources."performance-now-2.1.0" sources."pify-3.0.0" sources."plist-2.1.0" @@ -37585,7 +37797,7 @@ in sources."proxy-addr-2.0.4" sources."pseudomap-1.0.2" sources."psl-1.1.29" - sources."public-encrypt-4.0.2" + sources."public-encrypt-4.0.3" sources."punycode-1.4.1" sources."q-1.5.1" sources."qs-6.5.1" @@ -37632,6 +37844,11 @@ in }) sources."resolve-1.8.1" sources."restore-cursor-1.0.1" + (sources."rimraf-2.6.2" // { + dependencies = [ + sources."glob-7.1.3" + ]; + }) sources."ripemd160-2.0.2" sources."run-async-0.1.0" sources."rx-lite-3.1.2" @@ -37651,16 +37868,23 @@ in sources."shelljs-0.5.3" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" + (sources."simple-plist-0.2.1" // { + dependencies = [ + sources."base64-js-1.1.2" + sources."plist-2.0.1" + ]; + }) sources."slash-1.0.0" sources."slide-1.1.6" sources."source-map-0.5.7" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" sources."statuses-1.4.0" sources."stream-browserify-2.0.1" + sources."stream-buffers-2.2.0" sources."stream-combiner2-1.1.1" sources."stream-http-2.8.3" sources."stream-splicer-2.0.0" @@ -37679,7 +37903,7 @@ in sources."subarg-1.0.0" sources."supports-color-2.0.0" sources."syntax-error-1.4.0" - sources."tar-4.4.6" + sources."tar-2.2.1" sources."term-size-1.2.0" sources."through-2.3.8" sources."through2-2.0.3" @@ -37727,11 +37951,16 @@ in sources."win-release-1.1.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" + (sources."xcode-1.0.0" // { + dependencies = [ + sources."uuid-3.0.1" + ]; + }) sources."xdg-basedir-3.0.0" sources."xmlbuilder-8.2.2" sources."xmldom-0.1.27" sources."xtend-4.0.1" - sources."yallist-3.0.2" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -37745,10 +37974,10 @@ in create-cycle-app = nodeEnv.buildNodePackage { name = "create-cycle-app"; packageName = "create-cycle-app"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-4.0.0.tgz"; - sha512 = "ofgR7gXf+7lgnXQvj0KeveHAyrtoK8zveCDD3sTHPFQY1FKJGkJ7M404ak+G8w6VbTuHwzaBrYbEh8M/SBuykQ=="; + url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-5.0.0.tgz"; + sha512 = "Ic10lxNqRXWtO9CUbvsWcOWEigWuGApKEiRo0DNybhrsCuUQBeGhxfdVRYb3TD+keK+2LVCBFCdVbWb4UqqcdA=="; }; dependencies = [ sources."@cycle/dom-18.3.0" @@ -37761,7 +37990,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.0" - sources."@types/node-10.11.3" + sources."@types/node-10.11.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -37892,10 +38121,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "1.5.2"; + version = "2.0.3"; src = fetchurl { - url = "http://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz"; - sha512 = "vnYIzsfTaqai2l07P9qtxhsZgHbzirC2omxKmf16wqvpXao9CNCDmpk+BCZRElih7HTn/mpO3soe8DTZV4DsgQ=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.0.3.tgz"; + sha512 = "HpApfnkI/kc8mfqN9JkPUZ0MmaqsKkvhJzUWjXg/PqeeGNrO4NKXmWzc2QUncszl/o+jfaqxy8ajgO0BQuRcow=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -37912,9 +38141,9 @@ in sources."cross-spawn-4.0.2" sources."debug-2.6.9" sources."duplexer2-0.0.2" - sources."envinfo-3.4.2" + sources."envinfo-5.10.0" sources."escape-string-regexp-1.0.5" - sources."fs-extra-1.0.0" + sources."fs-extra-5.0.0" sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" @@ -37926,20 +38155,13 @@ in sources."inherits-2.0.3" sources."isarray-0.0.1" sources."isexe-2.0.0" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" + sources."jsonfile-4.0.0" sources."lru-cache-4.1.3" - sources."macos-release-1.1.0" sources."minimatch-3.0.4" - sources."minimist-1.2.0" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."once-1.4.0" - sources."os-name-2.0.1" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" @@ -37964,12 +38186,12 @@ in sources."readable-stream-1.0.34" ]; }) - sources."tmp-0.0.31" + sources."tmp-0.0.33" sources."uid-number-0.0.6" + sources."universalify-0.1.2" sources."util-deprecate-1.0.2" sources."validate-npm-package-name-3.0.0" sources."which-1.3.1" - sources."win-release-1.1.1" sources."wrappy-1.0.2" sources."xtend-4.0.1" sources."yallist-2.1.2" @@ -37977,7 +38199,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Create React apps with no build configuration."; - homepage = "https://github.com/facebookincubator/create-react-app#readme"; + homepage = "https://github.com/facebook/create-react-app#readme"; license = "MIT"; }; production = true; @@ -38233,7 +38455,7 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.19.1" // { + (sources."hypercore-6.19.2" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -38840,10 +39062,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.4.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.4.0.tgz"; - sha512 = "DHK6WpqZf5VTW9PK2UjkRADDacT6c2fsHFCy0pQ8c1VYUWz/zI5OGzBBPg5HTZbvTgY+AXJ3JHUB3E7Esktlog=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.0.3.tgz"; + sha512 = "Rxbsh4LWdIlMUO+NxET9g1xHZ9Q93i7jtPESYcCyEOnRiSsZXi/AF6UmCdvmM38IgHrklI2e4DwuG1OwRIGQAA=="; }; dependencies = [ sources."JSONStream-1.3.4" @@ -38852,12 +39074,13 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.325.0" + sources."aws-sdk-2.330.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-4.9.1" + sources."bytes-3.0.0" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.7" @@ -38910,6 +39133,7 @@ in sources."uuid-3.3.2" ]; }) + sources."requestretry-3.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -38925,6 +39149,7 @@ in sources."url-0.10.3" sources."uuid-3.1.0" sources."verror-1.10.0" + sources."when-3.7.8" sources."wordwrap-0.0.3" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -39624,8 +39849,8 @@ in sources."slash-1.0.0" sources."source-map-0.5.7" sources."source-map-support-0.4.18" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" (sources."string-width-2.1.1" // { @@ -39703,7 +39928,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" - sources."debug-4.0.1" + sources."debug-4.1.0" sources."deep-is-0.1.3" sources."del-2.2.2" sources."doctrine-2.1.0" @@ -39727,7 +39952,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.3" - sources."globals-11.7.0" + sources."globals-11.8.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" @@ -39773,7 +39998,7 @@ in sources."prelude-ls-1.1.2" sources."progress-2.0.0" sources."punycode-2.1.1" - sources."regexpp-2.0.0" + sources."regexpp-2.0.1" sources."require-uncached-1.0.3" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" @@ -39847,7 +40072,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" - sources."debug-4.0.1" + sources."debug-4.1.0" sources."deep-is-0.1.3" sources."del-2.2.2" sources."doctrine-2.1.0" @@ -39872,7 +40097,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.3" - sources."globals-11.7.0" + sources."globals-11.8.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" @@ -39920,7 +40145,7 @@ in sources."prelude-ls-1.1.2" sources."progress-2.0.0" sources."punycode-2.1.1" - sources."regexpp-2.0.0" + sources."regexpp-2.0.1" sources."require-uncached-1.0.3" sources."resolve-1.8.1" sources."resolve-from-1.0.1" @@ -40130,8 +40355,8 @@ in sources."safer-buffer-2.1.2" sources."semver-5.5.1" sources."signal-exit-3.0.2" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" @@ -40617,13 +40842,13 @@ in }; dependencies = [ sources."async-2.6.1" - sources."debug-4.0.1" + sources."debug-4.1.0" sources."lodash-4.17.11" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.1.1" - sources."simple-git-1.103.0" + sources."simple-git-1.104.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -40765,7 +40990,7 @@ in sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-client-4.6.0" - sources."ssb-config-2.3.3" + sources."ssb-config-2.3.4" sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" @@ -40809,10 +41034,10 @@ in git-standup = nodeEnv.buildNodePackage { name = "git-standup"; packageName = "git-standup"; - version = "2.1.9"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.9.tgz"; - sha512 = "+XT110zb/S1XzG+amg5gKGWcD6dW58mnstS4GkuiO63aA8qGvpgNB9Cq89qxhFSIQ2smeB/00QGsVLn4CL1V+A=="; + url = "https://registry.npmjs.org/git-standup/-/git-standup-2.2.0.tgz"; + sha512 = "GlQib2CmkcPfPlZhelfZmFKP2AbkeAOZ9SK3Z2M+CwdsrAA62bhI6CTDYWk/bm0C3bxizlX+U86/RNSk4O9efQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -41200,7 +41425,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."ono-4.0.9" + sources."ono-4.0.10" sources."open-0.0.5" sources."opn-5.4.0" sources."ora-1.4.0" @@ -41306,8 +41531,8 @@ in sources."source-map-0.6.1" ]; }) - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" @@ -41763,7 +41988,7 @@ in packageName = "gulp"; version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; + url = "http://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; }; dependencies = [ @@ -42144,6 +42369,345 @@ in production = true; bypassCache = true; }; + gulp-cli = nodeEnv.buildNodePackage { + name = "gulp-cli"; + packageName = "gulp-cli"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz"; + sha512 = "RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ=="; + }; + dependencies = [ + sources."ansi-colors-1.1.0" + sources."ansi-gray-0.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-wrap-0.1.0" + sources."archy-1.0.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-each-1.0.1" + sources."array-slice-1.1.0" + sources."array-sort-1.0.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."buffer-from-1.1.1" + sources."builtin-modules-1.1.1" + sources."cache-base-1.0.1" + sources."camelcase-3.0.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + sources."is-descriptor-0.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."cliui-3.2.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-support-1.1.3" + sources."component-emitter-1.2.1" + sources."concat-stream-1.6.2" + sources."copy-descriptor-0.1.1" + sources."copy-props-2.0.4" + sources."core-util-is-1.0.2" + sources."d-1.0.0" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."default-compare-1.0.0" + sources."define-property-2.0.2" + sources."detect-file-1.0.0" + sources."each-props-1.3.2" + sources."error-ex-1.3.2" + sources."es5-ext-0.10.46" + sources."es6-iterator-2.0.3" + sources."es6-symbol-3.1.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + sources."is-descriptor-0.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."expand-tilde-2.0.2" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."fancy-log-1.3.2" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."find-up-1.1.2" + sources."findup-sync-2.0.0" + sources."fined-1.1.0" + sources."flagged-respawn-1.0.0" + sources."for-in-1.0.2" + sources."for-own-1.0.0" + sources."fragment-cache-0.2.1" + sources."get-caller-file-1.0.3" + sources."get-value-2.0.6" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" + sources."glogg-1.0.1" + sources."graceful-fs-4.1.11" + sources."gulplog-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."homedir-polyfill-1.0.1" + sources."hosted-git-info-2.7.1" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."interpret-1.1.0" + sources."invert-kv-1.0.0" + sources."is-absolute-1.0.0" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-builtin-module-1.0.0" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-relative-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."kind-of-5.1.0" + sources."lcid-1.0.0" + sources."liftoff-2.5.0" + sources."load-json-file-1.1.0" + (sources."make-iterator-1.0.1" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."matchdep-2.0.0" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."ms-2.0.0" + sources."mute-stdout-1.0.1" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."next-tick-1.0.0" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.defaults-1.1.0" + sources."object.map-1.0.1" + sources."object.pick-1.3.0" + sources."os-locale-1.4.0" + sources."parse-filepath-1.0.2" + sources."parse-json-2.2.0" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + sources."path-exists-2.1.0" + sources."path-parse-1.0.6" + sources."path-root-0.1.1" + sources."path-root-regex-0.1.2" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."posix-character-classes-0.1.1" + sources."pretty-hrtime-1.0.3" + sources."process-nextick-args-2.0.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" + sources."rechoir-0.6.2" + sources."regex-not-1.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."replace-homedir-1.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.8.1" + sources."resolve-dir-1.0.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."semver-5.5.1" + sources."semver-greatest-satisfied-range-1.1.0" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + sources."is-descriptor-0.1.6" + sources."kind-of-3.2.2" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."sparkles-1.0.1" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.1" + sources."split-string-3.1.0" + sources."stack-trace-0.0.10" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + sources."is-descriptor-0.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."sver-compat-1.5.0" + sources."time-stamp-1.1.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."typedarray-0.0.6" + sources."unc-path-regex-0.1.2" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."v8flags-3.1.1" + sources."validate-npm-package-license-3.0.4" + sources."which-1.3.1" + sources."which-module-1.0.0" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.1" + sources."yargs-7.1.0" + sources."yargs-parser-5.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Command line interface for gulp"; + homepage = http://gulpjs.com/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; hipache = nodeEnv.buildNodePackage { name = "hipache"; packageName = "hipache"; @@ -42389,6 +42953,7 @@ in sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" + sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" @@ -42488,11 +43053,11 @@ in sources."shelljs-0.3.0" sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" - sources."snyk-1.99.1" + sources."snyk-1.102.0" sources."snyk-config-2.2.0" sources."snyk-docker-plugin-1.11.0" sources."snyk-go-plugin-1.5.2" - sources."snyk-gradle-plugin-2.0.1" + sources."snyk-gradle-plugin-2.1.0" sources."snyk-module-1.8.2" sources."snyk-mvn-plugin-2.0.0" (sources."snyk-nodejs-lockfile-parser-1.5.1" // { @@ -42503,9 +43068,9 @@ in sources."snyk-nuget-plugin-1.6.5" sources."snyk-php-plugin-1.5.1" sources."snyk-policy-1.12.0" - sources."snyk-python-plugin-1.8.1" + sources."snyk-python-plugin-1.8.2" sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-3.1.0" + sources."snyk-resolve-deps-4.0.1" sources."snyk-sbt-plugin-2.0.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.3.1" @@ -42681,17 +43246,16 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "4.1.2"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-4.1.2.tgz"; - sha512 = "iZOKZI7MRcIi2zgmPJ20Gj4SWPBp7FG87yw3akHhFdGR+OnPqsm/6Zy7/b0jRdMjFk6srlhtVmKgHvXYX3EZhw=="; + url = "https://registry.npmjs.org/ionic/-/ionic-4.2.1.tgz"; + sha512 = "4QwbtBxHYTaa/wxlYx+iXdSALs8aoEAw8poR24tTUtJRd0aKoAJM4K815DuNKLUFdgn3v0pTixdTTPLH8CADxw=="; }; dependencies = [ - sources."@ionic/cli-framework-1.0.7" - sources."@ionic/cli-utils-2.2.1" - sources."@ionic/discover-1.0.4" - sources."@ionic/utils-fs-0.0.1" - sources."@ionic/utils-network-0.0.1" + sources."@ionic/cli-framework-1.1.1" + sources."@ionic/discover-1.0.6" + sources."@ionic/utils-fs-0.0.3" + sources."@ionic/utils-network-0.0.3" sources."agent-base-4.2.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.1.0" @@ -42726,11 +43290,7 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."data-uri-to-buffer-1.2.0" - (sources."debug-3.2.5" // { - dependencies = [ - sources."ms-2.1.1" - ]; - }) + sources."debug-4.1.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."degenerator-1.0.4" @@ -42769,6 +43329,7 @@ in (sources."get-uri-2.0.2" // { dependencies = [ sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) sources."glob-7.1.3" @@ -42780,16 +43341,25 @@ in (sources."http-proxy-agent-2.1.0" // { dependencies = [ sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."https-proxy-agent-2.2.1" // { + dependencies = [ + sources."debug-3.2.5" ]; }) - sources."https-proxy-agent-2.2.1" sources."iconv-lite-0.4.24" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-6.2.0" + (sources."inquirer-6.2.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) sources."ip-1.1.5" sources."is-ci-1.2.1" sources."is-fullwidth-code-point-2.0.0" @@ -42808,6 +43378,7 @@ in (sources."leek-0.0.24" // { dependencies = [ sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) sources."levn-0.3.0" @@ -42845,7 +43416,7 @@ in sources."minimist-0.0.8" ]; }) - sources."ms-2.0.0" + sources."ms-2.1.1" sources."mute-stream-0.0.7" sources."ncp-2.0.0" sources."netmask-1.0.6" @@ -42857,7 +43428,11 @@ in sources."os-name-2.0.1" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" - sources."pac-proxy-agent-2.0.2" + (sources."pac-proxy-agent-3.0.0" // { + dependencies = [ + sources."debug-3.2.5" + ]; + }) sources."pac-resolver-3.0.0" sources."package-json-4.0.1" sources."path-is-absolute-1.0.1" @@ -42867,7 +43442,11 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" - sources."proxy-agent-2.3.1" + (sources."proxy-agent-3.0.3" // { + dependencies = [ + sources."debug-3.2.5" + ]; + }) sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."qs-6.5.2" @@ -42895,21 +43474,37 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slice-ansi-1.0.0" - sources."smart-buffer-1.1.15" - sources."socks-1.1.10" - sources."socks-proxy-agent-3.0.1" + sources."smart-buffer-4.0.1" + sources."socks-2.2.1" + sources."socks-proxy-agent-4.0.1" sources."source-map-0.6.1" sources."split2-2.2.0" sources."ssh-config-1.1.3" sources."statuses-1.5.0" sources."stream-combiner2-1.1.1" - sources."string-width-2.1.1" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) sources."string_decoder-1.1.1" - sources."strip-ansi-4.0.0" + (sources."strip-ansi-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.0.0" + ]; + }) sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."superagent-3.8.3" - sources."superagent-proxy-1.0.3" + (sources."superagent-3.8.3" // { + dependencies = [ + sources."debug-3.2.5" + ]; + }) + (sources."superagent-proxy-2.0.0" // { + dependencies = [ + sources."debug-3.2.5" + ]; + }) sources."supports-color-5.5.0" (sources."tar-4.4.6" // { dependencies = [ @@ -42937,10 +43532,14 @@ in sources."widest-line-2.0.0" sources."win-release-1.1.1" sources."wordwrap-1.0.0" - sources."wrap-ansi-4.0.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.3.0" - sources."ws-6.0.0" + sources."ws-6.1.0" sources."xdg-basedir-3.0.0" sources."xregexp-2.0.0" sources."xtend-4.0.1" @@ -43158,23 +43757,23 @@ in sha512 = "Kkal2i0jcXsgwgn61gnhVJuh0R0J+HqyzREVaeBvZHgMCAQVW02kYwVbY8xzpBfcZmDBYcT5LrPBBQa27C9tRA=="; }; dependencies = [ - (sources."@commitlint/cli-7.1.2" // { + (sources."@commitlint/cli-7.2.0" // { dependencies = [ sources."chalk-2.3.1" ]; }) sources."@commitlint/config-conventional-7.1.2" - sources."@commitlint/ensure-7.1.2" + sources."@commitlint/ensure-7.2.0" sources."@commitlint/execute-rule-7.1.2" - sources."@commitlint/format-7.1.2" - sources."@commitlint/is-ignored-7.1.2" - sources."@commitlint/lint-7.1.2" - sources."@commitlint/load-7.1.2" + sources."@commitlint/format-7.2.0" + sources."@commitlint/is-ignored-7.2.0" + sources."@commitlint/lint-7.2.0" + sources."@commitlint/load-7.2.0" sources."@commitlint/message-7.1.2" sources."@commitlint/parse-7.1.2" sources."@commitlint/read-7.1.2" sources."@commitlint/resolve-extends-7.1.2" - sources."@commitlint/rules-7.1.2" + sources."@commitlint/rules-7.2.0" sources."@commitlint/to-lines-7.1.2" sources."@commitlint/top-level-7.1.2" sources."@marionebl/sander-0.6.1" @@ -43341,8 +43940,8 @@ in sources."semaphore-async-await-1.5.1" sources."semver-5.5.0" sources."signal-exit-3.0.2" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."split2-2.2.0" @@ -43357,7 +43956,7 @@ in sources."text-extensions-1.8.0" sources."thenify-3.3.0" sources."thenify-all-1.6.0" - sources."thriftrw-3.11.2" + sources."thriftrw-3.11.3" sources."through-2.3.8" sources."through2-2.0.3" sources."trim-newlines-2.0.0" @@ -43722,10 +44321,10 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.10"; + version = "3.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.10.tgz"; - sha512 = "hTBuXx9RKpyhNhCEh7AUm0Emngxf9f1caw4BzH9CQSPlTqxSJG/X5W0di8AHSeePu+ZqSYjlXLU6u2+Q/6wFmw=="; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.12.tgz"; + sha512 = "6RbO1Y3e0Hty/tEpXtQG6jUx7g1G8e39GIOuPugobPC8BX1gZ0OGZQpBn1FLWGkuWF35GRGADvhwdEIFpwIjyA=="; }; dependencies = [ sources."argparse-1.0.10" @@ -43940,7 +44539,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nanoid-1.2.5" + sources."nanoid-1.2.6" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -44278,7 +44877,7 @@ in sources."kind-of-6.0.2" sources."lodash-4.17.11" sources."lodash.debounce-4.0.8" - (sources."log4js-3.0.5" // { + (sources."log4js-3.0.6" // { dependencies = [ sources."debug-3.2.5" sources."ms-2.1.1" @@ -44999,24 +45598,24 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.4.0.tgz"; - sha512 = "RCLm0gMi8PESEF8PzMxo35foA2NGGC/NKnKiUmJyRrhLybOIUfVPdPStSAWCjW1c+DYCgLZCbxu57/KWt4ZWZA=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.4.1.tgz"; + sha512 = "00X2mYuwJk/bvxdjJceUxTjUgUg7MIMWllo2zGfDVGPijLadrg8QCtJASZqVE7HDQbBLDxLGPjswk29HF5JS2Q=="; }; dependencies = [ - sources."@lerna/add-3.3.2" + sources."@lerna/add-3.4.1" sources."@lerna/batch-packages-3.1.2" - sources."@lerna/bootstrap-3.3.2" - sources."@lerna/changed-3.3.2" + sources."@lerna/bootstrap-3.4.1" + sources."@lerna/changed-3.4.1" sources."@lerna/check-working-tree-3.3.0" sources."@lerna/child-process-3.3.0" sources."@lerna/clean-3.3.2" sources."@lerna/cli-3.2.0" sources."@lerna/collect-updates-3.3.2" sources."@lerna/command-3.3.0" - sources."@lerna/conventional-commits-3.3.0" - sources."@lerna/create-3.3.1" + sources."@lerna/conventional-commits-3.4.1" + sources."@lerna/create-3.4.1" sources."@lerna/create-symlink-3.3.0" sources."@lerna/describe-ref-3.3.0" sources."@lerna/diff-3.3.0" @@ -45032,7 +45631,7 @@ in sources."@lerna/list-3.3.2" sources."@lerna/listable-3.0.0" sources."@lerna/log-packed-3.0.4" - sources."@lerna/npm-conf-3.0.0" + sources."@lerna/npm-conf-3.4.1" sources."@lerna/npm-dist-tag-3.3.0" sources."@lerna/npm-install-3.3.0" sources."@lerna/npm-publish-3.3.1" @@ -45042,16 +45641,16 @@ in sources."@lerna/package-graph-3.1.2" sources."@lerna/project-3.0.0" sources."@lerna/prompt-3.3.1" - sources."@lerna/publish-3.4.0" + sources."@lerna/publish-3.4.1" sources."@lerna/resolve-symlink-3.3.0" sources."@lerna/rimraf-dir-3.3.0" sources."@lerna/run-3.3.2" - sources."@lerna/run-lifecycle-3.3.1" + sources."@lerna/run-lifecycle-3.4.1" sources."@lerna/run-parallel-batches-3.0.0" sources."@lerna/symlink-binary-3.3.0" sources."@lerna/symlink-dependencies-3.3.0" sources."@lerna/validation-error-3.0.0" - sources."@lerna/version-3.3.2" + sources."@lerna/version-3.4.1" sources."@lerna/write-log-file-3.0.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.2" @@ -45160,8 +45759,8 @@ in sources."concat-stream-1.6.2" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-1.6.6" - (sources."conventional-changelog-core-2.0.11" // { + sources."conventional-changelog-angular-5.0.1" + (sources."conventional-changelog-core-3.1.0" // { dependencies = [ sources."load-json-file-1.1.0" sources."parse-json-2.2.0" @@ -45171,11 +45770,11 @@ in sources."strip-bom-2.0.0" ]; }) - sources."conventional-changelog-preset-loader-1.1.8" - sources."conventional-changelog-writer-3.0.9" - sources."conventional-commits-filter-1.1.6" - sources."conventional-commits-parser-2.1.7" - sources."conventional-recommended-bump-2.0.9" + sources."conventional-changelog-preset-loader-2.0.1" + sources."conventional-changelog-writer-4.0.0" + sources."conventional-commits-filter-2.0.0" + sources."conventional-commits-parser-3.0.0" + sources."conventional-recommended-bump-4.0.1" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" @@ -45250,7 +45849,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" - (sources."fast-glob-2.2.2" // { + (sources."fast-glob-2.2.3" // { dependencies = [ sources."is-glob-4.0.0" ]; @@ -45302,16 +45901,16 @@ in }) sources."get-port-3.2.0" sources."get-stdin-4.0.1" - sources."get-stream-4.0.0" + sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."git-raw-commits-1.3.6" + sources."git-raw-commits-2.0.0" (sources."git-remote-origin-url-2.0.0" // { dependencies = [ sources."pify-2.3.0" ]; }) - sources."git-semver-tags-1.3.6" + sources."git-semver-tags-2.0.0" sources."gitconfiglocal-1.0.0" sources."glob-7.1.3" sources."glob-parent-3.1.0" @@ -45485,7 +46084,7 @@ in sources."npm-bundled-1.0.5" sources."npm-lifecycle-2.1.0" sources."npm-package-arg-6.1.0" - sources."npm-packlist-1.1.11" + sources."npm-packlist-1.1.12" sources."npm-pick-manifest-2.1.0" sources."npm-registry-fetch-3.8.0" sources."npm-run-path-2.0.2" @@ -45672,8 +46271,8 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."split-1.0.1" @@ -47524,7 +48123,7 @@ in }) sources."tildify-1.2.0" sources."time-stamp-1.1.0" - sources."timers-ext-0.1.5" + sources."timers-ext-0.1.7" sources."to-absolute-glob-2.0.2" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -47849,8 +48448,8 @@ in sources."signal-exit-3.0.2" sources."slasp-0.0.4" sources."slide-1.1.6" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" @@ -48239,8 +48838,8 @@ in sources."setprototypeof-1.1.0" sources."signal-exit-3.0.2" sources."sntp-1.0.9" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" (sources."sshpk-1.14.2" // { @@ -48362,7 +48961,7 @@ in sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.5" - sources."npm-packlist-1.1.11" + sources."npm-packlist-1.1.12" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -48523,7 +49122,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."flatmap-stream-0.1.0" + sources."flatmap-stream-0.1.1" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."from-0.1.7" @@ -49038,7 +49637,7 @@ in sources."node-red-node-email-0.1.29" sources."node-red-node-feedparser-0.1.14" sources."node-red-node-rbe-0.2.3" - sources."node-red-node-twitter-1.1.2" + sources."node-red-node-twitter-1.1.3" sources."nodemailer-1.11.0" sources."nodemailer-direct-transport-1.1.0" (sources."nodemailer-smtp-transport-1.1.0" // { @@ -49219,7 +49818,7 @@ in sources."connect-flash-0.1.0" sources."cookie-0.0.5" sources."cookie-signature-1.0.1" - (sources."debug-4.0.1" // { + (sources."debug-4.1.0" // { dependencies = [ sources."ms-2.1.1" ]; @@ -49275,7 +49874,7 @@ in sources."qs-0.5.1" sources."rai-0.1.12" sources."range-parser-0.0.4" - (sources."raw-socket-1.6.2" // { + (sources."raw-socket-1.6.3" // { dependencies = [ sources."nan-2.10.0" ]; @@ -49527,7 +50126,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.0.3" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."configstore-3.1.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -49539,7 +50138,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."execa-0.7.0" - sources."fast-diff-1.1.2" + sources."fast-diff-1.2.0" sources."find-up-1.1.2" sources."get-stdin-5.0.1" sources."get-stream-3.0.0" @@ -49749,8 +50348,8 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."string-width-1.0.2" @@ -50105,8 +50704,8 @@ in sources."setprototypeof-1.1.0" sources."simplediff-0.1.1" sources."source-map-0.6.1" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" @@ -50387,8 +50986,8 @@ in ]; }) sources."single-line-log-1.1.2" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."speedometer-0.1.4" @@ -50900,7 +51499,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" sources."core-util-is-1.0.2" @@ -51282,7 +51881,7 @@ in sources."lodash.memoize-3.0.4" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."micromatch-3.1.10" sources."miller-rabin-4.0.1" sources."mime-1.6.0" @@ -51354,7 +51953,7 @@ in sources."posix-character-classes-0.1.1" sources."process-0.11.10" sources."process-nextick-args-1.0.7" - sources."public-encrypt-4.0.2" + sources."public-encrypt-4.0.3" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -51577,7 +52176,7 @@ in sources."co-4.6.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."console-control-strings-1.1.0" sources."constantinople-3.1.2" sources."content-disposition-0.5.2" @@ -51707,7 +52306,7 @@ in sources."nan-2.5.1" sources."negotiator-0.6.1" sources."net-browserify-alt-1.1.0" - sources."node-abi-2.4.4" + sources."node-abi-2.4.5" sources."node.extend-2.0.0" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" @@ -51859,7 +52458,7 @@ in sources."balanced-match-1.0.0" sources."base62-0.1.1" sources."brace-expansion-1.1.11" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."commoner-0.10.8" sources."concat-map-0.0.1" sources."defined-1.0.0" @@ -51997,7 +52596,7 @@ in sources."crc-0.2.0" sources."crypto-0.0.3" sources."dashdash-1.14.1" - sources."debug-4.0.1" + sources."debug-4.1.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" @@ -52100,10 +52699,10 @@ in scuttlebot = nodeEnv.buildNodePackage { name = "scuttlebot"; packageName = "scuttlebot"; - version = "12.2.0"; + version = "12.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-12.2.0.tgz"; - sha512 = "zSB0mcodvOOXumXDqITpB6mjmqPnW32pN3SreOF/cr4mpBpWSvSmvlmHQqAVH0RnorNVu0djjDXUO8SMjc+cWQ=="; + url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-12.2.3.tgz"; + sha512 = "Y40HTj8B8DHdGUCbup//Ge/BiVcmp6fVPCGHnn5Jmq0QyQitlnFUaeMlv2fdqealM4xB3xuCTS2KChbiRJOWtw=="; }; dependencies = [ sources."abstract-leveldown-4.0.3" @@ -52197,7 +52796,7 @@ in sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.4" sources."collection-visit-1.0.0" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."compare-at-paths-1.0.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" @@ -52290,7 +52889,7 @@ in sources."map-filter-reduce-3.2.1" ]; }) - (sources."flumeview-reduce-1.3.13" // { + (sources."flumeview-reduce-1.3.14" // { dependencies = [ sources."atomic-file-1.1.5" sources."flumecodec-0.0.0" @@ -52498,7 +53097,7 @@ in ]; }) sources."ncp-2.0.0" - sources."node-abi-2.4.4" + sources."node-abi-2.4.5" sources."node-gyp-build-3.4.0" (sources."non-private-ip-1.4.4" // { dependencies = [ @@ -52726,7 +53325,7 @@ in sources."ip-1.1.5" ]; }) - (sources."secure-scuttlebutt-18.3.3" // { + (sources."secure-scuttlebutt-18.4.0" // { dependencies = [ sources."deep-equal-0.2.2" ]; @@ -52792,7 +53391,7 @@ in sources."split-string-3.1.0" sources."ssb-blobs-1.1.5" sources."ssb-client-4.6.0" - sources."ssb-config-2.3.3" + sources."ssb-config-2.3.4" sources."ssb-ebt-5.2.3" (sources."ssb-friends-3.1.3" // { dependencies = [ @@ -53073,7 +53672,7 @@ in sources."cheerio-0.17.0" sources."co-4.6.0" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."component-bind-1.0.0" sources."component-emitter-1.1.2" sources."component-inherit-0.0.3" @@ -53121,7 +53720,7 @@ in sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" sources."finalhandler-1.1.1" - sources."flatmap-stream-0.1.0" + sources."flatmap-stream-0.1.1" sources."forever-agent-0.6.1" (sources."form-data-2.3.2" // { dependencies = [ @@ -53318,7 +53917,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."compressible-2.0.15" (sources."compression-1.7.3" // { dependencies = [ @@ -53926,10 +54525,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.99.1"; + version = "1.102.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.99.1.tgz"; - sha512 = "vN2jUGwHPHAbqqOeZQsBrnWgTvuCnbxsP8i9BIaqZxINeKbuBOS1t5Kg9KMMCRJyqqCB/y76PQSdoqavh4yxkg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.102.0.tgz"; + sha512 = "OZfjEJeMdrYj7KVXaNhLwVi1vv5omRyrLv469BD6Bc6mvOK4/JVEcJGoNgn3MyWazgpOy8/4Xi9mMQvrdwfRfQ=="; }; dependencies = [ sources."@yarnpkg/lockfile-1.1.0" @@ -54055,6 +54654,7 @@ in sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" + sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" @@ -54130,7 +54730,7 @@ in sources."snyk-config-2.2.0" sources."snyk-docker-plugin-1.11.0" sources."snyk-go-plugin-1.5.2" - sources."snyk-gradle-plugin-2.0.1" + sources."snyk-gradle-plugin-2.1.0" sources."snyk-module-1.8.2" sources."snyk-mvn-plugin-2.0.0" (sources."snyk-nodejs-lockfile-parser-1.5.1" // { @@ -54141,9 +54741,9 @@ in sources."snyk-nuget-plugin-1.6.5" sources."snyk-php-plugin-1.5.1" sources."snyk-policy-1.12.0" - sources."snyk-python-plugin-1.8.1" + sources."snyk-python-plugin-1.8.2" sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-3.1.0" + sources."snyk-resolve-deps-4.0.1" sources."snyk-sbt-plugin-2.0.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.3.1" @@ -54367,7 +54967,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."css-parse-1.7.0" - sources."debug-4.0.1" + sources."debug-4.1.0" sources."fs.realpath-1.0.0" sources."glob-7.0.6" sources."inflight-1.0.6" @@ -54558,7 +55158,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.6" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -54641,7 +55241,7 @@ in ]; }) sources."finalhandler-1.1.0" - sources."flatmap-stream-0.1.0" + sources."flatmap-stream-0.1.1" sources."for-in-1.0.2" sources."form-data-2.3.2" sources."formidable-1.2.1" @@ -55294,10 +55894,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "6.1.2"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-6.1.2.tgz"; - sha1 = "1f4376383ea07de8bffbfd00b445719d57a5f474"; + url = "https://registry.npmjs.org/triton/-/triton-6.2.0.tgz"; + sha512 = "wERRcxLL1DnjCl5N/t68zu1/cPpqLs70clFI2ke1fLfwjuGF+PdZhO8dZwZZROJqOwlOozCqf3qMWiMAfztWzQ=="; }; dependencies = [ sources."asn1-0.2.4" @@ -56097,8 +56697,8 @@ in sources."isarray-2.0.1" ]; }) - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sshpk-1.14.2" @@ -56245,7 +56845,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."consolidate-0.14.5" @@ -56506,7 +57106,7 @@ in sources."@types/express-serve-static-core-4.16.0" sources."@types/long-4.0.0" sources."@types/mime-2.0.0" - sources."@types/node-10.11.3" + sources."@types/node-10.11.4" sources."@types/range-parser-1.2.2" sources."@types/serve-static-1.13.2" sources."@types/ws-5.1.2" @@ -56528,7 +57128,7 @@ in sources."anymatch-2.0.0" sources."apollo-cache-1.1.17" sources."apollo-cache-control-0.2.5" - sources."apollo-cache-inmemory-1.3.0" + sources."apollo-cache-inmemory-1.3.5" sources."apollo-client-2.4.2" sources."apollo-datasource-0.1.3" sources."apollo-engine-reporting-0.0.6" @@ -56657,7 +57257,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."config-chain-1.1.12" @@ -56700,7 +57300,7 @@ in ]; }) sources."deep-extend-0.6.0" - sources."deepmerge-2.1.1" + sources."deepmerge-2.2.1" sources."defaults-1.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" @@ -56794,7 +57394,7 @@ in sources."extract-files-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" - sources."fast-glob-2.2.2" + sources."fast-glob-2.2.3" sources."fast-json-stable-stringify-2.0.0" sources."fclone-1.0.11" sources."fd-slicer-1.1.0" @@ -56809,7 +57409,7 @@ in sources."statuses-1.4.0" ]; }) - sources."flatmap-stream-0.1.0" + sources."flatmap-stream-0.1.1" sources."for-in-1.0.2" sources."forever-agent-0.6.1" (sources."form-data-2.3.2" // { @@ -56855,7 +57455,7 @@ in sources."graphql-anywhere-4.1.19" sources."graphql-extensions-0.2.1" sources."graphql-subscriptions-1.0.0" - sources."graphql-tag-2.9.2" + sources."graphql-tag-2.10.0" sources."graphql-tools-3.1.1" sources."graphql-type-json-0.2.1" sources."growly-1.3.0" @@ -56992,7 +57592,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.11.1" - sources."nanoid-1.2.5" + sources."nanoid-1.2.6" (sources."nanomatch-1.2.13" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -57359,7 +57959,7 @@ in sources."caseless-0.11.0" sources."chalk-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."concat-stream-1.5.0" (sources."config-chain-1.1.12" // { @@ -57730,7 +58330,7 @@ in sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."md5.js-1.3.4" + sources."md5.js-1.3.5" sources."memory-fs-0.4.1" sources."micromatch-3.1.10" sources."miller-rabin-4.0.1" @@ -57793,7 +58393,7 @@ in sources."promise-inflight-1.0.1" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."public-encrypt-4.0.2" + sources."public-encrypt-4.0.3" sources."pump-2.0.1" sources."pumpify-1.5.1" sources."punycode-2.1.1" @@ -58165,7 +58765,7 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."range-slice-stream-2.0.0" - sources."readable-stream-3.0.3" + sources."readable-stream-3.0.6" sources."record-cache-1.1.0" (sources."render-media-3.1.3" // { dependencies = [ @@ -58244,7 +58844,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-6.0.0" + sources."ws-6.1.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -58270,7 +58870,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.11.3" + sources."@types/node-10.11.4" sources."@yarnpkg/lockfile-1.1.0" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" @@ -58447,7 +59047,7 @@ in sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."common-tags-1.8.0" sources."component-emitter-1.2.1" sources."compress-commons-1.2.2" @@ -58543,7 +59143,7 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."debug-3.2.5" - sources."globals-11.7.0" + sources."globals-11.8.0" sources."ms-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -58630,7 +59230,7 @@ in sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-1.2.0" + sources."fast-redact-1.3.0" sources."fast-safe-stringify-2.0.6" sources."fd-slicer-1.1.0" sources."figures-2.0.0" @@ -58878,6 +59478,7 @@ in sources."lodash-4.17.11" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" + sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" sources."lodash.debounce-4.0.8" sources."lodash.flatten-4.4.0" @@ -59197,7 +59798,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.99.1" // { + (sources."snyk-1.102.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -59225,7 +59826,7 @@ in ]; }) sources."snyk-go-plugin-1.5.2" - sources."snyk-gradle-plugin-2.0.1" + sources."snyk-gradle-plugin-2.1.0" (sources."snyk-module-1.8.2" // { dependencies = [ sources."debug-3.2.5" @@ -59258,17 +59859,18 @@ in sources."ms-2.1.1" ]; }) - sources."snyk-python-plugin-1.8.1" + sources."snyk-python-plugin-1.8.2" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.2.5" sources."ms-2.1.1" ]; }) - (sources."snyk-resolve-deps-3.1.0" // { + (sources."snyk-resolve-deps-4.0.1" // { dependencies = [ sources."debug-3.2.5" sources."ms-2.1.1" + sources."semver-5.5.1" ]; }) sources."snyk-sbt-plugin-2.0.0" @@ -59291,8 +59893,8 @@ in }) sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."split-0.3.3" @@ -59700,7 +60302,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" - sources."fast-glob-2.2.2" + sources."fast-glob-2.2.3" sources."fast-json-stable-stringify-2.0.0" sources."figures-2.0.0" (sources."fill-range-4.0.0" // { @@ -60068,8 +60670,8 @@ in sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" - sources."spdx-correct-3.0.1" - sources."spdx-exceptions-2.1.0" + sources."spdx-correct-3.0.2" + sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."split-string-3.1.0" From 583e9835a872c1a632369cce352bc7d58f228b3e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 9 Oct 2018 00:17:19 +0200 Subject: [PATCH 305/992] maintainers: change my email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8d159033192e..fd79376b14d3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3057,7 +3057,7 @@ name = "Oliver Dunkl"; }; offline = { - email = "jakahudoklin@gmail.com"; + email = "jaka@x-truder.net"; github = "offlinehacker"; name = "Jaka Hudoklin"; }; From c7fa58f6b391625171c1aec7d636d89d7e280360 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 8 Oct 2018 20:02:24 -0300 Subject: [PATCH 306/992] steam: add libxcb to steamrt overrides This fixes 'glXChooseVisual failed' when starting steam on mesa after the libxcb 1.12 -> 1.13 upgrade. --- pkgs/games/steam/runtime-wrapped.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index a0ed5aaf210c..1cde38058e7c 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -14,6 +14,7 @@ let gcc.cc nss nspr + xorg.libxcb ]); allPkgs = overridePkgs ++ [ steam-runtime ]; From 844bcbd13728fc55f5459341287e5e8943a5418f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Oct 2018 20:13:31 -0400 Subject: [PATCH 307/992] sbt: 1.2.3 -> 1.2.4 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index bbbbbf462ec8..60f342db12aa 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "1szyp9hgrvr3r5rhr98cn5mkhca1mr0qfs6cd8fiihm6hzjzn0nm"; + sha256 = "06zv1mm4rhl0h6qa7m4w5lbwjcyqp43r183q36q9zlyip965mnrn"; }; patchPhase = '' From d35e8d323942e979327c20d4c4667889d084505c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 8 Oct 2018 19:42:51 -0500 Subject: [PATCH 308/992] papirus-icon-theme: 20180816 -> 20181007 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 1efd4145ce03..83cae45426f7 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20180816"; + version = "20181007"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "0rmf5hvp6711pyqdq5sdxkrjr21nbk6113r4a7d8735ynvm8znkk"; + sha256 = "1hv526k0ykq2yj9f6bcl711sgdxwx5y0yqjf5acpvcmx9pm58vz5"; }; nativeBuildInputs = [ gtk3 ]; From 2de131bfc3ca974acc7b6c03e0889527e302f60d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 4 Oct 2018 10:20:31 -0500 Subject: [PATCH 309/992] dex: grab simple upstream patch so it reports the right version --- pkgs/tools/X11/dex/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index fd0c0503de9f..9387c62c2a51 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ stdenv, fetchFromGitHub, python3, fetchpatch }: stdenv.mkDerivation rec { program = "dex"; @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3.pkgs.sphinx ]; makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ]; + patches = [ + (fetchpatch { + url = https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch; + sha256 = "06dfkfzxp8199by0jc5wim8g8qw38j09dq9p6n9w4zaasla60pjq"; + }) + ]; + meta = with stdenv.lib; { description = "A program to generate and execute DesktopEntry files of the Application type"; homepage = https://github.com/jceb/dex; From f1987fb58f57828944ca822bbb39b3de87f01863 Mon Sep 17 00:00:00 2001 From: Erlend Pedersen Date: Tue, 9 Oct 2018 01:21:28 +0200 Subject: [PATCH 310/992] kbd: Rename some keymaps. From upstream kbd, some keymap names are reused across very different keyboard layouts. This is a a problem because loadkeys just picks the first keymap it sees. The clashing names lead to e.g. "loadkeys no" defaulting to a norwegian dvorak map instead of the much more common qwerty one. Used Arch Linux's list of keymaps that need renaming, with a small deviation: the norwegian dvorak map becomes dvorak-no instead of no-dvorak, to match the naming scheme for all the other dvorak maps. fixes #47878 --- pkgs/os-specific/linux/kbd/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index bfade509fcac..a37e65f8cb50 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -25,6 +25,19 @@ stdenv.mkDerivation rec { # Add Neo keymap subdirectory sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am + # Renaming keymaps with name clashes, because loadkeys just picks + # the first keymap it sees. The clashing names lead to e.g. + # "loadkeys no" defaulting to a norwegian dvorak map instead of + # the much more common qwerty one. + pushd data/keymaps/i386 + mv qwertz/cz{,-qwertz}.map + mv olpc/es{,-olpc}.map + mv olpc/pt{,-olpc}.map + mv dvorak/{no.map,dvorak-no.map} + mv fgGIod/trf{,-fgGIod}.map + mv colemak/{en-latin9,colemak}.map + popd + # Fix the path to gzip/bzip2. substituteInPlace src/libkeymap/findfile.c \ --replace gzip ${gzip}/bin/gzip \ From c76ffb92539d830eacf3e5bf5164ac7621c77010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Mon, 8 Oct 2018 21:10:05 +0200 Subject: [PATCH 311/992] matita: remove broken package As requested by Vincent Laporte. --- .../science/logic/matita/130312.nix | 65 ------------------- .../science/logic/matita/Makefile.patch | 11 ---- .../science/logic/matita/configure.patch | 36 ---------- .../logic/matita/configure_130312.patch | 35 ---------- .../science/logic/matita/default.nix | 52 --------------- pkgs/top-level/all-packages.nix | 14 ---- pkgs/top-level/ocaml-packages.nix | 6 -- 7 files changed, 219 deletions(-) delete mode 100644 pkgs/applications/science/logic/matita/130312.nix delete mode 100644 pkgs/applications/science/logic/matita/Makefile.patch delete mode 100644 pkgs/applications/science/logic/matita/configure.patch delete mode 100644 pkgs/applications/science/logic/matita/configure_130312.patch delete mode 100644 pkgs/applications/science/logic/matita/default.nix diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix deleted file mode 100644 index 573b0ad7e4b5..000000000000 --- a/pkgs/applications/science/logic/matita/130312.nix +++ /dev/null @@ -1,65 +0,0 @@ -{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, ocaml_mysql, ocamlnet, ulex08, camlzip, ocaml_pcre, automake, autoconf }: - -let - version = "0.99.1pre130312"; - pname = "matita"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://matita.cs.unibo.it/sources/${pname}_130312.tar.gz"; - sha256 = "13mjvvldv53dcdid6wmc6g8yn98xca26xq2rgq2jg700lqsni59s"; - }; - - sourceRoot="${pname}-${version}"; - - unpackPhase = '' - mkdir $sourceRoot - tar -xvzf $src -C $sourceRoot - echo "source root is $sourceRoot" - ''; - - prePatch = '' - autoreconf -fvi - ''; - - buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre automake autoconf]; - - postPatch = '' - BASH=$(type -tp bash) - substituteInPlace components/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" - substituteInPlace matita/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" - substituteInPlace configure --replace "ulex08" "ulex" - substituteInPlace components/METAS/meta.helm-content_pres.src --replace "ulex08" "ulex" - substituteInPlace components/content_pres/Makefile --replace "ulex08" "ulex" - substituteInPlace components/METAS/meta.helm-grafite_parser.src --replace "ulex08" "ulex" - substituteInPlace components/grafite_parser/Makefile --replace "ulex08" "ulex" - substituteInPlace configure --replace "zip" "camlzip" - substituteInPlace components/METAS/meta.helm-getter.src --replace "zip" "camlzip" - substituteInPlace components/METAS/meta.helm-xml.src --replace "zip" "camlzip" - ''; - - patches = [ ./configure_130312.patch ]; - - preConfigure = '' - # Setup for findlib. - OCAMLPATH=$(pwd)/components/METAS:$OCAMLPATH - RTDIR=$out/share/matita - export configureFlags="--with-runtime-dir=$RTDIR" - ''; - - postInstall = '' - mkdir -p $out/bin - ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin - ''; - - meta = { - homepage = http://matita.cs.unibo.it/; - description = "Matita is an experimental, interactive theorem prover"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - broken = true; - }; -} diff --git a/pkgs/applications/science/logic/matita/Makefile.patch b/pkgs/applications/science/logic/matita/Makefile.patch deleted file mode 100644 index 64c9a13f2d07..000000000000 --- a/pkgs/applications/science/logic/matita/Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- matita-0.5.8/Makefile 2009-12-01 18:21:00.000000000 -0500 -+++ matita-0.5.8/Makefile 2010-09-16 10:33:59.665461260 -0400 -@@ -38,7 +38,7 @@ - uninstall: $(foreach d,$(SUBDIRS),rec@uninstall@$(d)) - - rec@%: -- $(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*)) DESTDIR=$(shell pwd)/$(DESTDIR) -+ $(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*)) - - # {{{ Distribution stuff - diff --git a/pkgs/applications/science/logic/matita/configure.patch b/pkgs/applications/science/logic/matita/configure.patch deleted file mode 100644 index 9a3bbbb13f52..000000000000 --- a/pkgs/applications/science/logic/matita/configure.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- zzz/matita-0.5.8/configure 2009-12-01 18:21:00.000000000 -0500 -+++ matita-0.5.8/configure 2010-09-07 19:57:29.732139550 -0400 -@@ -1895,6 +1895,7 @@ - # look for METAS dir - - LIBSPATH="`pwd`/components" -+OLDCAMLPATH="$OCAMLPATH" - OCAMLPATH="$LIBSPATH/METAS" - - # creating META.* -@@ -1917,7 +1918,7 @@ - gdome2 \ - http \ - lablgtk2 \ --lablgtksourceview2.gtksourceview2 \ -+lablgtk2.gtksourceview \ - lablgtkmathview \ - mysql \ - netstring \ -@@ -1951,14 +1952,14 @@ - $FINDLIB_CREQUIRES \ - lablgtk2.glade \ - lablgtkmathview \ --lablgtksourceview2.gtksourceview2 \ -+lablgtk2.gtksourceview \ - helm-xmldiff \ - " - for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES - do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $r ocaml library" >&5 - $as_echo_n "checking for $r ocaml library... " >&6; } -- if OCAMLPATH=$OCAMLPATH $OCAMLFIND query $r &> /dev/null; then -+ if OCAMLPATH=$OCAMLPATH:$OLDCAMLPATH $OCAMLFIND query $r &> /dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else diff --git a/pkgs/applications/science/logic/matita/configure_130312.patch b/pkgs/applications/science/logic/matita/configure_130312.patch deleted file mode 100644 index 255feec566bf..000000000000 --- a/pkgs/applications/science/logic/matita/configure_130312.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- matita/configure 2011-11-22 06:04:17.000000000 -0500 -+++ matita/configure 2011-11-24 11:43:11.584847938 -0500 -@@ -1905,6 +1905,7 @@ - # look for METAS dir - - LIBSPATH="`pwd`/components" -+OLDCAMLPATH="$OCAMLPATH" - OCAMLPATH="$LIBSPATH/METAS" - - # creating META.* -@@ -1927,7 +1928,7 @@ - gdome2 \ - http \ - lablgtk2 \ --lablgtksourceview2.gtksourceview2 \ -+lablgtk2.gtksourceview \ - mysql \ - netstring \ - ulex08 \ -@@ -1953,13 +1954,13 @@ - FINDLIB_REQUIRES="\ - $FINDLIB_CREQUIRES \ - lablgtk2.glade \ --lablgtksourceview2.gtksourceview2 \ -+lablgtk2.gtksourceview \ - " - for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES - do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $r ocaml library" >&5 - $as_echo_n "checking for $r ocaml library... " >&6; } -- if OCAMLPATH=$OCAMLPATH $OCAMLFIND query $r &> /dev/null; then -+ if OCAMLPATH=$OCAMLPATH:$OLDCAMLPATH $OCAMLFIND query $r &> /dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - else diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix deleted file mode 100644 index 5495f61bfd88..000000000000 --- a/pkgs/applications/science/logic/matita/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }: - -let - version = "0.5.8"; - pname = "matita"; -in - -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://matita.cs.unibo.it/FILES/${pname}-${version}.orig.tar.gz"; - sha256 = "04sxklfak71khy1f07ks5c6163jbpxv6fmaw03fx8gwwlvpmzglh"; - }; - - buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ]; - - postPatch = '' - BASH=$(type -tp bash) - substituteInPlace components/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" - substituteInPlace matita/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH" - substituteInPlace configure --replace "ulex08" "ulex" - substituteInPlace components/METAS/meta.helm-content_pres.src --replace "ulex08" "ulex" - substituteInPlace components/content_pres/Makefile --replace "ulex08" "ulex" - substituteInPlace components/METAS/meta.helm-grafite_parser.src --replace "ulex08" "ulex" - substituteInPlace components/grafite_parser/Makefile --replace "ulex08" "ulex" - substituteInPlace configure --replace "zip" "camlzip" - substituteInPlace components/METAS/meta.helm-getter.src --replace "zip" "camlzip" - substituteInPlace components/METAS/meta.helm-xml.src --replace "zip" "camlzip" - ''; - - patches = [ ./configure.patch ./Makefile.patch ]; - - preConfigure = '' - # Setup for findlib. - OCAMLPATH=$(pwd)/components/METAS:$OCAMLPATH - RTDIR=$out/share/matita - export configureFlags="--with-runtime-dir=$RTDIR" - ''; - - postInstall = '' - mkdir -p $out/bin - ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin - ''; - - meta = { - homepage = http://matita.cs.unibo.it/; - description = "Experimental, interactive theorem prover"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 632b88c8012c..2da5edcd6646 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21231,20 +21231,6 @@ with pkgs; ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; - #inherit (ocaml-ng.ocamlPackages_3_11_2) matita; - - # Current version is 0.5.8. Official website says: - - # Version 0.5.9, released on December 23, 2014, is an update of version 0.5.8 - # to compile with the latter OCaml version and libraries. - # It is unsupported, but still used for teaching at the University of Bologna. - - # It should allow us removing the dependency on OCaml 3.11 but I haven't been - # able to confirm because Matita depends on lablgtkmathview-0.7.2 which - # already reports as broken. - - matita_130312 = lowPrio ocamlPackages.matita_130312; - metis-prover = callPackage ../applications/science/logic/metis-prover { }; mcrl2 = callPackage ../applications/science/logic/mcrl2 { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4de581e2932d..5f6d6fc9bc1d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1051,12 +1051,6 @@ let camlp5 = camlp5_strict; }; - matita = callPackage ../applications/science/logic/matita { - ulex08 = ulex08.override { camlp5 = camlp5_old_transitional; }; - }; - - matita_130312 = callPackage ../applications/science/logic/matita/130312.nix { }; - }; in (ocamlPackages.janeStreet // ocamlPackages); in lib.fix' (lib.extends overrides packageSet); From 01108c0d4b0110eee99aee97a809b7d05292c1fa Mon Sep 17 00:00:00 2001 From: edude03 Date: Tue, 9 Oct 2018 13:49:58 +0800 Subject: [PATCH 312/992] Add @edude03 to the maintainer list --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fd79376b14d3..a77df8e8cc27 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1195,6 +1195,11 @@ github = "eduarrrd"; name = "Eduard Bachmakov"; }; + edude03 = { + email = "michael@melenion.com"; + github = "edude03"; + name = "Michael Francis"; + }; edwtjo = { email = "ed@cflags.cc"; github = "edwtjo"; From c292638b401d1b9916e27ea5fd7989ff88cceeab Mon Sep 17 00:00:00 2001 From: edude03 Date: Tue, 9 Oct 2018 13:28:50 +0800 Subject: [PATCH 313/992] helm: build from sources --- .../networking/cluster/helm/default.nix | 68 +- .../networking/cluster/helm/deps.nix | 840 ++++++++++++++++++ 2 files changed, 873 insertions(+), 35 deletions(-) create mode 100644 pkgs/applications/networking/cluster/helm/deps.nix diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 72ab44e1934a..be88dc5ae0eb 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,50 +1,48 @@ -{ stdenv, fetchurl, kubectl }: -let - isLinux = stdenv.isLinux; - arch = if isLinux - then "linux-amd64" - else "darwin-amd64"; - checksum = if isLinux - then "18bk4zqdxdrdcl34qay5mpzzywy9srmpz3mm91l0za6nhqapb902" - else "03xb73769awc6dpvz86nqm9fbgp3yrw30kf5lphf76klk2ii66sm"; - pname = "helm"; - version = "2.11.0"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; +{ stdenv, buildGoPackage, fetchFromGitHub }: - src = fetchurl { - url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz"; - sha256 = checksum; +buildGoPackage rec { + version = "2.11.0"; + name = "helm-${version}"; + + src = fetchFromGitHub { + owner = "helm"; + repo = "helm"; + rev = "v${version}"; + sha256 = "1z810a6mxyrrw4i908dip8aqsj95c0kmv6xpb1wwhskg1zmf85wk"; }; - preferLocalBuild = true; + goPackagePath = "k8s.io/helm"; + subPackages = [ "cmd/helm" "cmd/tiller" "cmd/rudder" ]; - buildInputs = [ ]; + goDeps = ./deps.nix; - propagatedBuildInputs = [ kubectl ]; - - phases = [ "buildPhase" "installPhase" ]; - - buildPhase = '' - mkdir -p $out/bin + # Thsese are the original flags from the helm makefile + buildFlagsArray = '' + -ldflags= + -w + -s ''; - installPhase = '' - tar -xvzf $src - cp ${arch}/helm $out/bin/${pname} - chmod +x $out/bin/${pname} - mkdir -p $out/share/bash-completion/completions - mkdir -p $out/share/zsh/site-functions - $out/bin/helm completion bash > $out/share/bash-completion/completions/helm - $out/bin/helm completion zsh > $out/share/zsh/site-functions/_helm + preBuild = '' + # This is a hack(?) to flatten the dependency tree the same way glide or dep would + # Otherwise you'll get errors like + # have DeepCopyObject() "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime".Object + # want DeepCopyObject() "k8s.io/apimachinery/pkg/runtime".Object + rm -rf $NIX_BUILD_TOP/go/src/k8s.io/kubernetes/vendor + rm -rf $NIX_BUILD_TOP/go/src/k8s.io/apiextensions-apiserver/vendor + ''; + + postInstall = '' + mkdir -p $bin/share/bash-completion/completions + mkdir -p $bin/share/zsh/site-functions + $bin/bin/helm completion bash > $bin/share/bash-completion/completions/helm + $bin/bin/helm completion zsh > $bin/share/zsh/site-functions/_helm ''; meta = with stdenv.lib; { homepage = https://github.com/kubernetes/helm; description = "A package manager for kubernetes"; license = licenses.asl20; - maintainers = [ maintainers.rlupton20 ]; - platforms = [ "x86_64-linux" ] ++ platforms.darwin; + maintainers = [ maintainers.rlupton20 maintainers.edude03 ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/deps.nix b/pkgs/applications/networking/cluster/helm/deps.nix new file mode 100644 index 000000000000..36bd3406f5bf --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/deps.nix @@ -0,0 +1,840 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "3b1ae45394a234c385be014e9a488f2bb6eef821"; + sha256 = "0alb495ql6s02kb6lxcbnlkdcmhixyl8zv11sgrkhsk1bckzh119"; + }; + } + { + goPackagePath = "github.com/Azure/go-ansiterm"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-ansiterm"; + rev = "19f72df4d05d31cbe1c56bfc8045c96babff6c7e"; + sha256 = "0663w5m5qlidpj17s5pqp6rhl0phw7vypf104n04dvdy5nd418ix"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "1ff28809256a84bb6966640ff3d0371af82ccba4"; + sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "b26d9c308763d68093482582cea63d69be07a0f0"; + sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; + }; + } + { + goPackagePath = "github.com/MakeNowJust/heredoc"; + fetch = { + type = "git"; + url = "https://github.com/MakeNowJust/heredoc"; + rev = "bb23615498cded5e105af4ce27de75b089cbe851"; + sha256 = "17m780i9afj3sbmcrgwgzarfly4x9376w56qblkqnzdkv6vps22i"; + }; + } + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"; + sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "15f9564e7e9cf0da02a48e0d25f12a7b83559aa6"; + sha256 = "1k5pfx9hxzb70kh73a009ikr3vqlq0jvzvbyvxz9x7a7yc4r5b14"; + }; + } + { + goPackagePath = "github.com/Masterminds/vcs"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/vcs"; + rev = "3084677c2c188840777bff30054f2b553729d329"; + sha256 = "1062m73h0pp5d0574lf6px4jsjgywnsbkw50inxx3zal5r185ydm"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "8a290539e2e8629dbc4e6bad948158f790ec31f4"; + sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5bd2802263f21d8788851d5305584c82a5c75d7e"; + sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; + }; + } + { + goPackagePath = "github.com/aokoli/goutils"; + fetch = { + type = "git"; + url = "https://github.com/aokoli/goutils"; + rev = "9c37978a95bd5c709a15883b6242714ea6709e64"; + sha256 = "1c51qgk4pjc8c776h7589c3d14791h86f1yj3ykg4q7vlcf9xrnr"; + }; + } + { + goPackagePath = "github.com/asaskevich/govalidator"; + fetch = { + type = "git"; + url = "https://github.com/asaskevich/govalidator"; + rev = "7664702784775e51966f0885f5cd27435916517b"; + sha256 = "1lmynw9vkgrxv7nh60wdywv0nx4gjlkiar433wydhpc2h3m5q968"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; + sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; + }; + } + { + goPackagePath = "github.com/chai2010/gettext-go"; + fetch = { + type = "git"; + url = "https://github.com/chai2010/gettext-go"; + rev = "bf70f2a70fb1b1f36d90d671a72795984eab0fcb"; + sha256 = "0bwjwvjl7zqm7kxram1rzz0ri3h897kiin13ljy9hx3fzz1i9lml"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "71acacd42f85e5e82f70a55327789582a5200a90"; + sha256 = "0hmkrq4gdzb6mwllmh4p1y7vrz7hyr8xqagpk9nyr5dhygvnnq2v"; + }; + } + { + goPackagePath = "github.com/cyphar/filepath-securejoin"; + fetch = { + type = "git"; + url = "https://github.com/cyphar/filepath-securejoin"; + rev = "a261ee33d7a517f054effbf451841abaafe3e0fd"; + sha256 = "0id32zjb92wm569m29nfrzz5mw9z1glr3klayr6j134pp4h1sgq4"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "782f4967f2dc4564575ca782fe2d04090b5faca8"; + sha256 = "1ypijjawqc0xgmgim42260ibcyclfgfizicz5cbvndw4plqfsswk"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"; + sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m"; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "4f3616fb1c112e206b88cb7a9922bf49067a7756"; + sha256 = "0zmsqm1lkwggfqgy2rw34g4g2jlvr6mvcsh65fmpdb30l65iaqzf"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"; + sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"; + sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii"; + }; + } + { + goPackagePath = "github.com/docker/spdystream"; + fetch = { + type = "git"; + url = "https://github.com/docker/spdystream"; + rev = "449fdfce4d962303d702fec724ef0ad181c92528"; + sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl"; + }; + } + { + goPackagePath = "github.com/evanphx/json-patch"; + fetch = { + type = "git"; + url = "https://github.com/evanphx/json-patch"; + rev = "94e38aa1586e8a6c8a75770bddf5ff84c48a106b"; + sha256 = "1c9gzc3gb76lm5famc0345y90is1lyffn39bmdr0xk19462f8av5"; + }; + } + { + goPackagePath = "github.com/exponent-io/jsonpath"; + fetch = { + type = "git"; + url = "https://github.com/exponent-io/jsonpath"; + rev = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5"; + sha256 = "1qkzaxsjs7yg1672sk67nr119j7jc4751yzgii0j3nbipjv321kc"; + }; + } + { + goPackagePath = "github.com/fatih/camelcase"; + fetch = { + type = "git"; + url = "https://github.com/fatih/camelcase"; + rev = "f6a740d52f961c60348ebb109adde9f4635d7540"; + sha256 = "15vb86adns1izvbzjw0lmmzrwlarhbxw5qalhx10vzzdx73wh4ai"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee"; + sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "46af16f9f7b149af66e5d1bd010e3574dc06de98"; + sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"; + sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "1de3e0542de65ad8d75452a595886fdd0befb363"; + sha256 = "13i9y71fk9vr2abvpsk04k55il32ly3fjinvl1zlamh9mi2mdzf4"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"; + sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "5ccd90ef52e1e632236f7326478d4faa74f99438"; + sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "c0656edd0d9eab7c66d1eb0c568f9039345796f7"; + sha256 = "0b943dhx571lhgcs3rqzy0092mi2x5mwy2kl7g8rryhy3r5rzrz9"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; + sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq"; + }; + } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "02826c3e79038b59d737d3b1c0a1d937f71a4433"; + sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"; + sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "7d79101e329e5a3adf994758c578dab82b90c017"; + sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "44d81051d367757e1c7c6a5a86423ece9afcf63c"; + sha256 = "0ivq2sl2fv8x0xxrcys27c42s8yq7irgl7lp6l0im9i7ky63nk0i"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "064e2069ce9c359c118179501254f67d7d37ba24"; + sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "0c5108395e2debce0d731cf0287ddf7242066aba"; + sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; + }; + } + { + goPackagePath = "github.com/gophercloud/gophercloud"; + fetch = { + type = "git"; + url = "https://github.com/gophercloud/gophercloud"; + rev = "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"; + sha256 = "0xvapk94p1259k8arvwyvhwvcnzma9vdg12g750cgz2ghkzvfhff"; + }; + } + { + goPackagePath = "github.com/gosuri/uitable"; + fetch = { + type = "git"; + url = "https://github.com/gosuri/uitable"; + rev = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42"; + sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil"; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "787624de3eb7bd915c329cba748687a3b22666a6"; + sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; + rev = "0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"; + sha256 = "0d7vybd4yy9a9clk03578xdpyhifxsy3qv6iiglrrnblbmpgksjc"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"; + sha256 = "1z3h4aca31l3qs0inqr5l49vrlycpjm7vq1l9nh1mp0mb2ij0kmp"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "3959339b333561bf62a38b424fd41517c2c90f40"; + sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc"; + sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682"; + sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"; + sha256 = "0d9m8kyhbawa452vnwn255xxnh6pkp3im0d2310rw1k14nh3yh1p"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "ad45545899c7b13c020ea92b2072220eefad42b8"; + sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; + sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; + }; + } + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"; + sha256 = "1paz3na2xkhi10p5bk7f7gbh5yykfgr9f9i2gcc13rb461yq6fmg"; + }; + } + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "372ad780f63454fbbbbcc7cf80e5b90245c13e13"; + sha256 = "0wajddbm49bfybkab9midilg18zvdvvsffwhkq7bpp7inj4jnsvs"; + }; + } + { + goPackagePath = "github.com/petar/GoLLRB"; + fetch = { + type = "git"; + url = "https://github.com/petar/GoLLRB"; + rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; + sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; + }; + } + { + goPackagePath = "github.com/peterbourgon/diskv"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/diskv"; + rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; + sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; + sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"; + sha256 = "0i6mpcnsawi7f00rfmjfjq8llaplyzq4xrkrawlcgfd762p5hnp8"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "65c1f6f8f0fc1e2185eb9863a3bc751496404259"; + sha256 = "0jfzmr8642hr04naim1maa3wklxvcxklykri2z7k4ayizc974lkq"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "300106c228d52c8941d4b3de6054a6062a86dda3"; + sha256 = "1bcqwb9lk2sijn5q3kqp7sadhh0ysbxlj5bxjspk9yp5bp733cbh"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "89742aefa4b206dcf400792f3bd35b542998eb3b"; + sha256 = "0hk7fabx59msg2y0iik6xvfp80s73ybrwlcshbm9ds91iqbkcxi6"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "c439c4fa093711d42e1b01acb1235b52004753c1"; + sha256 = "14v5vhb180yzaknxnm8j4n9jai58b0y2nzrqzpdq7bj9slsga1vd"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "e3a8ff8ce36581f87a15341206f205b1da467059"; + sha256 = "179k26lcgafkbjylbhgj2f5pnh52bmv19rr1w95gca944blw8yga"; + }; + } + { + goPackagePath = "github.com/technosophos/moniker"; + fetch = { + type = "git"; + url = "https://github.com/technosophos/moniker"; + rev = "a5dbd03a2245d554160e3ae6bfdcf969fe58b431"; + sha256 = "1z273gvbwr09lcxwd10wyvxmxjln93r952sr1w9hqxcgc1f8l3vl"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "49796115aa4b964c318aad4f3084fdb41e9aa067"; + sha256 = "0pcq2drkzsw585xi6rda8imd7a139prrmvgmv8nz0zgzk6g4dy59"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; + sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "a6bd8cefa1811bd24b86f8902872e4e8225f74c4"; + sha256 = "151in8qcf5y97ziavl6b03vgw4r87zqx5kg4vjhjszjbh60cfswp"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "43eea11bc92608addb41b8a406b0407495c106f6"; + sha256 = "0k9wy278f5753d130p8asva2g573vi6wviwkxwwnpxni118knq1l"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "b19bf474d317b857955b12035d2c5acb57ce8b01"; + sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "f51c12702a4d776e4c1fa9b0fabab841babae631"; + sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "12d5545dc1cfa6047a286d5e853841b6471f4c19"; + sha256 = "1bv6cjakhi6j3s1bqb3n45qrmvf20qkhwxllvi94jag4i7hd91w8"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "09f6ed296fc66555a25fe4ce95173148778dfa85"; + sha256 = "06x5wr7vjsnvv35rpv7jaklilksqbzsbqk8bxababw8vr6avfwki"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "5ffe3083946d5603a0578721101dc8165b1d5b5f"; + sha256 = "1ij3sy49xfihwpcpiwd68mlfkrk375kdh6r6jlqka18zalxgpaan"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://github.com/go-inf/inf"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v2"; + fetch = { + type = "git"; + url = "https://github.com/square/go-jose"; + rev = "f8f38de21b4dcd69d0413faf231983f5fd6634b1"; + sha256 = "1bjrs3xq3m2ckfds0l4wqf81311ymm9agipmkllbvkadac156dsa"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "670d4cfef0544295bc27a114dbac37980d83185a"; + sha256 = "182x97q4826cpzybkrl8icyx1n6l1z0kspmbz33fh901v10b6322"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"; + sha256 = "1cwrwdm104xd3608b1a5mw6a19w45532p647xdwnyn62rw2f08jx"; + }; + } + { + goPackagePath = "k8s.io/apiextensions-apiserver"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apiextensions-apiserver"; + rev = "898b0eda132e1aeac43a459785144ee4bf9b0a2e"; + sha256 = "1zn4i4wfmk3y36n6mqcidgsp4aqzwy5w9749zjl2bfbwzpk81bcp"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"; + sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc"; + }; + } + { + goPackagePath = "k8s.io/apiserver"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apiserver"; + rev = "8b122ec9e3bbab91a262d17a39325e69349dc44d"; + sha256 = "0qfxjypa10s16sll2a75kn2ddjddr2xsa5rsiaxar3gs5pqvq1h5"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "59698c7d9724b0f95f9dc9e7f7dfdcc3dfeceb82"; + sha256 = "0f069d1msdb2x4yvwv0wa3hzanl97csg4hsp1pycxpnqck6qx6qh"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "91cfa479c814065e420cee7ed227db0f63a5854e"; + sha256 = "0l9yvc7gfa8i4snpv1d13vy03dplzp2jh47rqr3fhiihcz2wx4s7"; + }; + } + { + goPackagePath = "k8s.io/kubernetes"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kubernetes"; + rev = "2e809eed16445fff9dcbfc56e9936cf76ccbdadc"; + sha256 = "13fzcbjfc5c35gy66nbn1ms63b8bj3g8z7wja0p8dd3yj9lcj68h"; + }; + } + { + goPackagePath = "k8s.io/utils"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/utils"; + rev = "258e2a2fa64568210fbd6267cf1d8fd87c3cb86e"; + sha256 = "1mbw3q03sflrdgj6l7q3frqzb5f78n0m0gzjm228sy1wnm4c3760"; + }; + } + { + goPackagePath = "vbom.ml/util"; + fetch = { + type = "git"; + url = "https://github.com/fvbommel/util"; + rev = "db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394"; + sha256 = "1k9c3ihhkrcmhd26pwd62mp2ll7icr2q65i5pkymnfnhhv40p682"; + }; + } +] From a0e41023ec1f4e5f7801a534d1788b0d447063c1 Mon Sep 17 00:00:00 2001 From: edude03 Date: Tue, 9 Oct 2018 16:41:13 +0800 Subject: [PATCH 314/992] helmfile: update from 0.19.0 to 0.40.1 --- .../applications/networking/cluster/helmfile/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 358f4cdb7df7..73ec998ed8e8 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.19.0"; in +let version = "0.40.1"; in buildGoPackage { name = "helmfile-${version}"; @@ -9,13 +9,18 @@ buildGoPackage { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0wjzzaygdnnvyi5a78bhmz2sxc4gykdl00h78dkgvj7aaw05s9yd"; + sha256 = "02ir10070rpayv9s53anldwjy5ggl268shgf085d188wl6vshaiv"; }; goPackagePath = "github.com/roboll/helmfile"; nativeBuildInputs = [ makeWrapper ]; + buildFlagsArray = '' + -ldflags= + -X main.Version=${version} + ''; + postInstall = '' wrapProgram $bin/bin/helmfile \ --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} From c19fc349268ab2229b20cf2687fb0bac0b1617d0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 9 Oct 2018 17:36:02 +0800 Subject: [PATCH 315/992] firefox-devedition-bin: 63.0b9 -> 63.0b13 --- .../firefox-bin/devedition_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d175c02ff800..582da6bd8c94 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "63.0b9"; + version = "63.0b13"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ach/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ach/firefox-63.0b13.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "8b5a6d1e9abea221f134804ddc9bea5e8500e51338487cd004bd1d39b67102491e5d5b18c9737847461dfb8f711e5fc7345c013c057eee478ec1d7f1be71fd4d"; + sha512 = "34615c8bf9be4bc1f544c32df32d986b44d66f91e5f9a834fa7d7321b951700889e7ba1cf41348df457ffc71dd40e8f52177266299ca3044fc2af4514956a8b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/af/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/af/firefox-63.0b13.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "64d5927caf64b39bfc9bef4b5d9cccff4a19abbee6447580eff5d66c0af331bd6076f9cd4d6c8cb8aa6e25dea7623e2ed0ef18501b044240dab5c1c9ffc71b6e"; + sha512 = "501cd71d70809bd81f233b5205f06f289046eeab8258b1fc87e652ec2235ec73dd7f783f5d4eb8206f8981ba06f4ef312ea4a28e3a23dbb34a099cbe74bfbc7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/an/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/an/firefox-63.0b13.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "fe4042a34cc3704dabf4de8cc373949cbda705a9aeee28a908fb406972d3746cdf8b10f92b8a8f61bf491f7d662afc64aab207a826d672dc06d57f04592a8e08"; + sha512 = "e3cb48e42d423843e9e563f94bf28086c6b68306191b1893aa5ddf9e482ab947bc3bb123e36d64b3f10eb9a6750c845799ecaea721858c3de93cb120561f34e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ar/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ar/firefox-63.0b13.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "585224e0ca25a21ea0a6f20936594da9c914d1d5c6993cfdcaec3a43792fb32f16c6dc6ffc86b02c02101ca39da3d81be0e6abd1c9188d76cfa0f05419573de3"; + sha512 = "ccea5e826c4701f33b72165a6aa5087e9cd030c763fb291d94deac2a4650d1666b187909a6122f80df2d5182053cc31c63354fbba468709d8bbf9d3581604469"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/as/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/as/firefox-63.0b13.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "cc794031e63fc76438b6e995fe1b093ce0e010683bba68ac0f73c0eaea7d61e67cfc400621b57389e10330d750e244e6ab4b9b88006821b2fd513d1baaf72304"; + sha512 = "5562bdcfe2922203a51e28ed2b03d98b24e401d447acd91b32de25db4553f779bf98530912e1063757d2340e73b7c93092d7b56a208f4b0e899b78c1f1a02f07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ast/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ast/firefox-63.0b13.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "189a5f4fa12838d33adf29fbfe7d96e87de7a54fe3ea7078b2af124158d99457d2c83c1b490adb9608a0e3d42f2f721a1597c80dedf3d342c4f3ce176c93865e"; + sha512 = "4dae80bb715f931f2b7b85a4031335edecab8eeda9bbf8d5afa850d4c4db6cff1c41827a35d95d0bd3bd06351d835edf12f23f37a2fcd8735778cd898b969746"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/az/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/az/firefox-63.0b13.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "a7dfa9984917ea02eb61cd800033e8c090d630bf49eae1c1ce9419e2c424717f4203bf9bdae59f88144fb098d20673178528a5fa7f9d343ab4b95f9fc6490d19"; + sha512 = "dbea03117bbd76daf7dbe2b0fd5364255c998b9de8f1d5b1731613f676d442abb0a4e2de43eddcc0162f96898aa1bc7b08b72264d87d7625a56d177eb49d6d08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/be/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/be/firefox-63.0b13.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "79af6add5a203cc4815fd615ede035ba5b15c1cef22d69b5dc81d7874c6ebee5560e6b442a3e626aa72dcee5ce2b5bee90e31a3b2c0223b1d4cf43848d35d822"; + sha512 = "b194bed02d6fdaa0389856e9b838cfb48d2d3a39cec8a6e4a6b80fc5fff9fd6ffaad431c34d546475e8cc126fc3a686619f72a557ad9f2395f5e2db4932443ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bg/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bg/firefox-63.0b13.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "7f2b152d342a3d864f18088a6ff6e09f54887c50251c47acea2a98e019cf7cc6308085ce3a2f9fe3f6533ed1593ec8a13d8d07e0e94ef870c60ea726bd0a411c"; + sha512 = "5b6c8ed858b5e412bdf75643f988226a762e8c649f33064e488e1790b1266c8fad5a75eb79110aa1d03f9699a05b0d87494d7a1171894696399c1b74f8ac929d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bn-BD/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bn-BD/firefox-63.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a5b2f54c57122f81ab5477f6e74140fbf4eecd58837cb14550a6dd48c586f37ae584bdc3ebd3c508986bf966f5a0c1b3e5510040f24a9a6caa43f28b1357f649"; + sha512 = "a44fbd3c3d0607c5c5193125002bcbe890e7fddb6306e45ea7dafe491b43085d55bcc912e8e94ef9c6bb7c3672e6456806f17a5291b0588742319a69ef93474c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bn-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bn-IN/firefox-63.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "361fd5ff3e5c8572537cf5bfb875e80c12f2ce6de46ff5fd20863d00f550341f58532e1f7e918958ea6754cc1bf8f174e61d1a0bb819603cebefa44185e010cd"; + sha512 = "dda156f8acf3e0790c4ef2195eeac9ccc5895e1d92999f4b8254531c55e1074c313d8acd98182781b35c5d96592227ff29435d1f4c55ba8c39de60de4ea0ae92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/br/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/br/firefox-63.0b13.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "a70cd83ac27d2bb1cb01f5fe2a897f7f626954725d04974adad6fed90ca9aab70484a0920af465293c859b48fa6ed1fcc8723c166fee9e2faede4b8b6b5ce006"; + sha512 = "8812bd2e2871ead8b507ea1b9625c997cfd21547a0acd1bd2a181c5a88180708b5a9b29d8c162c977fe6dcaec48e0704ea17e49623f0b15b194ff553d5cdad99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bs/firefox-63.0b13.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "c394fd9da07c12e060bcc91ac79f2cb5fd43fab74ffed738f9c5afc3d2c22069d54c38331ea97c944c0d20d884295560016cd094b413e8f3156c6cc548b18d19"; + sha512 = "e016283425dca5e6622bdd3826ad6f720f7ffbfeab4eb3e3f862da2ba2129f3ceb17a2d0b39af514d197519a2e09294f0a4284b8f4d0362598b776e3791a54fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ca/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ca/firefox-63.0b13.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "5c93688a59b84c324d2ce846d9d235bbf4ae56a2dcdcf6437207bded60311e7b7d0ba6a207cd6089a7f6afb6bf1dadc58ac72454e6831b50bcc0a1fc0f9713b6"; + sha512 = "cab866b668a3e010e22fd92e29bec5b65404f1690f593e49b9aa03cc2ad22d3707f04451e8f6d86e796f46270c671c370e103296952bb63a59708b627ea6788e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cak/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cak/firefox-63.0b13.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "67ce43c2a19448d08eccad1c0788c73a7de6cbd81fe41a171177d8110886e4cc3e43418b1f4a07cc4c9073fc04c24c9215fa6216ebe91d620e313d23aa9f67b3"; + sha512 = "2bc6de3f1e4bb5a99734a04aedc9e4e73b71a588bb92dfbe520ab5df3e4128b683b83d67648f7b39261aa25d20f1b12af875ae92ff4fd628faaa202a268eacb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cs/firefox-63.0b13.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "50c02eb32459c8cd394a12c23f81295c75d5ffa2e62ce501bcb75b06b60b3d23c16a392d3c965222ff9eb7e50d41ce03cc32cf3d54c42086b092e25cc4a11648"; + sha512 = "de405fffb62de62c06cb6ae9360adcbf97496addff647a1a738f35a6d04b58eeecf0f2869f1daf5147da1cbc91661a04e6607d7ef2759ed4933dc061ad769cdc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cy/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cy/firefox-63.0b13.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c2e65a560da8011a50f7694adef788dddeaa68a5d7262c1da0456b22e2fa7229991c1f06ae737f7b9d85e0dfb954c7330796398bf0103f162beedec9b2383f04"; + sha512 = "107bef8675386b084a74a318aa1526aab541a281cfe38a782a42800cb8d20f009d90d11c08386274d20e0f91f2aa32b09814d64ac759b56c247cc23c4921547c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/da/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/da/firefox-63.0b13.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "262a796bdb63a4fdad4bbc79395781d660dec3f24606f8ea715a1d97d8e62d01536538529c79e6a70316319e967c4537b81a1b4b597e5981ecdf7895cfe06b1a"; + sha512 = "88ff633e4e332e32d1f494f7032d1218ec122046c0d134365e1b7195232c77a06c9c2267f27f5ff2ba115832557159f9bbab4c6d9405c2a051a3b3f31662ae2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/de/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/de/firefox-63.0b13.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d26a474d464338b472899726fe41ba53c1e00dd3879ea8afca9814b4ee8268a518be3820c54ad8c358c8e2ff62b164f7665087bc9776237858f1edd5c22a4d16"; + sha512 = "427f9b2bb38d94ec872b3fee46a234e3d778f468330be582edaf3205fa9721a7608d5611df9c3c0586f325f116c044a1c64f1920e3939ebf40990878b00d24d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/dsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/dsb/firefox-63.0b13.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3d228820f0bc1e61f4de3d99cae0b0b52174e88effbf8ea36250c30e9baec63cc716478ce775f5e4ce3adc35913dbb2942c0a67da2d1082adcaaf514815ab49b"; + sha512 = "b51741ac82877a212b7ce3f6f58c60b9cd2cc10b4cfd3bee584ad14acd6381f04268c9670e3457048c1bc804fd534e6d271124684e3d5eb19d204b9068b9ca2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/el/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/el/firefox-63.0b13.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "77eac6e37f285250efe9e5ea53b0666eb52886b4a877c4fc40be0aeba6492a5b54e8311ebf305237c57dc5c838ba5181de5cb593c338eff8132e73dcd4459927"; + sha512 = "a2e9960b35789d53e74ee55081790962ff5aa0c928b68a04c99c06ed32bd35cf776e3f39f1d8933403f97a3d1c5471f3e9915100c1b20ee7e3613801adee1dcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-CA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-CA/firefox-63.0b13.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "7a0bc375c742ac0c45f95f3f25d7fc84b3ee9fe6895fb5b3d4462fbbcf421191f50e096637e73e71d25718cf5772e9c1966ce15639c3b2bc1adc9227506723ec"; + sha512 = "7aca0601a1e298f745267efada3d9999f57643bde087d182ba053b32f995b19a9ee166297d805b440cd5716b28ebca1b6a1ab234da26fc83ee71148e279338de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-GB/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-GB/firefox-63.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "7d37c2a3b66c5bae98ee09b81f262bc8aedbde5d6d700abf6dbae232785774daae661fa7c1933e2c6408d0ea95c09153e0cc45efa02468794f03e81079b504b5"; + sha512 = "0eafc24598a7f5e7c15e2d49db5326551c215eb0e8a89215df30c3a26b09c44fd2ed632698223ef78e24024196860625aeadfd290c5bb35adea04e84d003614f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-US/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-US/firefox-63.0b13.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "88a144836494b18ee1f46024771e15cbe778b5630ab884aeafbaf7e59d5df6ff915c71f13f449faa3e56aab46a61bf5d56b354d36f5d378ee51bf34f4565c04c"; + sha512 = "bfdd31f584b739ad09498b0b540150348c68ccd669383e7afefdb303573b553c4fef74e0d3e587486178f7fc00c9096781172cfcb81b0dfa4d135a4c1a597e80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-ZA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-ZA/firefox-63.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "4f7f4d020559323e9ac1db113418c418a35c5fa8739b75cbb510d55122bc96b0c7492a79ea2862149f34019d95839733883d5516bb399a3d3e623b96d606db69"; + sha512 = "e3989ac6cbdd96e4bcd66c80865249ac501bc833708969d68f2ba07411ef8feebe74cbffe04676dba7979908b794d33af8aff82e79b8e17bbc7a09b344233cb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/eo/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/eo/firefox-63.0b13.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ded60b65f9ee8d21ac8d88723a6114c9ffae6b5e632c27f6d03c50deb054b178a576dde5379b5406366a938fa8285c7e34a71d48e3357e2439a22cc8476bb6f0"; + sha512 = "d2ce6fc32f5fabde2d7748b3b2930d3fce260eb08e49e290539e6f8ccf2c7434324ad99395879e3fbc6f34b97abb6e7b450359045f9344a68dc55c4a8d49dd9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-AR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-AR/firefox-63.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "c0963472026a9467c057f772835727d8f8b7aba52c09a73d4017943332455a98642c1732bb0f762ccb771fed9d956525fe761f85861d007950921ba8df73f2ea"; + sha512 = "a23f44b93e87781fd4b7f2dbb9084f67410d4713c622be52c4d66f3dd4caf41f135592fe852a21b29ba2364fc3bc8c910d2447dfa102340c0a9260ca53da07e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-CL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-CL/firefox-63.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "4a5acfa9427e86835b1a1faac10dbdb19f1e80dc797dad3235513addd58a6a0a348a20310fddf20791a2a2758543c4aed18fa1802423b506f5cffc72d65d534d"; + sha512 = "628910a5012f060f98308415965050184c17b4d8cf5cec9ee90c97a59da6f4384f8a571fe9b1107d2596c10e8a9c9ea2102e8b393ef04c6f0125269f8e207b57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-ES/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-ES/firefox-63.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "484c2e083135215b2266f5731f308c5f3adf57d1b065654eef2f36a83e37367c8190ce906cd0fb96f3e34a0f712953d4c0d3531056cd5f213aa92b20fcc8182a"; + sha512 = "a9bfba0b13e057fc05b4fbda7a5da6ea3dbdb014ba7d46dbaf76d193d677bbcaea7cb2c65aa6b174c8c0a967e88411e03d11039bc4942f4f8214770b636c2ea2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-MX/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-MX/firefox-63.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "300d9d5419fcd2aadf7122180408d85130e1289456a81e623bea3160a1c98205d750c7dec639ca8c731a548042852c9411b9c1e344477dd7297678c34f6f7981"; + sha512 = "b600afd00e3b8d3ad597aadaaff99c0ebdb121829a637b197acb993368a792c88a6219b37e2d10c9ee57e941794cd279837f63ad7c772acbce9cd8a9067a95f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/et/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/et/firefox-63.0b13.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "9b9e58975178d0a8770d29ab9e205cfc6200a70e423afc4ed6b3c5bf93e25ae39a1ffcec62f468a2ca99e6ffe75434963c0ec39f52c385f746bcaa4e7fe5f98c"; + sha512 = "5938b8535f581ee8801ff78a31425f147a6d21c708c11c0a5c65253ebe811f684380249077e7df4f502dfce35edbccd9f9c5418139f1cc2b327d601c91d222ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/eu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/eu/firefox-63.0b13.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5114575659341ee38dc5ee5685338d8b1f1f09d97b3fe7ef9cf79574ea61078b399756d289e444eb03d00f1df6e053fc9f927d3eb249f24985facf863bc8901c"; + sha512 = "235c1bb90687d250a7abe644149aa0000ede3b90f070593801beaf77133ab90b52697a3a799b9da9abc5d61a5f489e991c5989281fb13a1558d4bbe1fb2a5547"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fa/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fa/firefox-63.0b13.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "30c901a0a9b4093af3f143641a15ddfdb79bfe41c1c85a2c797426a6c0de4af359aabf7ec1a5a9498dd6228b60dd0dafb18f8237e87623b978e724fb60c1976a"; + sha512 = "9d29949da55984f261a3b5b74f3cd29222b8c7743da838674ed44f21df3548f940e295cd34f4c9cedb5f26165a1f65e9d9f5263b931ef414c446600f6246cc0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ff/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ff/firefox-63.0b13.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c29ae3741e16f88e23c113167b6e32ced9256b3ff219e9125a251d810d1355049931b94e28e12ff7377837899720443cf1f26eb887d17d12418b755c850d7ffb"; + sha512 = "994ac583be5d6428b7fe575c9a33d0396f0e2cb6fe3cfd256fd069b5c4590787f7606d7c0ff89004cc3adfbcd40a3466a1af72a93cba1f1d072f2dd0e9c25763"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fi/firefox-63.0b13.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "37231275a2ff967da020f2f2549437be552e9d12f3919bb7999c97641d723daba4744a5ecd6240f246028fa4e9d708169152e96578bd76882656f9d8d3aa133b"; + sha512 = "710ec15475c002f14dec5b63cff6878be3ce9bd36626641d7a9927bbf7f393338541945b77fa309f10f22a67a89b8960e19b5edf6390ccbcd37bcf17a166eb20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fr/firefox-63.0b13.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "16c41300ef3c70b872c7fbce71c8dda35e6b7a0783be96fe77fa33514f8678cb9cd08e57075513e39ec0ededf64c4502fa3391c55b55f3187ff451fc970ee8dd"; + sha512 = "2e7e2d0c3d7db2a2b8967cfff4341d63a17513d4953f8ab1d7822ef71ea3735f0b2c092a56ea7acb1253de1dcbccedf68680d68b25d0e01f923375ee7d92dc6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fy-NL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fy-NL/firefox-63.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a3e1453b0f6e4d3a9ea5989489c963bb45c7ae3f476353f77ef572cc98643cb517fcbde08d2b3051fd1bf9265ee34c52aac262d179ec28ee7819b71e3c8b0fa4"; + sha512 = "feac9d6a241186e8a5d995fc4fc959be09b7d8561b1d36fb885801fd061941d1a882de2d5aa81135f7bb63f9fc332b748486518d690c375162e3e987353c4e71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ga-IE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ga-IE/firefox-63.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "313547aa3d90a90acde80c8a9c093b0c0cf5e12141562075c006432a5fb65839a7a1facf4b150ef9c91d6de787e5b1958db9e3239d392da5bbe467acfc5913a4"; + sha512 = "25a9d4d87eb083d48dee3ddca9ca70b8d1fa30262c002a41eaecf885343164345204d4a3588bff03fe0729b1b3de5352e3223f091fb37f8f490c987ceefd788e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gd/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gd/firefox-63.0b13.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "c058b18deeec9949667e15e715fe0f71fe37db598f187fb6c5f9e112e06aa1fdc8cd1a16635d719ec107fd399848f5ff90dd2b39dcba15ca98daf3ebc4cc28ce"; + sha512 = "83cc9f13165bf0220c943ce0557ca58224ea9dc66cf054c7d68ef0879340989ff1ad90dbefa34cd1c4b82944c17403465b99c9c0fef3b7e4c944e4681560b71f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gl/firefox-63.0b13.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ba4780796f50b0ebfebb2249d372801837348a59d805ba1f918cdbb941eb0754ebf2f1ee6b04dc95e0fbb765fc70b1c06c65fe5e4f0f03c7c252b0b706d15794"; + sha512 = "b23daf5212d56b386c2fd080e9a56d1b19235b794a27b529c9bcb23984abe1464955bae5ab40f7d358b3ab7fa8ed2d68cb086c323b0d42ab672a8a646ebae8f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gn/firefox-63.0b13.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "56a7ef1f12e2dd65d6b474323ecea3e7e1a2828ea31cdfe91ab2e4457db84d55d207217d9aae927c3d0cc28791511c35bc6f9881825fce6bbae16a91f203559c"; + sha512 = "31e47a2402f48031b502dc40ea12350846c9915bde6ee7f11eccd4de1f427258f2a187c9b1469ed9d47689ec9953826362f4c7e6161651d175723a238db569ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gu-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gu-IN/firefox-63.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e0e671642e03dd877763bd27e1a9f4e88df922676558bfb079d992d84752ac017edb6d641c7952120338625510923d684e8eb43e45ca80619ee77d08d974f655"; + sha512 = "8bc66f49f4ab7584128d3574760e16eca026701caab8aa3c28d4a3e9543dde25e6d8f4bb4216549cda80b89e5c39547205e94f11813af1920bb4488b465e8422"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/he/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/he/firefox-63.0b13.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4915c3f2848bb4967a23f8d6fcf4c21527187785c0e4e419770a4949f37901372635503c97a23a8876c76491977ba83cd4d090da09f6cd994b841073f571a84d"; + sha512 = "50e316c0acbfca298fc8d02ecc5561797d4557fdd0f2347ee9cb6547d9b4b78076ccc52b114df81479f96c0b122959da088703388f29597c1e802c27b080e09e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hi-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hi-IN/firefox-63.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "269d92393fa1d11f55664439f320834dc61134a55be5470130726bb4a58e00c17ed187ec9ae1bb27001c9a5ffd9b17ec7fbedbc4383d9e03b6d9aac77babcfc2"; + sha512 = "193ae2c739c39d3933170a1a53aa9e987fed221be59d862a49f8ed916470a4009c46b222b5e92b02a362b07f3abfe85263cd0a7eebd6c45a8915dab2398bd702"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hr/firefox-63.0b13.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f2b5082db9b8dae90a186bc6fc4f998e047e8b2925bafbc3fc4832f267116e482bdf25f022271d5a849989fdc37915d84d25b71af85427d29d5400c4fed0306f"; + sha512 = "da7ee45b5b8beba3476aea9949bed3bf22a71f03642855c3c67a32028f94c6ef709b8ab3fbc0b8a4dae7bc95fc977615e6aadf00f2f1002061ea69e327ac1e71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hsb/firefox-63.0b13.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "dc43c58836f25f3df85c0afe6ed4040a18364081d933615823704b0ba2dfff87626cdcdea412eba8d1f09a3897306a52a3b76afc8414c16f66ec1ad3e01c268b"; + sha512 = "e8bc21952b7bf8a41598b7294546136089b21c4515b7a5101b1d2191f6b1d3bae082590b9c921d13c46a459fa2f67cfd3c37ba0b636f027f3e7a67685bfb5c75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hu/firefox-63.0b13.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5911ee66aa79fe78d01dca3da65dccffef2eeeeee8c52e1853cd29b097d65c0e552e0b90f6f1691d50ed5a9863857c70ead858f5695c0c76f19262d84e9a2668"; + sha512 = "3e73a62b810dcb521c7f5e477ba4a26c70c003c53f59c4ab9984a983df785a871eaaabef57a9873edc22c64ceb572a658c5d4ed4f53e4f02d2bf5a62d0032c5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hy-AM/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hy-AM/firefox-63.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b39d418a1fdaaab483d75cfca73a8224a769c266366d48d14e306fc2dda8de1a582cb8a51deb6427dc2c4acf5d411f22247f6bd128b87bc23fa1a43d24eda3a0"; + sha512 = "a10ccb8f7d38572ab16dd7ce4495633edbe66dfd668b05008cef4dc0a5dd01df7317d2795daec8f41f06ccca344673072ac1dbc7e56d77e5233577d9a73ce300"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ia/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ia/firefox-63.0b13.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b1d186c332841942c33265e93c185ba51ceafdb5b22314f06d9ccdf21fc47efdd8d26124f53caa70b4c3f35035259150d39ea426eb5ba38bc2cc51f386ca15f8"; + sha512 = "9240f49fd6d3bc0531acb01f31c4777e911da1ac5bf86ff620d197037d8b814ef9df217e3e4c53152eac32f8504511257818433dc0da86fa2b83963501c37f4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/id/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/id/firefox-63.0b13.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a23bec75f62edd71c9a7c5d329d00763c4f2ef12008e724f7e2b59b0c02a1c913bd0c079c0868190a920619e7b715ce6b91499ccdb02c0f45fd5bbc9d845c10c"; + sha512 = "43556f5c0fda64eb3164ee62d4deb21e5cb6b32fce5820dace98c745b89a5edcb8881cdbbf7dac26f840145a3450f363ec0fdcde0cefa607f090e35fe4dd5c6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/is/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/is/firefox-63.0b13.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "c16c9148f78f9e99c78a82500acea75cfe9ebba0a7e916f4840c9f734fef18184b03805e55556f20201f75d25ce59e8f78b780ccdf922936a26b46f556af5ec6"; + sha512 = "a1e3cc5ad9efd33e9053ce1c7495bdb6420dd71aa966cbc4a8ef74fb92993943f5afc6563f8863f6e2efb9f9fc13e56b92771ff209966d7f3b3b28b107686b55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/it/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/it/firefox-63.0b13.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "731112a159a8fab05733ba9945f06c2d278164ab73a83c09986146993e68caa591ed00e59dfbc6479f284f0aaa6171dfc4c4fde8656b11842483a7501062799a"; + sha512 = "74ad88540de11314be567d277bb4b8c015eefc6ca676d58ffd844aa7ac84fdc9e01c88c1eea16731bcf7e21b69a4d0a3c52a283c0b8a9c19746f9deb971f3502"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ja/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ja/firefox-63.0b13.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "3a1fa485a9fa134bb8892b410555a4dafe230fa818a14d9befe29c792ce43c1a92e4e1e4ecf33e7acd7861ede11469f5b4b74e465fbfc97943eaed904bf64396"; + sha512 = "d4be7496a7c051007e2c0766cc4efed5def3fca6ddb54db1aa17e4644323b7029cfc57deeb33f80ce0266fa129e303cfbd1eef7cb57565d7e2740c0f98dc23fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ka/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ka/firefox-63.0b13.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ae6ddd192ea353b6b1b961976e8591db920b3355ab3c09988fa72d99415855254ba3e687261782d5eb35407a951f625efece356e1648a785963414f38460bf4e"; + sha512 = "8b5128e43d6bd626bc0ef52b7f6dc1625bff751fba00ba04dfb3e378274b578be4384dca22b37a2c01b70358b098ba8062f2228219cc3194d84bd7f3a5f8e39d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kab/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kab/firefox-63.0b13.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "51d989032b7c5fa3f4103f6835dc13560b0bac0b3cc7085edb655f2fff45c45154816ef126fe16599e7ccc20bef1bb198a3f3466fe9b2ac05c178bc3867ef729"; + sha512 = "a6bbfa967cb96f167a595453ccd699f55ff2175366063fb69a28026498334901286e3a1527b36a0cfcdccdb5c7b22d6ab61e39979e261c206b51565b408625b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kk/firefox-63.0b13.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "38d5bfe52516213f4fd9952e9c458a27223d7d07456e451cee353fd22f5a6cd2f83b48a1911417dc62ed73b9e686d686bc292c3b78a365702498aa81fb6b65d8"; + sha512 = "bc1e4b1c2b4a9d098cac8ad7f227f1be756dde3c172d2867297862f1d86ac268d77a3d4ee1b4d685cb8f7fcf0f4ac5eeef6bdb41e802da1b5cbaacfd121c8285"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/km/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/km/firefox-63.0b13.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "7abeca23f35464e9fcb88902bbda0eee9ab2b05e3a6e887b92a3383f21f82a45681e0fc5df365096eb340a43f79dcfdab91e2dec3c567cad7d5ee8cf1ab9f82a"; + sha512 = "6600bf27398ac41d447d3c73f03f61b3f631303ecbcd31106c9db824d805e24c0754e8da34a6befd30c72fbf6c4eb059b468924f26fa145bdb1444813b7fd895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kn/firefox-63.0b13.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "10ea3bd4aba05b67916c43c6d28972b31b947843d23c37885869f8df2153ff426b3ecd9df652ba78b8e29f087ab9ecdd65e41e9d21088492e0ca193986508af9"; + sha512 = "7d10dfb714e62820f02ea51f453c6ef8671fc6feddae63354d73ab053e584151c32f6490421853f56f048d2540a4537f99e50ceaedefb8330e6d85f6d3a62c6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ko/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ko/firefox-63.0b13.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "7b43a7760e4cd6c8c40af2783dd9428cfaa1e10f05b1db03e843a06dff05043ef36ba4214b758477ea2a2834457ef73538ded0025749e4fec895afd1417437a2"; + sha512 = "6ddb53a1a2f7df7b7578e9c241f0c838ae5b29650fead195d8d2182f7ded0ad7827c938a59320553539b3b0fea4c6694e37b578e8c9733d38622123a46a17bbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lij/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lij/firefox-63.0b13.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "0718601664e8f656fe052e76b84d69e79d7939adf27dfad98b748b1d9ada0f8de75f8303da756812cf8bd66435f3ec6fe459581fc76b70719ba5ab40538e3454"; + sha512 = "dbea98459bc6a0aca38f47c48b72d22a102c7d544aa085d3ef12a8e290b56ea2ef11a95f4cffd9280c20601d85eae129ae31c48a607fad778bcc096165b3c585"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lt/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lt/firefox-63.0b13.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ed823d71d94bfd796c0641a9c1f304e306f40ab3ae8748bd3953565f0017378dad18c27ae5390075aa20227fc69bbc6fdb25853381a97c1552fd8c2097fe561e"; + sha512 = "b1813a9cbb879019241e5cfc5439ad79f6bfbc141a8702b5c6ae58d0eddc34e7b9f5ed4428bed3b04d616d6a3b369b9ee56d1fb2458154edd27a4844c5a57fbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lv/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lv/firefox-63.0b13.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6fd6e4abdc7d3af659907f427e3c1e05f5e0108a6bfebc64e1ba56fab83dd280a9a94a5f719d96129b72ab569d217ee3e5983822512264a11ea99e409e0b07ea"; + sha512 = "9a2d526c26eae72699bad13d7441589688bca84541e83f1fae4539934c973d86631eb055e48807c19f3f65cc34f3144605ed8ba0dffc1f951f7ad2da551b4cd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mai/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mai/firefox-63.0b13.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8fbe293fc29acc1633f47667e2ec2aa4c9d17cbbdac8d7a5fe727c586a65818f7a9fe091c8ebe17515aa008a2848b82152ca49abdc5de6a5ecff2d0415e9b74c"; + sha512 = "24f5466284251416f1d54261f074a3e35cc44241b52774a2c0dbe56289cf4ec5bcedc530ae8db33df628265c41031d47ca84de9877d60236c33fd9b8e71c1d97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mk/firefox-63.0b13.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "b0bd1aa305c38c493bf41daa6f385f87d2b8bea73fbdc2f20a6c84c5f1a90bc7cab464bad659a06eca87806acbae9fc702ae91c61e91519c8b7dd0b584ab792d"; + sha512 = "e1458a97cd0383e93804b7bf069285e18e797050891fac46e7e98dbfae9956e6a22dba38ba4514554a4134018317c2bd59d1fe7875419c3c5120410035db4888"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ml/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ml/firefox-63.0b13.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "cc43c32c3af0e6db3d4dfb2919b6de8bb1aecbab1566ad8cd9b5bf5df1b31e3307fd8cc2994f2496cea56f2c6f1089615ce963d1c81436d4a8b1392a9fed5026"; + sha512 = "07a71306ff1ebda998beedaf275f393c4aed96b12b1ed5f6c6d55d6c7f1fe8c65343be3d6924c61cc88c21e376c386ba2b837f1765261842a86a748dc672bb0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mr/firefox-63.0b13.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "dac2e8593b629b9821b3003e5005df1a4b1dfd5b5b806fbeec9b1293b8371d2adb4df0c87c1d895f084d679d7492f64d11e80f44cc22e436a10ffbc2cc4cac22"; + sha512 = "b9f9aa5acc722642ed4a27274d60ac054f06d43bd0bbb80c790c9d88afd25675dc8a2fd4d22f04b5085135916c383d5e4b6c612a821274d2bb7941b128d9c331"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ms/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ms/firefox-63.0b13.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ef3005c1c7cfd935899d9051e57e1808b2f3af7902994979862c74e9ae1d2e84d97babb33d924a58507c7574756c76db8ed78b57fad9814a796d081a2c38981a"; + sha512 = "ad341798073be55ca24190ce3774ffc5e355c4db34fd17bdb5488449893826968ebc47591318f2a0fae9cd6319c6b529ca203cde4ca250790b451f3232740795"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/my/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/my/firefox-63.0b13.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "ac397b34649079e06ca6180722943d9fda3ea4a34ecf051e94bc9264b919b9b535957a87fc0030f53d7c23b571473b232f62ff6bdb507612dc2206ce0445f0e1"; + sha512 = "d6b631660961d6027ec227a8352c2fb9ea97fd8345908fbc8b8273d29ebb3391af49e89efb8c060013c7ffdfa733e6b0319e6a37cd84907ddcbc441e8b689b63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nb-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nb-NO/firefox-63.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "614b537e3d80b0f73f3e64f28be6b7d05f4733da559c051ee953de51ef6f00e86714ec5285c1ea0cab2c40abb438f60ebcd007bc37d3ad0b60c7b3a255cbea7b"; + sha512 = "f809901e3018d02236bb6d6fbfee3aaa98d3332887e83e0e9b94104e11eeb1066a7dd313d3924adec68afa962e89f71f56e164391a4d4b0502469f4146a040be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ne-NP/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ne-NP/firefox-63.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "c0d97e45e54d468cd8ee4deef0465886efbd9fb43a6995b3fc09e2fadc06587a425dc4b0a625997429ac154077d27ad27f91fb77669f8413ce2247d6df4579fa"; + sha512 = "860786fb3bb15792e5c6180fb1d2ad3a44f71ed71aae8d6e4c7799cb3daabd37378656672a3124759ab9c6b5d32793966992fc3de54c7a17de0066d09a3287bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nl/firefox-63.0b13.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c21a9d73378ca0c5994780505a7bfa3221a714db25bb3a44fe981892457231382823cc032e3ce0f1f63819ddfd301ee3d0ac35c7bf8bc44af90ed6e73024491e"; + sha512 = "dca1ea920a191735011a44522166a2e46e023a7d61dc3e779954dccb9aae5a6c0af9e94221d150ce55351ba14c3de3de5c0beac65117e90ef5cce8107c39da45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nn-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nn-NO/firefox-63.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "1c6765886b7f9808cc342bda04f624a676ac097b175be297238a70610404171b485472be3bb974b6d9fce8ff1113aaa9c9c631b338e98e1292e6573c4d8dece1"; + sha512 = "033ef00d2c1ea1e5459c0ce6c3f1cc5e0d136a88a7dac28a2dd9d90ad2e8d036769fbce1993463800bbc96236913cf37ffd0b5f2139ab65547288feabfecdbfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/oc/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/oc/firefox-63.0b13.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "0b212f54478321be6185724d9c72b8fdc15d46f52e80051e8fd9f6e853934ce425ab7ed07aef4d74bb73ad9165562a0204c79ffa2db277b9bac927fd1894007a"; + sha512 = "912da545e8fd176b269ab8d28407f00a4790136656b94c74fac4236636879c3fa4019490ddb2600bb897d58fc8171cbf7a2612dd9f8c98ab71c2b145d1a1ace0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/or/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/or/firefox-63.0b13.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ddd916e8b5073263670c4474860f447c0eeea15ccf43474a2dbdcdbacac1d30db56e2ee8f95f0907bfd41fca3d3db55dd230e53b17f531138444b9e91d711afe"; + sha512 = "49a2a5403deaf9895f18eca6a1248ad6defaea47d95831f555d05c995c70c519b2bafec8db9273f25068924bc3c80cdcc0dc7eda592449af574fcdb93ec87e73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pa-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pa-IN/firefox-63.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "d0db3905c6d3db720e108c36de4f442bdbb195ca35d9876c1658282630c1256359677183c22027fb2484435e232cc362c986a2b46edfb128c265f98f6cc899f8"; + sha512 = "2b91579e572e7d52e843c6303c5df04d34af0ab371b6cbba98c02c6fc41bb9e5d1a6e116cbbf2c91ed730fb5a19c308e825ac916785b1c447bde3d1d82c81f8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pl/firefox-63.0b13.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "fb20a5d61a31b8f119479912751b17e741258b651b682b7e47db131316d3ef8bb823d4d8b8df0ff24885093e28609bfb055d051f96caa4fea11934ac996907de"; + sha512 = "d5c5250644ff2815b532c129a55e1d7ffb10302f156c78d6d06be07959504c613deac8e12640ededf66f6e70e2a1e7f81a8513504753386fa83d8fa805a12ee9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pt-BR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pt-BR/firefox-63.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "570153b3f9ef1213ef5f38d56da9e62e43607d5385eb63d35bce6884186b2e48d48cc0c4c1a1a66cf8270e4c4aac78e3d4caf88b338791f7ef7295465ad180fb"; + sha512 = "ee1304064ff6503433e4d6523727827f43b5ef8ce14a3a41f936d3c8f8f744594aa2749103c4f2d55687520d5e539795b77d5063e59b11f424729cadf49732df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pt-PT/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pt-PT/firefox-63.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "68ef51079373eb05f743ddcf5c1a574de69dca1d2f927b5479d72ba232f5c44544e7aa7a3b945dd592c60cca0768387080053bf121ca3c873f802e8b466960f2"; + sha512 = "a26f9aa7713589c072d92129533eaa50fe162ed60e862541915da40af2f79337bd0c49ea1589fa38c5742c7f684850ab986d4510557d203e25512437a81fb3b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/rm/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/rm/firefox-63.0b13.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "73251e69ad99ecac500f57b9b7edee0c892e633f01d2594cc972e95b525a9516551de124fcb906d72998c10b49861219830bed3bd5bc6b479a28672e0bbe4406"; + sha512 = "38dc7cef6558f4bd4625f628fa2d048064d94ee0b03d157ec0bcf5577bc1d481c15ce29a0b430a3c7126ff60a374e07bab45c2fb05610d4aa5e1a03aedf0d5b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ro/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ro/firefox-63.0b13.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e68797f62737578f9a01ad51cbb462b89c056d1ea3fa426f96ce7bb248ecb15592fe3641b502f12ccf95c21b6ef38473bbbe0406e36990cd5af234b3c3879041"; + sha512 = "7dab5b2679ff891eeb8fb28b5828069b338d1e9c5d679168551556784f5962b71a7c848fc13edf92f736f3349c403fa0a86a485643b1e29a52070fcc9e575d9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ru/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ru/firefox-63.0b13.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9261a4bf36400b1a4d4dc20abfe984e79ff10ade602cdf529d9995959a9dedf1ec78a00562b310b3e1cbd91869d89aee382f5760d07e1f32a4b3d9cd7328ef4a"; + sha512 = "853c0ad182add84b9eb2033b21b3f7421252dfcfde0bedc16380b159173b293f1d478a821480af7ccf7717532fc2566b2ce9426dd52fda9c8ad588685c2ff8d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/si/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/si/firefox-63.0b13.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d72b75c96695e8df4bad4dde1e91c3d3fa666ef0c40ed69b39c8b95c093f6127399203ed29bd36c02c99180a786a117af496201738c3a489b4bf2ba5f5fdde7c"; + sha512 = "dc0cd90a3a540be1abf132cdcd0491a1a58c17f0a32ec398699e2a9fe1e73751e16203310405c0c8f60477662778fc1fdc4e139073eb213232115f9cd0189d5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sk/firefox-63.0b13.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3361539812c51898fa7890c90215a2b23544f27b13da5ce160f8a4ba28e4e1be097a7e4e94cb4c1311d9c4d307cea3007694f913f227d5669f1a5070d2962513"; + sha512 = "ab9521a26c9cf2794318095829150a49cc3b01e2c88e6e7c604c0a2f45aa0087b997560b1111486743a89d78f8df3d76048afd503f09a41fcd03ae715c6f5254"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sl/firefox-63.0b13.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "e2b2032653d45af1b201bb51c053b1eaad089316f4ac31da1df3b1effe925cb22c015e0928502377fb24e5c5d97fbd1db0f0cdba52dcf332e26f7ad7b4a4f79b"; + sha512 = "f1f5473848cdf05e1fc401254879e8591d2cc660ec5aa94ba64820d0423bbb85385f5be5db957cd4df5e2690557c9c85ab5795ca909fff2c3fd109be0f9e2f75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/son/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/son/firefox-63.0b13.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "fbe4f5d07d74179d018edd877fe4811bf78a25bb9a0b8e374f8bd0166557502aabad43586de363729f923ae6deb3f66b6b4e1de4547e137a059a8f2a08f390c6"; + sha512 = "f074e38aae351973fb4ce4fb3e97b0c07cb7f9766961f88d8c992c87670ea79437517ffc7562d6d36e40f30c717a3b36dc1da2d6e5ed59cdec5c20c5e84ac527"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sq/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sq/firefox-63.0b13.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "b7a30f7f943ace41ab1c099de12b2098f07d4bd88cb871bbe4550e2f7e4479e2e0c484b286f939a839af75054f10426515ec2686fec5830bc318c0d35083ea4d"; + sha512 = "7e27f79d7ae1d6861a5cc41c2a5c08bc9aa011017af214c443719e292c1e42bdd41f38fdba356ef2954822e47135c5ebf7af35efebdd4b0b6b6f89d1bd7195c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sr/firefox-63.0b13.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "562b516c767116da4f01cbdc1e463b9bc63838f7a3a03bdaf57f6c188805b5a1b0f1b82495fae43cd3989ec9b80bad4c0621e0fc78da0853449e99cb2e11e23b"; + sha512 = "84cbe8a1320a99048c0600f7b3078fb96b5fc7b350298d05647d36a9523ead178ee79b1a29c00dc814c9d225b70cf33f708ca6ca845c9316802a4ddeb6310d73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sv-SE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sv-SE/firefox-63.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "10be9908b228df38c7ae420cf9c0c6b46371cf942f59a00cc77c1198c8870a85c28857dd09757015f8efb13df492b3d600bad720200e79b9c28e677d300f8bd8"; + sha512 = "8a28af04b02558556814dac039ea7bb16f06e4824d9f5536258286d0ad9abd6cd415ce3043aea3eb2be49a2deba54ef215093843ec78b5d145eebc70495a0df2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ta/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ta/firefox-63.0b13.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1a1cc424588cfc3556dbadd136ce28bd5e6b8879d623b6d7f6825bc154b3dce9b40267cf0536d35144c152a6726692a00240e9639dcce67981b65b2bc8c648e3"; + sha512 = "c1e46473b31c8f45eaa72f329e28654e214fcdafa7a4bdfa27aa7e4777901c5adf6249ca5dced05f4f027b68ec26a2427b3a577d43ee6d7683ddce304b357f48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/te/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/te/firefox-63.0b13.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "c53fd59378b8da7fa6256e1af62cefb214402d9c9ac022015ae8c628dce2e384a965a80d206ceb6f9e4ac113a2e491c9ff66c02e68a866b4606ebf1afd301e38"; + sha512 = "df5c5c2bb42027ec729b5eecb1efd82fe6c2703dc39b7cf412109e316b389aac77b0b302809b0f6e9a82ca718d4018745999a96bf6810c58922518a01081a088"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/th/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/th/firefox-63.0b13.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "848c544742993d0b075489f324d2e8ac11d51fcf3001253e7a242098f02c0721c4ba7fc9d622d38495ae46fc7bcf98119d3dfc7d2ca0b7589a6f956f2e69c295"; + sha512 = "0f735b5e4b4e7081826bac7b9d85aa5cb2bffe805ceb5d396d48137869ca414f332677549aec4cb160390c1aa8d2103c7bd614b87fd065d8d80689e90b58f458"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/tr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/tr/firefox-63.0b13.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "336ea26ef61234d1adaca4c4d4d0ac8c37b891bf8770072bc16828ba05de572b6e5b72e901360f24fceae1e1f933a13fae80e5957eac0b0145ac347227062de0"; + sha512 = "3646e8277d2adcfcadff557ac1537f30859e1bb8413e45deafa46d171341e0b0f8c250d500355104def1023d7f46886244acb5a90e3abc08aaba36530df3b12e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/uk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/uk/firefox-63.0b13.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "cfa0ed64bf0d6054fe8e6eb2d9edc7c6b6eb84ecac36f7e166c8fac6d26a78d70b21174f24df61c942d8bfca6a838db9206f00026eee5f6c8cfc6a4f36c8ce63"; + sha512 = "2f2e5a128e0032a966b520515f3954106d095510915add883d5b4996e99d80ecfd442379bd1070bc45f5424f7be757dcd3ad869274a638807457a4edf9794834"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ur/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ur/firefox-63.0b13.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "0b2520ea0a3feb87efd3b387ea22fc8bba9a62dc3d212d897d263b25954accb1869858f4d655ab82dba00d58deee38d984d547f7bb1d2715f723c8998626733d"; + sha512 = "cfd25e52b91a38769b440b0452ad99089c98f0c99c8d371ba54ab5930eeec5cee9a701c4df216e67b6d8dfafaa269286a70b9ad77b6f8ad45e687b1f5d44d6ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/uz/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/uz/firefox-63.0b13.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "ac628adb5a2362cf721a25af62e94ee98995d2d74b66d75463eab92e229d2614af5652dd5af8bf04f966d787bc91ce34d1d9654a2609da073ee69e0202694eae"; + sha512 = "9ea58c5fa76134916076bed9727afcb6f87935d9bef0631da0060c519c45fdb741c1f1d8df08b572c7848de378c23fc038dcfce446c10d9115c16d272aca89f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/vi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/vi/firefox-63.0b13.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fc0e815629c30b3d03e4700980d2c1894e8be6d6fe98e1d8d38d36c61c39e3030dd4f3ef7baef14ee68d8625da025f89367eb201be2f6feee2c6b7a09cb2caae"; + sha512 = "87db8282cce46499ec31ca67ec52ec6216f883dbcc725192d97209e59f59dfa29c2fc106c3dfbbaf04ba738feaa902ced14a23cd95ae0f09e58701cc276b7f2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/xh/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/xh/firefox-63.0b13.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "1652c92d67ef49d4b5e14e348647c21b9a7485d1f23d6e4b3251edd2505af95c60e7b9bc7d3d37f87a99f12bbb332a70ccc250f43ea7af8b03c76abfaea8a46d"; + sha512 = "fb42f2801b529f49c0deec9f8fe5705621fa63bac84ea302c8a0fb83ce76bcb288969a9dfa7e43d90193055fca006595d31689cd3404784dcefee76f1e5439c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/zh-CN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/zh-CN/firefox-63.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "3dc448c450274255f327cf7130273b9c220699c98c4af5cccd85f7e153674e9db6dfdcea4bc3ab2bdc3c1e5fe3eb848ffbf16ecc1673584b992380a0bf18f4a4"; + sha512 = "f3799097631b4f4515ab672abed8edd0aa5ea3168a55b40ed70d5d981bdd4a04810d07a2355c46c54c5eb80500fcf0a071bd22c5f1f7584b96c1e7c3917df0d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/zh-TW/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/zh-TW/firefox-63.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "683b8dc78a420c11ad657bedb86959900be81ddc21e3fc45c22a2b0a17af62d7615761ed545d58ce0843d97191ac2ab0f5f080107a07f7c3ed765ff38a3f1d50"; + sha512 = "aca754e9f2517db05e9418687e039bcf3b990c3d484b138d7cfc103a57713193eadd50a361909467d2dc6d2c9cc93f11557ec48935fd5fb31e867436f2b4f171"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ach/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ach/firefox-63.0b13.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "1978ab44856b91b1d9691e492c86d0f3e6c676312c156c852e0c69764e4500da7c8ec6f77fc417df850e73e5577fbd260c4023712d6b5cf17df885a02460a7c3"; + sha512 = "689a076a45197afd8371b286422970446a2ab53be9440bb18fbf5787f177aac6eca4d2038247042da8377baf1694a576d0121deb5763db0f3a23ae72febd959d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/af/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/af/firefox-63.0b13.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "284183486d1715bfb89a41a92f195b73ab36a34ff01373c4559ff97473e9813aa8adccfeb1629142f947a817f750bf63222f19d77318fcd56a599cc2292ac7f4"; + sha512 = "2f1ec4e19ab51001c79b17b582f1d348eb8e40ba63c2ea4201df1d3cfca72dfaee7b141884674165c33596b295e16c91c26eba9d9808d6285adaeb767a4cb617"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/an/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/an/firefox-63.0b13.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e61a418db6e78d260a28b4baefdb6ad58f7c8ec8ba85d0f9da0ca1630ad7cb3d9e8dd6676b05f4791d029c57aef6fca9cddfa28fd55a1b762740591ceab187f4"; + sha512 = "0b0aa3f8edc3f49c93896e5485cc2223fdff4edb45a437cb0e8197a5779163ea3e660303fecda2a1f8306e7e385410ec5f8891cd7e41b21b0a619d8af9c1d9c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ar/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ar/firefox-63.0b13.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7a61d7f58e4a776b1b63dd576af91ed71887cc0ca191f2799eeb160de55a7c2439bcf44335f4e343a7b7d66336c35ef07c27c49548cf7b18bc2643018c1d576f"; + sha512 = "d19ecb3f9f12a572f8a1bd125efa09f4947823b4ddcee12e8467176274cdb5677733935c2967e66d40012fe29c87123ba501c45d1594d0e1afd14460a824e56e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/as/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/as/firefox-63.0b13.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "0248abd063856e71cf1318b183f3cf9d34d4d59843411ce3119583d80dcc63628def6893a9610858b055a6ab93633f2c2b813a3f824c7bf5ac82e0d833ec83be"; + sha512 = "b481962d3d88fc7ea015a7514ab3a0ad4593eb587debbd3afd51485437bef7f5dd3a447ed0d3a57f1c500533bde9026b2185d2137127f159743d8adab8794b19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ast/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ast/firefox-63.0b13.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "cc0bf69fdabc6f72c72b11b04f6bc1e72eb17e0b54f4e8890f343dd0de59d730132d53087b89f707803d5fcd6dc70f83c1f01a0462595068851ea5bdcf96f572"; + sha512 = "b08a438a6298aa4144e8798893f9df8ed25846c0fe5831018f6ecbacae7c84b23448f03a7fa16bc05866d92ee2606d7b43b1fc0ead6745c2491da286d99fb112"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/az/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/az/firefox-63.0b13.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "6836c22daf3b0e3140cdaf595fcfffb364002c42c2b3b2374aec6a1f50a469bd20a0e27293402571f48dcf3703c944d8d0704f4b4229c7dbaea0c40a8b89ab6e"; + sha512 = "69ee1200a4fac5059e4d91e48e7921952e304fbcc4c560f6ab53f0c13fd57b5c5ec775a07926c01087878a80e7e15369e97062a7c5cfd8db2f47c15ef9da3e98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/be/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/be/firefox-63.0b13.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "dafd1bc57b1ea6f817a4705373d0dae4fdb5669887e96eba735e43c1aba1b6277ed08eedfb01372aba0dd0cd2b1bf10d5f75984e4dabc5dd8c1c26f07932b6f6"; + sha512 = "a0e909524a56e80f8cb75021390f7ad7ac035afeec5295b14d3cced450a0bddc223d677fe567d406aa7836ffd5768712b105c5e0db2ab14558a159d6aa359ca0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bg/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bg/firefox-63.0b13.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b6f23b0c4e2baf837881f9fc183f19ecd83daba1190cb828ba1442ac5db3bbb2d1555a52bcc8fa48564614943ab7e6f0b81e9a5d6784874b45b08727fc4be04e"; + sha512 = "070cd6775ec08a6c77b92ff9f8c4b2a0439a4326121e47d1afa15db3445aa15e992be465179ddaf0e907455cf3891bd236c0a9e65b13696cf158166a5d6e5ef3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bn-BD/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bn-BD/firefox-63.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "5f1cbe0e96422c73e5dd9552886324a256a9fc33e8f8bf8111a4533bd45ac799e4b25d63ab9d8a0e93a302aa39fcc1300fbc33453e7efde8e24798ab1ed92853"; + sha512 = "fc27567c007d42d038ae699ab4175e32068f144645eb7f087807aabe5305b5f33c8991f9a4fb43f3489bf3c5245eef29b363a744d595e6517d2f8a72a0074927"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bn-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bn-IN/firefox-63.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "1e01547c8454e376d78bf9ed3c5ded5d85e38bf6e7bf05bdcb984a0c978a4790d61dc6357156ab5d3999cc3d8ebf8d418fe18c03de1b2bb1772b914a37bb55fc"; + sha512 = "115651b2c72497b05d92b745edc27851a00054865b930c87448267c1427db6c65178a337387daa2fbbb826c687d8940a08d9cabeb4faecb902f08898b6239934"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/br/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/br/firefox-63.0b13.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "49f78074d8078b81adf03a371841777f72842727365cb05b0e6f04fe478778972592540071599f14c2e760342831bd9fa0b1d1d6e18f1a5fcb766fd83e20a871"; + sha512 = "2072f3b12787d799c378cd727f168807ee6a20b79f42988d08bda2b990c19b227caa57e5c996337489d000e682a53a0d6e7cb33a8f3c6270e32741c414d7ed49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bs/firefox-63.0b13.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "03540ca42b87073455d7a16645d4af9843d25de86a00ede526531de920c7112191aef16097551b497c6f086baa7d92000acf6e396a544f5933f879a87e23fd57"; + sha512 = "ddf09c431e74d6bfab7a49a10fde28b20a24f732315a7bda9295d035bcf4cf2c3d049f2a66dba7f9abe9f66fc64bf99549bed2abb7e5a0ac1ba1a9c77457b707"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ca/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ca/firefox-63.0b13.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "db81d8ef8d676271e1a9c756bd9e55957aa65759649c211a69b7ffb5648cf641da30cf5068cd0b16ea197f7454738bd17ae7d73a419503b4e0f6f7dccbbfc71b"; + sha512 = "cfd3f91f39b499f3a0125da9c952d68a8e815492b6597535017f824722f25eddd3a8b92817f546ffb4236d2984128d9b179366361f917c5d3e46b8da25da91ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cak/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cak/firefox-63.0b13.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "974f9894e248c89d4f772a090250f0d5697224746860990d692eb2b75d86b6c98bf64f1fadb7208ce6a1f57f5cdd8e2ff91c9301fb77bf2a21ca3bc9bf24776f"; + sha512 = "d077b44d7dd813a7d17ede21273d7e56bef8378b76ccf73f36f3fa7611186f7d63d266736f59f59301d0fdf26b6063b366ba7e6f1caea16407d3b1d20fc323b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cs/firefox-63.0b13.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ae5d3e44196348cf1690dc0723565214f9f72ef7e045185ef0fa65f9a58bff9340dbe989306287b1462291e01d5dfc64e71296d7340517a455d7081619739368"; + sha512 = "66454a7c5055e1550eed48d2ec70c4d921db524d449392a9edbe6e42ea111ab1152b225de3095e9ccb3922e3327eaa3180d01105cd4e9fd7634471472fc18fb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cy/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cy/firefox-63.0b13.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "2ed50ea85102a7e201ec7618289af29b079a4dd568178310aab3c41738183c22b90d34cac4763d28bbfdbdc92078078a99a18893b3edf7a513d7ffdde5dfdd28"; + sha512 = "9c1d3ed7acc8ecdcb9f10d5a3af3ee2cde1331a7fd6c9a4f6f97c26289722c96a8cafc2580b0608a8c7226d5b211d4eee137deb45f1cab9df5c1fe9462ff5062"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/da/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/da/firefox-63.0b13.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "cd9ea4ec76ca7b8e391d8565536b3da9ac5c9406788f60307a6c4179da6947f01bffb593b9cb2ff988128c0926fdf92f0a4a6a747e593a436b8afdb984a85421"; + sha512 = "5bf78b9b0dff6f4ddce433703549602fb73d98d2dd9b9720acd4fd9c023cda6bb52a92bac16d57ea339e0ffa56b4ce3eb831ffa0974940a12ca72dc250c5de6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/de/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/de/firefox-63.0b13.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "4ab7b30c9c74c111fc229ea109b892335c1c453ba5d119c3e1a481a1168990702c277acc9ffd22350b2f4a657a2786dcc77275a86e2c6372b0931dfe92d6c06a"; + sha512 = "78ca04e9dae5d05ce20db93f33b312469e6e3da1b936e43daf60d0e7eadd76eefb64a1f171fab674f688accc347d464284c410d81e9a5a407d9fcbb407031bf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/dsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/dsb/firefox-63.0b13.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "34a8104bf029558dccdbee73b40f357afec438768a45aad870e455305a07b6eaf25aa57a67b3e8cef72362e1c17239097c9cedd0093f3ad58e120860c9cbf6fa"; + sha512 = "b3569c4d4be9fe8dee22b1a3667807b89f2526a0477ac6f99886c2b8e687598eb799328589d951f6ebc1de6b05a3c2493037575d324f322bf39acff24b645c26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/el/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/el/firefox-63.0b13.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f13cb383aa609cf5c8b997c52324f4c8f345697f12c489e6a8eae076a3c56327e00315c30942c2454623804b6889ab529ce988d83dcb940905d98dd38f0d056e"; + sha512 = "024f90c38265badd689fba3950b18da9834f03bc0a754910115f34e3bfc232d9728073c058891c592c4292e4148e8459f3515caa1a05acaa1ed2c9dc709e1b48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-CA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-CA/firefox-63.0b13.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "72c97423432457f299428f43657d257008585fd31eb4006bb8ed20077563d0e708f16c3331f88224f5780bd039cbef2a7c894bb1fa965cce98047698bf2abc90"; + sha512 = "0317e9d27964f9c9c1b7fd5df85bafdf553703bc493f6f67a52bdf9f893d560b6b5c0479624599d3756ddbbb66a86fe9b88577353b1f01c3cb1c0be4425847ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-GB/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-GB/firefox-63.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "199ce1699b93774f7e206167f694415cbce6e7321607cd7f680798c391ac4eb58159962b36cdbf4e6e5928b6b9d1dfe926880651c764742aa2b10c7ad6981d8b"; + sha512 = "a700f4708e585afcef5c84a6c2a2e4d13c87c82d897f1403e9ffd7da62ba6938d8260d6ca65a3d97a4be927085a85e07fdde2cfe0fbeae7d0775fe5e875a69f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-US/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-US/firefox-63.0b13.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "01ee82125f77c4a3dc25dc86dec4cb2e37a07a4d24afe811b5a8efa8c6ade58eb9e7a75ea34e58673b11f367dcf15838af775c39f4aad6bc39d8c86385bb7c1d"; + sha512 = "46e4b65651202497bc01e49eda6a3e39196023c83d7c7407dd2a3cabb11cd954f7d2e1056ea0ed032f8eab52dfe9aeb3398f77f6aecc6be377053d4cd7ebe852"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-ZA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-ZA/firefox-63.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "5023173aa1c6ef8bb3c8872fba37edac66330543a688c17b43e4bfd45f08379b6309994a5dc9be98dc1766905d91865f026f9027644c906d170130b3a920f07f"; + sha512 = "535e2d45789b7486060d00d03fa5dd6d33fb650bfd00344306e1c237d4a4c68cf30176f39b6ecc1cb1f211186dc53d749421a8b72f8b9a0e68261f447bfbc09d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/eo/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/eo/firefox-63.0b13.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "c570a2b74dc4185d2175db8047ddc7e979593b094893fe92254861ac9f714c76a872e18926d6c73a5be26b6f6593e56e647c7561e432349c0ab7175fff41d7a2"; + sha512 = "24c179f95f5475ca9923792808139693c8cfbbcd46e8ce94b7fe5a17e51b7ff26fd4e5acee41e65b2a73c06801768246d21ddf65d0324d56a77df78ad21cbf90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-AR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-AR/firefox-63.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "bc6adc9c6ab971d3af9eaad370792feb18c162a43e9361de437fe90a55ef304b1c7ac0275267e722d6d7f9a4ede37a2539bab60a551ce7bf2ebc0040e9a5ec8c"; + sha512 = "dd950166b500e45181dc09b76e01651c360b9bc350768125ab963e328d249d6769a8237628bbd4d0ece0a9e1b7c782a59e9a5e0b515a26eef7b2ff906a59e98e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-CL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-CL/firefox-63.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "99044eb8bb8d799ae6045c37cb6a12016e885ee5c9d2a893d4d653d34579fb1403078d484389623b22f1532ea33ae1b29e3532366f9fdc6ec1228b68cbb9dd12"; + sha512 = "9f68c9746c951259ab156c6e326c62de4bd8db3b0497a5128e3024f2e640f54f1d11495d6a8ff5940e7dd9acdd6f3f0125b85326149f994dce08c96a19deb69c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-ES/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-ES/firefox-63.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c5638fac25f3715a4f7389f32b2d9e8f22e5a356e02e2ee94116080951c451c85245834c8b55fa9df95f0848a0b54eb8f68f57936e69bcf5210932c782fd621f"; + sha512 = "f63b6011aca761312eb5e5c468844b0bde291b0e1ad67a8ad7a0c020ea2e7f2ad43565998ed49f4c618656e9ad5d04d6324f9d22c1ee45bc6af6a560dc863e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-MX/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-MX/firefox-63.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "9a329cc370a2e7dbf1b76bf185f1b118e33b20b349bda8e8419797aef87db8881b4161d790f03c51b06020929a8b85bd6539fed4f8aa9838e98f4f6710321aaf"; + sha512 = "6640a1c96477906749457aa9670559c44327b25cb6526534cdd7be70c84b6687819b0ff433aaa37ce13a7f9895c2899797a3f4e4982969a1869ac1788a1b4bb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/et/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/et/firefox-63.0b13.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "f09f4e49dac39d91ea7b146122f3d99b034de486ae6339b8fadaabf1bf87eedf297503475cdf559d69a14c205841ddc2f75c0f961b9a8913f16bc14dd7593274"; + sha512 = "622842075565b7708bd4c1e06b49a8e15a5a52c768cd8dad0fa6744b1295269c38f5547cb061d4c9096a0309251c29f388b0670d7a773276c232f7124a455b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/eu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/eu/firefox-63.0b13.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "871e683e51d619e19189b8f0341ffe6e14d14c058e0b4ab973f804ddecad9c1e3c8dd7730a3da884392aaaeae99022196af27641facc1a8fd25052f516c56c22"; + sha512 = "328840563121cdaa39918ab443b1946e3b6e39a7a1866ce95daaef9f12fe46f8aa18ba4394515ad72eb7ef332cdbcf0b893fd4095368c0ca949039b31f335f80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fa/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fa/firefox-63.0b13.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "7e0d7651ebcf03f40cd9cf5faec8a404fd028a213575c644f2b2640cb00fee06a029ada21aa17ca9f24f22b7aa73767390e635f169fbdfca8d162dd914bb19cf"; + sha512 = "8d9081a75b7543c2e1c25c67d41cbebedd914f7f21eb1fc970241031120345adc7851305f57ae341b8ae7f7119712dd6a1cd9f6bc9d44d6f7cac5fc6a9591b3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ff/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ff/firefox-63.0b13.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "fbb8c2fc1d6e589fbc42a1efe33af0aa129b2a435e33c8cc7dcabf2dfae917403c2f0d9cf62e2045ed2350ba72d07ccb92ef46842a6d34a5def928386222560f"; + sha512 = "c53f07a1bb521ea5f3a3084fa6899c5fc81693bb51ba51d848c9581dabd108c769d0793e72aad7c03b7d017cc75ac084910f2d114f9e2c23e967f731eff85118"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fi/firefox-63.0b13.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "e2639d8060552ff688bc0961b19da279ea8563143f8dade844f906218a3816427562b895d30e4732c96c39fec81cecee6d39f572823e3f4890a680f0b8acc61f"; + sha512 = "4c08f8034ee0319f2e0eb75c4bf72620b793601c08fe7bc196bdd99e2d054bb1bda7cf65633546af0d91fdb857ec451f003040d38b6de999293cbfd35d76ecb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fr/firefox-63.0b13.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "1da0564312f8a180d5d793e1a782519331ad78bdd7a44dd361b15c8230520127c69b52667f0bf670038d9b5b25426522e7fbab20bc2fabf0fb9fccfcefeea442"; + sha512 = "b4d96844c39cf9ab5ea348adcbea6777446791c39d2832373881e22625a60c72f5261f04e36c44955c7069a9b94cfa46caa719c6495035708328d41cf07c5d10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fy-NL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fy-NL/firefox-63.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "cd9e14f1469f2c0530d36b5d29e26efb93b38fdf45b29775fea481a305c3a4a12c8cd6b016ec5796e2fcf3a9901348214ede9aecb62cd101022287c415c7d370"; + sha512 = "08995d67415319ce82a49b80099669714bfcd1e54a8e2590d38c1ecdd1707eca03a4b885ee608d28881609ba3ac1e1ae8f0a3460588ee713c0c9faf60d01ce50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ga-IE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ga-IE/firefox-63.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "dfcdaad90a50cd80337e3015b060e554de815b31b4075bb0738bdcd88a373a88ec9a308497c4f7b6ac031101abd700f9a796f52e10b071c7bf4cd2832f2b0d2b"; + sha512 = "a53f8909fb0e778d821404fc6566a8a5e0e13c46190777900abcbeb86648275272f37a94afbe4c83e4438f4f4f3949b945824e3d8c16734fb444bbcd2354e4f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gd/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gd/firefox-63.0b13.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "8fcf87ad0c1d85d5be1fd81ef4d3f17c93060d29c6ce889a2c96a53f3ca78a55777ff2c709c4500c643dde6b7c468fa27a5e0b71e677b5ccfc90291eca6d6744"; + sha512 = "a6e9ba4cd2a0c2f032b1f88e0e5966bfc04520ba63606f640386216719ad1c900dc3978e0cc858659912dd89140d26641157b32d5daf7fa0c35dfe2d826dd9ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gl/firefox-63.0b13.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "76aa9c700f00b86575cc81e3a7c0bf485e819c3cff7765ad7ae28b3089afa7adf2ea7c4afdbdfa36e29c57257c74a467d9225cbe524217c525c91e4f43c28892"; + sha512 = "0f902f3bf54dd76fb6fa5c0622e2ad51b85adc5cdfe4a1baede2cbba66b71856dc1c306d5ef85b49fc3222b52a210a0ac7f54796fe60329e9859d618bc4a200b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gn/firefox-63.0b13.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "01775737dafdbf6d0da9da6c20aae3ea631e59db156aed56bf2423cfd344e7cf7dd4c4ab409e0d98c2f2e3188b6b27f2228d18bac02d4a3570fb0095aff460dd"; + sha512 = "63f9c95a8b8eab315cb2a531a6573cfac53eabacabebec97d2869fd8ce07b753ab633f4ef7ced7d92784d5682dc87dc40492df78ff37a0f45326668422fe62f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gu-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gu-IN/firefox-63.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "4d57c9cf63031533db0f731c6087802ebc33aaff64f6520244b82c6b2e5b26c84c5721483405fb36e85c87b00780f5c849ca9b8627f44e57e2e0de82890928ae"; + sha512 = "28b79ef84f412f747cc03f8b5622fe8eba7bb5834da6a95ef376348a95cb5d146bbcc1597425f61f898f40fba70a79fa8e0c3e03716addf0e9fb33b523f014c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/he/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/he/firefox-63.0b13.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f99e1e067fab39e8c7a63a55535fa1a8157b501ccdfd8a45274d5c5e34e9c2817c6ef6a77692619bf7d744af99c484a62dcdcee066103711fd430f41a9b0c1d8"; + sha512 = "65a49ad024813a51692466b4cfa62ac13a53615d4b16e423d6eec0424bfd7c151c07b66c177c348bf2127eb1c623c979658a524085af8938e18e9f353462cf47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hi-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hi-IN/firefox-63.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "b9e6f5d952178667662225f6ea47e392eeb2fad54d3acd96f7d51074cf30565e8cf9fa549a77c83ef6812bd540ae41a1c4bd51ac9bf70abc40c310b6f7e6348b"; + sha512 = "495fb3e61076679cc5d57da9d542ef80c039d91be15e09a5dc37a26ed48cac1b05b36ff5c91dfb6d912debadec67a0a9914f81796bbf63b07153c47d27536475"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hr/firefox-63.0b13.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "c7b4ffcdbab0ee56d77f9ce59c8525cc91f99aef6aa0fd5015468ff69cf3817ee9ef98c79b8fc868275ed1dfb24e0cb8f6594eeb0e7231d0594c5169b39d60ce"; + sha512 = "826e7c4b0b56a0d1d766e0f2eaff0a5b4329ad4d0e01d715d3a50b61cc26aa07042b7ad1d1ea3098a439ebde266fb919e6acdfaaa521ce9a7f3a09640f3419f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hsb/firefox-63.0b13.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "002bad3e119386e3c62850e8b6e145e8242538da2367ee83d383a7c47ddc002101c2f4a1d3a775819059f83fb0f94ec041348d0440849ff6677672b01be5fff3"; + sha512 = "816bd4044bc536dde81789303aea5b26d494535e82e330bf189fa42a7a41f6a89a82525680db5551f6906457772a4b3616a349b1a730bd1fc63b9f16869aa59d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hu/firefox-63.0b13.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4ee79e8f4eefbbe29762537f117e7aae5d67a7ae2052eeb73ac19fa4119d2e4a344777aa6a4f2c449e9cc9bf247041b4085d39b76c568d7aa87bcfea6654e26c"; + sha512 = "1570c8cf2792b39f4e56e7bcc48bcee3e383a7918b908e56dae302a086d3866527de61d75e3e277b3a52de0200d68d4e8cf43303f2837562be23de79f64baae0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hy-AM/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hy-AM/firefox-63.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4818076c75e28bfee746cdfc9ade97c3dbf05b987f7c1053e7c1e5f40d9b90345cce4e5cd3497520d7c87a827de6e61bd32f2b3cbad61da040e98e7433aa5044"; + sha512 = "0343efa60301b2fb79f2c34cc04c7aced7b96fc9eb3c2bbd1cd843704c97188b016fb276ad4b1c80623271ae6b610c1177c971c30189d5e6f42b3cc941697eff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ia/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ia/firefox-63.0b13.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "96f7768946a349d3ece7dbc71ef1abe53bab26ed34bc63b5371e9dfd667ef168d778edb6fae873e0a378c96677455d547267ed38bd186daa0ca9d6008f7abb19"; + sha512 = "963e565dd8e2e96f60b83031532260cf464960528655bb69ff7c554f503b6e635162692c7ad91d9fade88e69fa88c3c7d758db15160b805f9b68356dd7b9f3ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/id/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/id/firefox-63.0b13.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "eeeccee3c1a8c8a21d320d23c6fcdcb95d0cfea3ae6c6501e33caacd18a161725e72f848fffbb7c192600e0e4f3ad047dcdefebee22574f34c59386df87971a6"; + sha512 = "63ce005570a8917dc75025249962c68919d3335bd4d9568148be138c51be477383a23a2ee790774cb1426e6a4b8fe4b7057219a11d8dff27e1a88d6106e61ba4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/is/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/is/firefox-63.0b13.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ed625feb72929469734be42ad6eff565e2f4fba5a73d0e7c0b6616ee642630d090ed48bc622367b6ad9bd2c13a8e1ae940e87bd546ac63d266863123d8363dba"; + sha512 = "49a219ca5427b8a7553d0b2a490afb6e4e82012cd6f6917735eeac9ae43a38b150ae568300dcae864a228a80f8c8184c76aaba9092b7dd51a617859a700b4be3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/it/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/it/firefox-63.0b13.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "7af81f8bfa22f021e6e820d51b007da961de995dca36faada43414578ed205a274b2120b7821aebc4e70533a3af53b74322b4183df86e447b317aaf53c08a7ee"; + sha512 = "dace66b729e7800834271b5dab8a7bf0e12f1d1ed52a4ab4fff5a74f3ee16318d60ed199902f67bed92c541da0e3c92cb1407d5520aeff7b3bcd2f4d0f71e840"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ja/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ja/firefox-63.0b13.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "a25ec6be34de7f80bedb83b0311c3df564fb46d8521e367ca85135ff66dc8f67fe38f8a0a2dc50fdb74db3c0c93fcf5355e80cb8fef83be1ec88d4bbe3a63155"; + sha512 = "5ac65b01efd765eded53d94f1e97614045cdb350efab9dd576d5aef88e9acd0625437fecda35516726cbf4c47dab96061ce50e04d260a848ca31cb18ec8176c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ka/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ka/firefox-63.0b13.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "94dea7384f702ee9f4991bbd1732f93d610e83d451124bb598891f1f1a36c72e2a3da5681584e3b27e71e7c4fda4980a09be23bcfdfa0fb83389300bb231bc16"; + sha512 = "00da1a788dd8887b2ae2e512a56b3ff05ef7b564f2abc6661fa9b5ba2928a49645aeef4a53978120207dd6d361a3133765c414f6868d2543511f173e96f615d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kab/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kab/firefox-63.0b13.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "3b20e653a7f70939402486ab7daefbacb91fc074acd28b718e914dfd1596e33431119f28c1caa318f911a4006dc6f7c51259fb962ef9113cf8df83fc4cbe6377"; + sha512 = "ccdc2f88de9fbdd87fa639993a5f241bfd3afa68e36923d8f04ed7b70e30c44aa4a7969b402e839f535c3cbf202b89d287364dc5124b08db01fe3a03f4fa21ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kk/firefox-63.0b13.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "6db1a0d8dd25f6199e50035830314e3a9bea1168b441ea2708b62c6b8fe673b146926d92e55a9c7d4d0c07da74d1c8aaf3a4216a117d18d4b217f67bc082da4b"; + sha512 = "105e96a68895ed65a7e32155f248daf03c7389a3eeab42ffc2ac9bdd82122f0f8257ac2bdba4d0a60c6591db18564850c0615cccd6a7cedfe42f51938b9c5b64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/km/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/km/firefox-63.0b13.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3595148a4b24d85ccb4e8e7ea4d0591a278d4e0b43fdd91504757e01fe51cc163e7866760ccf00be621dcb07321290de22a85710ff8cc5afeb11a21b67704ac3"; + sha512 = "234b65b2c053be05846845219bb3c7e2fbe74b5e0062f361a7d5d0d27a9f14d9235b88e0af734587035597baadb1933c2e762c75436325c362de0e0377d1d0de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kn/firefox-63.0b13.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "5bf194dfc1ad7d7a48d1a29735f88c2aa86fc79aace1159bc6fb2c6b11d088402dc9477d80075b8913699f9e02e651882a1d24d2996770ca9ec1835fb0bb73a7"; + sha512 = "763a405e942190c5314b44ace507e6d019a875e8252bc25af1ec0294265e9729fcf1d3732b22e74c3327b6fb4599f58d97599a1d46eb8762a49136fac23a57a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ko/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ko/firefox-63.0b13.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3b9bf762ed356fbca85a9e9742258484ab6edae9cae6667c64cf8572b07ed3cf83e090b30932d3beb542ffdd9906e609ed51c79906115ce7be0fd2e8cd7dbcda"; + sha512 = "076c5b2fe53b32a63238ef2c61026e9fae925725da7fc75e117edb48b4df91f2cc7b7730b82695ca7689f460518218e9a7ff32484dad63931f9d45eb6990a9cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lij/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lij/firefox-63.0b13.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "7a3552c80157ca05eec6cb018af0ced148b2cca2f8f713ef71c37ebf64c778eb881eb7dee7daa86a788ea542fe62f45080dac05259aec30070dfa79994422974"; + sha512 = "a1d756abb22516279e5473642abb1922feae9ee5604127a47f298850f620ff610ad4e0e3785ec386e28d3bc94e2dd7f09a070f40d7e3de910471b7bc694ecc75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lt/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lt/firefox-63.0b13.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "030f0d0756b3f259079539cb4ef0f1268526970e636f27540bd72647a5acb25d73d0a35f9efb4d3ef8120990ad2fa5ea1a0c5faabfab4b8a50eb670ab1f04d1a"; + sha512 = "9566c7bda61b662d371c11d899daa67a6110bb0202aee4fa7c32398a7238d0a3453f5c0b9c5f20b5b7c6d225c16883220b0739e06ab42ac5c7dae53a581e29c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lv/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lv/firefox-63.0b13.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "508b40d3251cdf63f36f46e632a798ebe796c8288ba91549ff94dad8a8105946df1379881c4d4a66f82d54e027356889a9b7e684fe924ee956a777d00ca8124f"; + sha512 = "e31862b260634f32fbc61a75bbdc550ee4310d7d53a1f3e810cc5c9a8c8b64b00b6dcf53c229219988b88e44e832d5d197ae544685b79eccd34c3f5fbb40036b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mai/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mai/firefox-63.0b13.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "1d1747277d8e8bd4643abdd261c77bf799997470ef0d6af8c55733e59f3ae7324a05bb8bb831846a6d7da3644c6cce39d83fe39935f459b1b01c3ddb8aa3af91"; + sha512 = "c347401f25574a5fc7dac814e61c2699b53ead432eaa48001df4c83184e1f609a34e7c6843a1d03c60756bed7176fc05bce0fd56c3b4586d2543c31f7e0fb809"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mk/firefox-63.0b13.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "0270f0b638fd7371b6dd302ab02bb8bbbe55a445c50ad6c62676d6ad61564b40e72ca1ee2e4b84427b8b50fa5874eba657da7bc8c316aee997164a86eb36e65e"; + sha512 = "c50615219573dbf30b60349e85138dc788fab5e162524b0fa5b78f0fd69060dc910e7c7960061f016d13e3c8880ce801c7fcb69a5da5f634567d5460f2bb2ce9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ml/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ml/firefox-63.0b13.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "99f7eba79ccb6fa69113fc30689c599a1d2b66795eed8fdc7c3b49733b42948eda051b5d178d3d07bcb8d7d37f065ca5115a2c0807c39209adcf294890f64c13"; + sha512 = "a879ffa00eeac859a2bd265aeb44971afd0119c43ef81552d1dfc477465e0d0b947b9acad7bbe6bc4cfac3c7405c5635cc181fa3bd393d3d4d7891fbd78cc29c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mr/firefox-63.0b13.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "c377e0c9f1390a31ee7390bc0272b669115a796c5fcce2effb34e0e5b2cd342b59e20465b56da30de2e35265930684dcdc122bbe16a0b28f54d23665f3ca463c"; + sha512 = "0ab05a8aba2ba9b3faf6cdf764db59d7e85593ac13cf4be1981d18a6bfdd0817bb411210ea3810d6c59c1046a76c8e4147f67647da4f047175b71aa5cb1b7ab1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ms/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ms/firefox-63.0b13.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d1102ecfb52eb0dcc1036774c7f2d3cbdce75fc893521ac2283772a956ccbf97bf84e5a70de5ec2610dd97ead87af76a217d27b3bc01ab111be989b377c22143"; + sha512 = "6669fdb2e0a73f295220327248e954ab0c80c762766535ab63cd1d1625de55439865632b7b9243fcc2663abd7acb83833dcc0cd8afed5aee0393fca7142a68e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/my/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/my/firefox-63.0b13.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "60c35a0475fc8ea7f377fb9ed958f85ad0d844b8b68234b52bb75ecf4165ee8fec6adc715bdb3862012307e8497c15a594a83cb9812f11f00b81dfe1f5f1e67a"; + sha512 = "d2a48eebdec336da92588a7bbc318844058b8735e229a0059dcabbed16b47b2887dc042bea37ad1ea6be95ee55356a1093ea5b077289de8b0c9e5c14c199dd65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nb-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nb-NO/firefox-63.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c177111dbe0696f772801fbc0cb015ba6ad4cf3e2fea1e060d14e69ea08a68714e8dabbfd67ceb7a2d228aadd6dbebdfaa97db0aff3816fd60672be909e7e1cf"; + sha512 = "28febae6395caae9156f5e4168ed030767a6daf259bb96d3779a35da58d0a72e96b5530c57cd8d0570c4eec3d142772839f14d52a542418f2ca52db2b1641895"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ne-NP/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ne-NP/firefox-63.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "9fd64628bca69b9571a66d0dff0d86111be76a9b1f33221883081864f44f4f8d33d470012cba7dde3c215384e4b6813ea23d7389360ff14843d28d884ab23389"; + sha512 = "519617b868bca07510faaa8e21bd705718d3ac23aeebaf4a4513e0346597662dd2cc5f6480a71ae1c93d9399b61f908d2090ea7c5ed5e0a30beb3efa2e4d143b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nl/firefox-63.0b13.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "302e61504fbe381ab40fdd5a8ffdc62a8051dc331106109392bd1872ea46ab736f19ac075f9f6f3eac93fe09b512f5fb84ca18a2013d54a672f1caf43ad8e095"; + sha512 = "20a19189579d2e45be4659a77bee320a62fd6df2b48a8ecfc273f507674c3ce495b56cc4a1d22b0c923e2759475f7e25eaf363f361c729abcca0906d5faaf87f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nn-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nn-NO/firefox-63.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b0bb001ca13024cad21cd97502a48381fa92dcd6f5a83dbdce1efbc28b23abeb3e84812b650187d22f775d8729c492b7a8a17987c1905e8ee827643e06a3d0d0"; + sha512 = "7efa4e6a168e6cfd2de234d3868d02083d88dd4928d721481dc57605bedc7d947b3aa097935291d6c18ba0898baeea8f325830ed6588c0b90408588fc2956d98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/oc/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/oc/firefox-63.0b13.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "e5f1eabce231b3ebba8102e6f13665ea34b38e1aeb8ac02e249d4c62a1ef65a8182bea28d51ea606ceb2493b9a8e8ae3e510dc92cecfd37713cb5dee8dc52c90"; + sha512 = "216c24840bdac20d43c992d2347b4301d13f72d4425292ac30c9f8414d5cfd991830c5dca09db829c16882dc3ee62a7e389eb0c0d202cf4a01b6ad1cfcdbf7b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/or/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/or/firefox-63.0b13.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "f55315d533e28e998cdda05bc91a9d26895f7d69be151732a50715928e63d14017e191628b564ddf005708c459354ea999aaca34771ea27598cbe5a9b238f21e"; + sha512 = "17c770c27d32ef8cf4f5255240b8d307f8c483d299b0d9d97a40f18accfa11788efee1e210055711e7c892ac7c03c14fa5ee0e6f4cff399f89ca37f8a56bdbb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pa-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pa-IN/firefox-63.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "fa07e94f5b7550bf25e2cb21059d1b0a6ede77dead1fb6403fce47b23da91722ee1a022ba564c7e11dbe2ea2ff30c782c77b461b3bb4e5ad348a55582e7d4349"; + sha512 = "665b931bf1bf79e356fc29c5bfcec44ceceb6fb9a462148fcce3f6edb711a21043e9b5e9043321188238dfe9aa0d92955aadd1a28e080917f571e5ec02dd1c49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pl/firefox-63.0b13.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "55834f3b4f5ec07b91fdddd7397a9214f96a85a24172fdcfb18e01eea3e3c5108505af8bd172a53eccd9f00ec218e8b46fd0e178d3ece960ed7448e9a5eb79c7"; + sha512 = "2331674e5dbadcaab35991f7863493957ff054c008917200d33f8c1770f3db33ce9373965d48ef230ef45f1ba43c8de798d3a60f1c77ba2da2281fc16c352ba1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pt-BR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pt-BR/firefox-63.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d4d3278f06d991fd63e400e3cbea799e721edf62de6241cc712ecdd61997e23b15dfd23197c8ea3602149af6a9ef6aa9245511ea0d4bb00591797f7d68e568e9"; + sha512 = "e0f487145013ed40f0708a44d90ad78e859472e48f2f77153065d04fe7b06ad2b862624092ce822fc8f20bab9c55dab4d70a0070d8a64c130104d41d821edf88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pt-PT/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pt-PT/firefox-63.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "317f290c2eb4a7c0aed978f927cbd1292843c38a9bf4a9ea16cfbc3a4bc1f452079a6439d4578712ce2d04ee5cb46e8e17a50ae5950b2d036bc91d746bf47a7a"; + sha512 = "2426bb2da07fc96e7083c1d52f1cf593503b9f07372484075170f1b9591caaa5dad8a7b74b573cf09eee4e76bccedb367f427fac98470cb31b12fff7efcc95a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/rm/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/rm/firefox-63.0b13.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b0826babdc742bf6365c33aa7f7be7b15c15ead4fe5aa2acecabe35e53edaabd1d31d02b57a3be83104a4fb14cab6f344c7b67a12c5ea234e75d2075358036e4"; + sha512 = "587d112fd2da7c05a482804aeabcac701414eb1d48092b9d3020a3658a5bfa5de3e8314879eaf7fc59321a54b79b820f34c54d342395469d8324e6f677ada9b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ro/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ro/firefox-63.0b13.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "36915aba5be63ee3f5b6a46bf835cef732bfb41c105b3b0e7bc2c72c7abc359c014398948365be75a133d3dcb1fc69288dc44da01426395bab0b8616c51078b4"; + sha512 = "9e08891a07b5a3d2e1043f0713383124ddac0e7266e1dd6f3218f5d3c90bab787d00b1e1bc2dde01cf5f777734931708d601133392f87452156444c25dbe7d5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ru/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ru/firefox-63.0b13.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "c43c79f415ae5ec5ffac83db60e0c7f4f4b9f39dff51d78e79a4ef3df60ccee8328aff22a8543aa58067e6418124ccc39152de6a024c58df45e01e3cd75c7ac6"; + sha512 = "d1dea1d65f29301048e185b5cf5845b8ce32bfe8c6bcb2a1be571a505e9755b5bcbce507c30054ddf021700f460e1f5e3cbef65c463727866b3962cc4e6e5dac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/si/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/si/firefox-63.0b13.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "55dc14dcbbb9ac2369d1cefdac04e0433c371ddc660978793ba44f2bf8b982c13644da7c6ddc0d2bffc6068f51233caae8b28afaa0d979eaf318be81d80d4e9f"; + sha512 = "d0f30cc64b7300c437d581c367006f5ddd9a3fba453f9e1d86928d77da6fc104467c090c6dd4d5c897f3d9324812efdd09f8e8c9fd8561f6e066c8218ae486f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sk/firefox-63.0b13.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "884fe79157630df26eddf10193d09bc929c14af774599beff9fb34a965c713da961cc45e0acd6f9a66df5b2763a6a4db7e7e361fcec8d486fd18b607e3e5c145"; + sha512 = "a001ab086a7ff80a429c133871c3257ac29e0ddfe0ad480f1f7e06c095aaae5c7637b0a40b6712ffc5d51eff12aa77a8cb7e734ab2ebc35c7ac8f3e3e07275ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sl/firefox-63.0b13.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "606145426e3ca2c361de129290d8968c77fc099d8afecf6e22ea771533912d8f60fb0da9ac60302f19bac7979f840be6365c8a7459d067ec6f68a9dd29ae611b"; + sha512 = "a3bdf74b5d7e9e5b0f3934a6c9b11c336ed99b34727e32c9263e31106dfc77bbf9cd0e11b2289f6a94261d6f6ec641e5f8b1e22dee0b2aad1e220d7dd1f0860d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/son/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/son/firefox-63.0b13.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "13c2b730ba38adb35d69bea2315179517892663e9aa7d31d41812496e691f37b3fb52dbd0a99cbe56af705fac0b9b51c6a9d96c1769f4aa6d6f6cbc174b223ca"; + sha512 = "3eb55a9e6f0bde7d236357ed19db896a7999409d07995997e7b464083c730ab3fd21c80f92f61babeff03520b209aec06a55c6f5764ec858de9402e4f436c848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sq/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sq/firefox-63.0b13.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "9ffb352754822966685dbe85a42e5f083ead0f3d38b8bc6181f624b561a60390ac968064987a593e96f5a74c01f9b7815cd58c5759f295b85d99dfd54312821d"; + sha512 = "24b5dde86cfba7463556572772fd142d1610a66776d6e021307484ae8087285c1a578c4e6849668fa345292acc889efad22bb1243418406c6b28d7768f94e4d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sr/firefox-63.0b13.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "333d38a1a0fca834e7c68dffbe78173a1751461f30f0eeb642aba6936cd09bcf0f5b6fefa5eff23e34126fcdd40b7acf28d68eb3da3400a70c245332c8175f23"; + sha512 = "863f5ca12705d5ce5c75ee4da9951bc4f8d232596857ed6354ad29c5e28e15b7e610a6c282b8607145c37be6f365cfc8e0ebe2f8ce9a8410b39f44a4b6f30985"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sv-SE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sv-SE/firefox-63.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "888eb9dd0d673815f7cf87be600341d0fb42b92f92b4c39cccefd8bf48b666b542b679bf9d7c87957e39c9c235b8bd80b510fe56e0b449e2bfec301e9f10ae8e"; + sha512 = "a1179cf0010cb1d8f84e06292c932ea1b6d91b7278ced351e920b752e6105e6bce8d2792640c382ccd4a495fd4f58cadbb5dd5d35e8bd90a791050b05b8e975a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ta/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ta/firefox-63.0b13.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "7d237b92a23ba67d016f94aa1f2a5b65425adb9d9a7ecdbb8090fad4edf200cf8ccbd512998914c4d36ca53edb144b138f838685f0c6f757fb8f3b3abdcde969"; + sha512 = "f46dee416a015612f973577a77ccd151bec500ebd52d05467a8e8ced85dd698edab13d2d38ee2bfcd16ebda7c2970c7f2eb22726bb06c355965216da32acfbda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/te/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/te/firefox-63.0b13.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "4aea0a2f2d0563f054fa59ad024efb4fb01f23bcfae74a3984222a584125aa7fe8d88729049f9c748e679fa9dab9cea10e3f6072e7bb8d65d3d9313234206985"; + sha512 = "303b4a892479f8ae8d0628e58522929fc184d7179733b38fe45f154cdff14ff1e9675bfd6a16e1d1975ce8787b930f6ac1794390d2c4ef1a9009927735d37ab5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/th/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/th/firefox-63.0b13.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "172b2d4d91d145d05fb45a9ef4415d5c31335f464a35adf7a29325e8eb97e6720908ec6cf962935945bc8f01dc18b052ede28c779f276bffe4fe497e73026ab6"; + sha512 = "e9ceb65512d95c6d3e8d5fc77f428e7047fed84664be1ce77376d4e8e73ac31c23c8b2008bd73d87f3dc463708bce6631be885e23385790ee35b9d32cab69164"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/tr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/tr/firefox-63.0b13.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "d69bb024bad2d27498fda94cd878014e8dbfcfa436c89b1a8fcbed5968ddc33f2680887547abfb5867c8e47acd926a907e4b7fd3a4fbe91d583de3cae200a90c"; + sha512 = "2996a1f32dac40cb2e327cdbf89b8b28b13e210c5d7a4fc4d8e9ab13f8d6e6a29992f240e9791d7fc7d1bafa8fe86a905ea216fc1c14eacf4649ba9f95f8601a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/uk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/uk/firefox-63.0b13.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "db35d4c9fdf59644b39b16604dbe61def9142b4799ea22e0ce9ad1855a8c4fdfaf06d0db83aca92de8b57e368b6f4933da61d5b9a1b992fadbc1db3a59eeed08"; + sha512 = "30514c8de52e33a021c94261fce16a9e7606cd511a1fb492cb817d4f57d2230fa6ff94317112fce230b8e4a4b3fb7db17961c4080c55269c398bcfdca036357f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ur/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ur/firefox-63.0b13.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "adc59c274967e05de777b591e6e85a65bb8c8fc62d03abb0a5f0f59be33d128bc45ffc731f4ef68cdec743e1def5bb1a49932ff68095716c866c1a039f9c6c8c"; + sha512 = "60460b758f82d306494c601a6fa708ae203ff712bd4a14128114ffb90bed91fcfd482dd43556841871c0a352e92abaaf8c75cc24d3b79022f5847d17c2341083"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/uz/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/uz/firefox-63.0b13.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9bcfe72ded0b8ac3e153a41c3440306c6696035af5a288e912b8a946c13431881f53e8a59a242df4f73bf83b5fa6cc9de75fbd0f1ea469eb51b959c54be22a8f"; + sha512 = "cd5e6c09f778dafa923ddbf01f24e1143f1c8719b2af5d2a4a697ce9dc6998a2893d7019762f1c87c80a190ffb42469e27eade981bf3d35f0e3428421fda2645"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/vi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/vi/firefox-63.0b13.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "eb580260af95438e0d6e3eec37846f684ce61c12c09a0c563e66ae43d30a9f9cbc4c2c36b9830691d94f2d86ddce0a70b2996b82a9a9b14bbe00f87cac145b00"; + sha512 = "ff892cc4b533aabb1821ded5d2157a594c7e0581ce59cab600c4d083d563aacc7c67ba58ac2133bccf31997a81e649eab87417485d7c9de1f93b3846df4df8f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/xh/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/xh/firefox-63.0b13.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8f794848b9d1da7b4dc90fe91b53d16b572153a6f8cecbbb92fc0ebce468982cdac339938a4c74d629e85f65edc6c2697ab9a671b6fe9f3396c81a6503aaf967"; + sha512 = "db3786087ea3aed24f04b4fdc94717260fae98c288f0df17cc753df572b092b25bcbbe08de765f76b84ac9e7f1d39bcbcc2cbb1372b3c76775cf2a55f45cc32f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/zh-CN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/zh-CN/firefox-63.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7cc3f84221270f495f1eab5a6bdb6e3d968edde0586bf6260b7a474ad2e6b9c0de737a0cebaa6c7a312fb5a26490336194915b4715d1e9939381e39e1f73476c"; + sha512 = "f803c7b7b593b66baf6995ca9e2ac51613b668b878c26bfb1280ec4263e4ca1e4300bf4abf41b327b90736d78be0a823431a7e3c0c121347cd13d88ecf12da97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/zh-TW/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/zh-TW/firefox-63.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "93961413dcd0cb6343e5b65793a7528e4001af511d04cf28d5f869b1fa838113a2904ad27d3e7bda0589d87ae0cf69eaea69e4d126df8c103a3a981f36a9d9eb"; + sha512 = "27836c549263ec7ed275a9a65a3707e8b04f2cd6ce87fe29c796ecd6639a4dd95749157004e370876df058da3d452804633bbe34517dab186a54b964ab655181"; } ]; } From ffc899dab1dfadba1f2576ef378ca3bb31dde858 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 9 Oct 2018 17:36:10 +0800 Subject: [PATCH 316/992] firefox-beta-bin: 63.0b9 -> 63.0b13 --- .../browsers/firefox-bin/beta_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index fa382a2bf246..a2b01c888419 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "63.0b9"; + version = "63.0b13"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ach/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ach/firefox-63.0b13.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "34bbbd919c8b756392fb085afa6dc23b4a2101f2b089f1a4ea558eeefdbe5fa01334e8a2c45abb3ea2d5409f38693699921938b913da8195efe25353f4af9b5c"; + sha512 = "f07014570689a2f4f55771d199340193a3059ae121e7d5825e818fc6e5245bce15cde80de1f7c35bb13a595e898b79481b20f7b80abe63181cb46b6f47da4076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/af/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/af/firefox-63.0b13.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "62e754f4e1a1972cd737feb5d2960d2a9271695ab38fc58a53c62ebf66a889d724fead843b72ee7f48d416a1af66eb2387d49f8cb665fcae1be1ecf40f939f70"; + sha512 = "76606553f77a5a0deb6e50908b39824242175b044ab1562b1276ba97c8bf0d24154edd46e67c13afdba06df6e65725e291d4d25f1cd9177265f747bf729ed7db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/an/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/an/firefox-63.0b13.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "8068aad55ca3d6fe47c19ff43b814fa84d93dc051e4f22197ab4b512ba525b30bfcb0a39d490effaea383d4841482c1415f5e0737957cdc83ad8188b3136aac8"; + sha512 = "fa29b6af86d37befb227359254d680d2ce7eed7cbd4ff511be222ef112fca6b477fe3dd5c78696bcd71402aa4e99051ef3a0b6326ac959dc3262c9b8193e69b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ar/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ar/firefox-63.0b13.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "58dce7a3530872be9e1961c4a14a84e77d43d874f4ae0ec0bc1a9bf05e4f8264f832add17c4b05f6586ed7b456667ef85764786dff386feabd23269da7abd725"; + sha512 = "1921963fd0a8b515c351d30d9b7683f7984e619e77df0f9bdbcae85b0a0c1e4a9475be238cac6049d61135677af26868fc91ae76ec2ba81535116c95665afc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/as/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/as/firefox-63.0b13.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "7599160ec4dfbdf774ea12231fa1a06e6448304898c031d973448a04aafc2966ab6421a1952a39ab0faf6bbc41151c8f4da97af3400afc0ca8c2f2da74aadc93"; + sha512 = "083b1f189b5b25f788d5bb8aa4367743a701e760e3ffa9c3d7bef8d221dccab9ebbb5c4486349f156bcf3cc44b90aae215fb76ea22c18b0401f69988915ee8ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ast/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ast/firefox-63.0b13.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "93aa64c23a9d52c67b3da7df22de140ca82e285cbfd55f2803cb55c3c369ce61c32c43383cf140b8ef884d137f072e258f13c3e657b10ceedd7853a84896b690"; + sha512 = "c1a7dfcf12d8b4fd4a7c6b657436073c41a10cd4ffc1e131482b83242d8a023cc89920bae085a3d7e334e5f8a87be8e2c01967d3d5e76f687c6528af09dd2adb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/az/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/az/firefox-63.0b13.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "7ddd48532987004cd48faee65ab93d6d6155df674d37ce744e06a32086e3e739355066b0411e673636d192a7d2610012ead4d417a1801fd11bef58d7b9a64dff"; + sha512 = "febe74dfeece3c7fddf3d24e682f4c991eecd511702217c3e18941edb9ec6a5120b95da72bd7b7f5f146f74174a0f4624ff112c56e3d6d9cb1ff5e8e349a294d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/be/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/be/firefox-63.0b13.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "9b94f1741354bd018b539fabc167b842d42ede08a7f91ecca731d90c8677478b239150c06b1fc29888334358b724424fe011630f2b8ebe8ab80557ef6e6a2965"; + sha512 = "0ef2883de7eeb54eacd376cf00bdcfaf399f1a7761f2a26ce8756d70673f9074d0f919ca0253795db7643161aaf780461f238ae1065506376ce6511f0134444e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bg/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bg/firefox-63.0b13.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "8f5f3c7ee95a7b2542de91262d2e67b5ad86a6f1b95eadd5852c04814bfe19600f6a4dba1cc872a09afc124c60e7a9e5ffe630d197f4bc41e15f9e5d4bbf3766"; + sha512 = "df39cacd1c8b40c863fa4d64bf1eba8016f5789b1a09f5d3dc0947795e11b51dd67fa61dc666ab22d00c2d21c3eb3891cbef5e6ccfd6f419ba5ca47d8b98d588"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bn-BD/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bn-BD/firefox-63.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "54c6be22eeeadc70c390a0cc0da72097468349bdd710698f7e1111c3f1157162f37cdcfa42532a80f2631d26ecd023bab8c247b2e1e4a73632e0f203aebb60ed"; + sha512 = "8398e8048bf7f15a234e6bc311561aae170d97715f73f9d8fd1dd5441562158970eae4628cd16a67992edd14f7a38bb5c7c32e6e9b554b0d234d2b012c80f76a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bn-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bn-IN/firefox-63.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "bae82b157d08ccb6f7e070d0a187c65dcf2e0d04ca2017658b523298aeb27e87ec1429bb5f8351baf5936599d70a20dc9da673bb7d46217babf2f5d0cc9f16bc"; + sha512 = "56cb6e80aaa4e9d98c8baad5bd8082e580d9d43e86e461939c41eda37fb19b95b55c693ef2b3e2d1cca486b307b0a9cf50367f66844bf8ab04c36e69b8d97ecd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/br/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/br/firefox-63.0b13.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b3324be13c515feb2a91399fc490a736947856ebdacb0ce672b854841296e4a8912e0f26ec3d4b8dcec57a59eb178f01284098a3ab575c5f22984eceb1107b63"; + sha512 = "408693dd3d83be1c61bdb0618eb690477c6249e1ab3b7a2ab5dea03e29fa3574894d3ea1bfa3c5d9f3c853b5385f456aadf0a95a2972f39cf559a5a599cdf2c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bs/firefox-63.0b13.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "90df8d7791f187e27d698552be49d29467113628a743034eb972ed79c6e054b64aa76a199bfb71f2396284250da8a599e57c85595a0dfd8e184a983cc2e00853"; + sha512 = "afb9bc011ba0a95b2a87372de281024a1327d28b586e1465c7533b615357668ab5f89d1b6497e63b682dbc891da78f70fda4a70935380747ad8013a8492467c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ca/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ca/firefox-63.0b13.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "ae4326cf2eebfe722f12ffa6d75f1406115401edfe5503b49b116bacda0da94476d7a2e6efca9a3986f530d8ffa386c889ae3a2f559afc5fe7cc76681cfa8928"; + sha512 = "3faa14062e22dcbde97a66541e5d070d1a02b3471cabd3105a5ca546df6e34e7bfeba5af1c106b3f0db11d33343ff7df2d3fb39e8b55ea3cba22a172e93eec6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cak/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cak/firefox-63.0b13.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "a9218854b8795e0558ad35f210d29b57ddd285822ac7177f9393fedb9572b99567c580fea7c107caf3453323576e048ce1527343432303e3c4c0881d03732c45"; + sha512 = "d1ea0e03595edf8c8a55b8bf60596aa866f6d228a28ca68f28b33bbee09016800b7ddde07ede3b1131f5502f57fceb4c088d977f2da0669b9b8771668aa77fb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cs/firefox-63.0b13.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "543a3cb1688f7f917e06a23d10e5f5c21355fa1ffc01bb26db41b8867bbf42c185f86ac9d6ba5411ee5278bfcb7b32d2659d7a808da680e0dc264e492da2b983"; + sha512 = "f3e8a43371919735279f934d207ccb78d568dbc17fe678a36c50d04371f55dae97c3a7ebb1f6afe16f884cab65d02bdad4e7cd59d1b34d59295bd90965159673"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cy/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cy/firefox-63.0b13.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e06850664dabc4c90f9a9ecb6a11bcc5b8b7410a3402cc13c1ca75a92d5d69213f01cd5a94adcb45214d9fe334d537c7cf85fd2df0222977d1bd1a2c7f312a41"; + sha512 = "9e053f5b2dd82cdc81577fc17b115c0e1630612b70e16d2286f4fcf7eb56298d88a927f42b387f298997f33bcc56e2b85b08761220193b486bab0a8d76a85de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/da/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/da/firefox-63.0b13.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "185617b4af7374b7cead277667dea7d9ea13c6edf0e5fecad156e1fcc940c26c8022dc9c4443b06859a65cd979c82529032a6ffbaaaaf710f2b56c3efc3658f3"; + sha512 = "8bda7cd63969acb27aba21113d8d44f833a7b8bbf5fea9af43b905edbd4e4db6a33830d4954af2635e684f04f9bdc35d4f4eb08f2433443c65704d8d482b7a38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/de/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/de/firefox-63.0b13.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "17ee2eac1b1f978c8b2a30cedb19361a37c6eb77974a037d13983b774639fa82807ecbb9226d3916a9177a21d3e3d322db0ed2cb06ca3c48d32e9d264c6b933b"; + sha512 = "640bc5d6195c7cc8291d890b707ac68dc2bdd7d5c1af1476482a3ebe8af738ffec60d8d01eedb11120393e3dc636d7c84403a28df579d1af4235e0d2831f3411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/dsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/dsb/firefox-63.0b13.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "af6ef7176e9b93e04302675b5b13cf8087821e1e708721141dede14db494e997783f279a8b5cceee8283581efd5d04ff18a5602703ad87f1ac86a1338be77638"; + sha512 = "55734d9efd54b0b67a7d8e3fb5b51cbe426e32b801037042d83e72ab7c2f039a42f9be4f15facf29b30e2b7e94ec568ba05e21f90714c5d42f9f96c6594185f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/el/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/el/firefox-63.0b13.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "1d225254cef8025eee2811d3ee8dae017c1a91e56e1bf749b2f88d0cfb784a384f773b64d394e56097182de5e74c9807fd44efa35fb1d27dc68b3afe511d5745"; + sha512 = "c8f088dd546dd551c0400269a3cff29a79e9f125fb6a7f8faa558efa6331b5f34a389282e2a69a35f16dbea37826a411b9091eb0dbb5a2b2885bc84f493ec5d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-CA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-CA/firefox-63.0b13.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "6dfb80b4f9b2b70651959bf5675b615eb096de271fd63bf1542e5d6b04a6c6bb850c520bd20240d757a5a9d84a524269495e933875fd5cd389da30cecab44620"; + sha512 = "2d093cacb7be796934b1f83f96bfe0c8c453fff180e5e10cb467123d6dc12620751e0074679220e874163fea1ae49447ea0ab4a4abaae710a891860b9731c42d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-GB/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-GB/firefox-63.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "ea6a81fd71445400b500bcd3a41d3af15b6125d0607b54742120119430c3993f65e534ec9183e9290b674df271706b0b9c20b9c3fd482e79e99dda67f222e03b"; + sha512 = "a791aec86b3ed14efb08d70159950bc5019f34b052dc773ea829ba37352fbf692c6e37df4b47fe256af5b6977390f0b47d82473778f489af3f43031eb83a3636"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-US/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-US/firefox-63.0b13.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "c438b8c0a0c14575eeab5e41ffa5760378567ffae890a2cb5b8bb61b17013f815341425c489158c3bc6fa62e23a7316b79aed20fa971f476a873c163ca79bde8"; + sha512 = "b815f79b53694e370d4a7cae85a2222b9ba245f9d84db424bf8c25b5b4b3bb95e3895cb3d5ba10a1d33b9e0459ac57c158d75fa757c8b923df5d3ae253289e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-ZA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-ZA/firefox-63.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "44a5b04d64cb7f6528838165197d8be83ea45c0b84a0b4e444caf7f3b33d4ac8ca0e95fc8f1abf9e54b1b4102dda7d57709549649f9b7af35b4fdf112a266e85"; + sha512 = "7769ddef410d868ef5eb8c9c2b205bc1083a3224eb260734363653867bb1efbc2b524444401dc6ed2e65e2dcd8849e6ae05b3ff8143a2eb06b266bad7e43552f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/eo/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/eo/firefox-63.0b13.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d5586193387bcb9edefdcc2d66e0e718b10f0790c29a7b45b0a7ef2382537a18d151eefb2a5e28af05078fcb798e6a6ca2b6dc2348dabfbe9b77b79fdcf6d9f6"; + sha512 = "78845601a316d7d0902031a0909ccaa53e1c36afe1607150b28ab6e0067dbf4c84c6b08aec6b334ecf04d714514b02a9b62852dcba22b54652d0fbde99223210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-AR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-AR/firefox-63.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b2dbeaef33d58cb69ab4ae3474af984211eb180f31b9207a0a8de9801899b25aca63fa0164d8f631650a8a117b29078b780e90891e22fade85d1910d352dddd5"; + sha512 = "54e0a9200b55e10a5a480d0df47884b2c5c6f3f8f11c61bb645a1196d00dd6c121ee9710e6b2ccc5050c659c90cf36c9489a9045800cd566d64628f7e2affb97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-CL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-CL/firefox-63.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e28890ea9fdf6ff771198f5dcdbdd0dd0bb2bc85fc3c1d2e0085536c9651fe0c853be528edeef1b37f96c9623ea0f71defb51839239f04b4c79f9fc9f462def9"; + sha512 = "b9f22d8318097134f70a22cdb21ce47300ee17cfc319dbb7872bc4ca5e3e7537fe255fb2db67ba347fc2ebf3ab2cbc8a6ff5b797385a0603f5a651a8cb820154"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-ES/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-ES/firefox-63.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "fcb9cd80dc5d55394b47239431614093f40963a208fe0269631906b19628514a93e0777e6e05b703adf3c474e92613d6239ad889d1602dbb36dcaa196af74af6"; + sha512 = "14cd21583ed2c74da7d75eca039bcec68689e369c4851062c5fa205488b577e29222fd6a025e5264d0423061d1c11d617339359a2cbcec927c453181df6b0c59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-MX/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-MX/firefox-63.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "2cf4f172fbac8ab6c91f33e177c7919560556733f5cb18f6ddea8f8bada941d44161b6d0485e04538d334854f629e54f159e66b061d65aa9d7ad27f30c58907a"; + sha512 = "770cf8416d344ca603acde18841fb21ab1c8946e7a5a150876c47783de79bb43b85e8b366e55a4ce105b3ddf43f46272ee165deed6bb497471b74d849b858e55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/et/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/et/firefox-63.0b13.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e70b40ac7a951da75f03e04640d8497c8628aa1b3633df180c6239025538c9dc66008aa717022bd2ddabeb01b924b05e1c076775ea5188bd70f60c921477e169"; + sha512 = "7402a094d60729cb28b71cb6d3774201fb6331fdc77321cf4705fbfa330a418c92bca2b5a7a3a2901b843d8bdb55045e339b0d87753148ecab699588bb1923c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/eu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/eu/firefox-63.0b13.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "b4301494e41c0078fd34779a7da0d49efc7cdca25f83a9afc609b1deb1ab217cc5ede37e9c13d447e10cf2dd34b0b1b55a696b36beee96d40fc53f32e5d6f0a2"; + sha512 = "485ab61f0e85bd8a391560f4f2cac43ab35b81c7fdf957c36ac21f7b25f9538f1d118041f44742b978fd0619a977d8ec69553890d8bdef73c88944228f63022d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fa/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fa/firefox-63.0b13.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9412d03c831ceed000d277de746efbe85347617fd15fda1e0649f546c3cf9a8f845230342af4fa629bc0cfbb6dea1fd8994d3dc392b0ea893e4aa9da0f076222"; + sha512 = "3f82d765e55611f1204068f2a62cb8a51f8db0940dee4d184fd2de69dc2336a1b6ad6132ad6e0188fb82028daafd244a2c478799e648c74d8efc8c46b6309e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ff/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ff/firefox-63.0b13.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "867ffaf66c28e111da286b3bd00605f8b5a373e73dfc660e0d5c3762cd08486491f25662867b964f24f5485bc41ce6783c391d7619781ce03d1576f9edea2001"; + sha512 = "33a5c4fa3436bd719fa2e02fdb23f9aaa33303f57db7ab27e86fe86d44065ea5218ccbfa13b410b9de0525c0c882e67ed6c6bc7b6546501edaed635460e26f12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fi/firefox-63.0b13.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "b9005b63b6216f24a8d6be5acf2b086b682557dafbeaca593fa4aa9d9bcb13150443e97309a9bd585abb9245af37d041982088c0541b95391654eceb8c0e54e8"; + sha512 = "43d44d212bbb8d1f964abaa553b26fe5ac1c14c5cc2bd535697a03a28671984559925eeb66e0301db4b5f4cca615e77edfba5d443655205a5648de8dde6552ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fr/firefox-63.0b13.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a8bdb7f2a27eff5973ff6c15fb68842c0470337c5fb765d7a0874501f9bfbcbf1864a3a258c9cb56df5e29ad8c69d77bc8b8c5572b51a02ac077e572893c9788"; + sha512 = "8d68e0667444cb5451382adf002dbd52f2cc755f0da0e91d5476c1cb88e62b0c1d14d8f796bd45940cbce01c2a180cde1ca087558a3e0985137f9f2db8ff4ef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fy-NL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fy-NL/firefox-63.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "e5d9bb130212db0c1e729c03a7a16ba584a00ceb26cbfbc254b8bd2851b9d57b8d81b746359452d66a0dd6617e62734a68e88db6cc74fa8ed5baae063bfd6acc"; + sha512 = "332a3219011cf0662ef0c560f86a7480fb270bf0ab9c6643ecd53f28b95cd7a8118a08638fd9b9197b2f6353bf3acf05656501ae67106cbde008edee87a8ba3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ga-IE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ga-IE/firefox-63.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "b582d7bf274c6a43cca7a441a36704a22e5dab8903c323525ce6b29949104a057d692b9d1e3190bcf254c4cf76006e8e312d3e835e160413e7b659f0328a34f0"; + sha512 = "55eca096ca6a8bdf779d6ded920bbddee406a0f925b293b9c5c346e5542b1349811248014d908edfbf757c6510ca2ad561e97fa5b4557804f15a62da45afa97c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gd/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gd/firefox-63.0b13.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "028454bc9220da6ae7c45a08c897401fca9bb44b6fd5b358373c7c6d19673301ec1643578b386bc3d1b6faaa51e9df40ef31f27a829ddbde302b34a7473c0a0e"; + sha512 = "f70cc87ecccb1357a33fc0e8e5a94a5fce1c4150d9f80946faaee7e6280bfb821a403b522dc6c1579f36fe91697e02dbaf79c1c83b3e1858007fcf7570e8c6bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gl/firefox-63.0b13.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f9957dd96b0b67d6f842c0908caacc747203cd143814c50c04d51387d869fdd6e958b1f0d262fdcf331f02b6672db738f4b55075de9d9036d3890f99e63f872e"; + sha512 = "bc5fa19ee0f1b907bec355f2fd0dff4f5ff8797c8ee77ba4c9085119ba25b270c664b488c66600c85ae30c12acfdd9e8cf1d84d785743a62b85030f3739cff36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gn/firefox-63.0b13.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c2346118765b436ea32eb56b3c8cdf3d4eb89729f5bebf708e7c7cd4778e5068d39d8295e045b1503c65c2a3388c98ab45532597e802ba0740e3081779204511"; + sha512 = "6009359591c9d0656eaa2c371c73d9a7141ef99d1533db04003ae3d7fcc31e33694cb0e2d29fbedaa63689a3556c40b281a6723fd7a28764ff77fd2ff624d9a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gu-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gu-IN/firefox-63.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8cf5a1b00f038c0d06048ff88f1e49ef6db82d86b58341bd7b4758430ed2a990c49deb274ad9faba87f2531acd6bf4506886a518d02648cb0d8b33299ab8fb2d"; + sha512 = "2f3d315c8424fdb5823343885a115faaf57732977fe535526220125d38b0daa3faaec89c196cf5e153190575dd0162988a26a7d483e96f367c1dc7d1753ca676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/he/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/he/firefox-63.0b13.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a7423bb84d6e299ae39d6fbfe0c7fc0650e46e6509c1bfa9fee7cadc50ebbd161a8fdc44289a910b4199d2fe97028b7f62a821b321ae1884e9359a7b3283ed2d"; + sha512 = "34577bb7b26c0c8fd8d12a278e55d89bc291e5c3aec101325a664125dffb4a33fbaa7decb9f75751ea3e83d06cff755db7012776ef1948789b2005edc4838505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hi-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hi-IN/firefox-63.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ae7404c79f130fd75943e9f1687b15baa7d29ae6dec176a5faba0d55c5d2795367b1fc8d665ef2c8f3767d70a34e4ca0efeef449f39f44ee0250100d6f3deb7c"; + sha512 = "a4319f07f092d10afbefdb316d3ccb550dbfe81f886458797a23a8ef9633e04269d2c8839f6e440e91cba48554eb604d491fff685bc3773114c5c413ca760149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hr/firefox-63.0b13.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c3f77366765494c689707ba0159c496c2bcd55b8a76e9abb49e3f849a99d34d7ff2a57f37b6468df91f91abfda87d142dd72a5ccdb4e5f4aeac6f6360b30767d"; + sha512 = "69503b9c45edbe65c8e21477583bfcde353b588bfb0ba2686fa4e73f279f050a62a0ef5c93cea60e05e777175993302740b3e1907013c648bebfc318c05b72d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hsb/firefox-63.0b13.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "591da976361db115ccca4d859ac1e105e8fad61f4e0b945643e1fccb77989604517421900889c2007248c672261c5e7bdd37c195610f9b47db7013fe5518c6bc"; + sha512 = "8a45b429b0f338f13b59fde3b98455a9c57312030bde04d1ed1478c0fa393d0523b6aae94a8127de429d47c52ad997aee1e49bfb3fda051386365c2f772a0d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hu/firefox-63.0b13.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "9310a55c992c545cb296319329e275363e944dbdf9109fe75fddf6d4b87e33d5bfa5ce582235933218777ccc76ad51743e50bb2045563d8d00f20fb8d3359159"; + sha512 = "7001c9ee64a1052d117e5bb649dfcf287982f55e5262baccfb7c9492c7535e975d831a92321fdc65775dc31b5abcc1bd2bf7240d7eea701bd2548f95ef646660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hy-AM/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hy-AM/firefox-63.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b89921e45b08b9c8d93498b76a265cecdc5d15a6ff12948f7ae0f4de414403e096ab238e115923cc51541a4d220f4efd7a2840199adb852527ed0f53b97076b3"; + sha512 = "1fdf9cd98aec5cde88511fc3a79ff43c85185ac2c6008da6b432aa870eb3a9643814cea6bf402a17dacc7f2ad2c84a95e19a2f85180eb87e8a365e64a0e6a532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ia/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ia/firefox-63.0b13.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5c857e348ca910dcc200ebfb3d3d3afc9ee30f00cca22f8201587c8f9464317690e330c89c244877a9a5ad12d090a47ef0ca8de725e4ef9676f55c9a9a612108"; + sha512 = "6ffb602151ac4c9d9caa8b529caceca673521379fae298a9d1daf9049e0d4005a52adf079036b340d9a4099444404e9fed522011a953bedd2000fc7d42c0e03f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/id/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/id/firefox-63.0b13.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "ea5cb9b840cc20d7f1298097b2aaa35966021186c5b59d39b47e58c7a6701a4c7029e1e891273ec73f937b237068073e91cc416dea58864c907cdb0979c7b9d8"; + sha512 = "bc95099398a49a8417a8cbd7745fd3d07788d6f1f4ccbfb70cad2e705ce45386e7ead17a1864755497576c3055a0ce05007c5a33e82db2e1b8e41995e68b9c87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/is/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/is/firefox-63.0b13.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ceccb4d0d3388866488adf59a12de217cbae5d26d679db63b132cd4ecebb8dd1fee754f9fe4e3419718a33cd8582bce983b5166639fe375a1a3c7493749b2b73"; + sha512 = "09d898308d707dfa60ffb05ff816ad10f9d5acec5956f634b344f345c19ef47621512da73b27ec59db822f6c66ebf478ea83e43d6c1c40f5dca32f824542607b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/it/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/it/firefox-63.0b13.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e1834195e237972c48d5b7f237281cc6e1622091efb8aeda4be6f4ecabe04b8f51d3cc86be4a1aebb50cfeeae039deeaa758a23bf4c36ea57d927c5a57c01fb6"; + sha512 = "7373941b6f58e72a99bceaa18ac36922ac07f6af3b7b0bb669c223644f52b0253912c4ba199094d7d1faacb410f445f0e13a9793b0ad4810acc387692e9d5262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ja/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ja/firefox-63.0b13.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "65f07c789cb22d0993065e592be705ba80b03a9453770f0681bc355ac6aa32d7aee6afd2a4d106e39cc763dda9b9578213647dfeeb2db0108f354d64c5c9121f"; + sha512 = "07680a13fba7016b030aa70430094250fd75332675402a051501c1c7588869dcf0adb52c1c74366ad12291bee5f43c0748637afa465cec5ba9a9675779e4b0f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ka/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ka/firefox-63.0b13.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "7da0dcb993d25e4642d86fd1ed40d88328cd380dc1d9e037c7d771785c128e085516ff302e168d6ba08ef27de47c0cff14c5a2f6cfb0d7430d9b2d37caffb5c2"; + sha512 = "0a2a7903ce148d8643a51f0dcc30121245a05fe36928a318a12fdea3708cae991978782565384ff4131f0551c1deefd83b3c636eb461b69eba468e4781f2f03c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kab/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kab/firefox-63.0b13.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "2c79187951b8225dc88130e1e37baa40d3b9aa8a954b8b4d51bd23c713e96f80e9205f902346ecee1229623be64c59b34ade01a1aaaff10f7786cb80f3af4a7d"; + sha512 = "3d6151e50dc676d694bbd88cf3947ac6bacae371ff534fc8d5cd20a0a670056f7b3bbbb490bb44904668058660c6d3937b713a5818d5d69bcdf68706780ac9da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kk/firefox-63.0b13.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "28ce4f55d95f8db27fd246ba812fb9d1ab2eefb955e544601429caeb5e1767820abf8f5cdba693033b91813371ff1cc0bb106ed88de869866960aaf92aa57d31"; + sha512 = "7984af247c9e825dd25c37d50443f310ad5b2575a98bf06abbb734511b1b9705196260f82e40f8fdb7c9298cbdfc314f4a4d3516f6bfc99c5f0ada945160ae11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/km/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/km/firefox-63.0b13.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "e61a3a5cbb9c5c094d2441511db8b6883e2a5a15180d60f03d05bc597eb260955341a0247c4191acade5fe26806e11e660e5d9360d9da4f2e6a88ca8b205fca8"; + sha512 = "e0e565783f069f2484c70e74f1fc6c0a4625d8d6b2fc80bf87f757a04ef9f3b86581354b84b64bafb356f01f5daf602bda845f376153b753f2144230cd17ddc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kn/firefox-63.0b13.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "e6fa91115190efe19e210ff1f77c03dc3b5529903664ed6ab8e205843df49523b9b4b8d24ecce8c46670d2a9512872e1f406c28ff7127c574cf7402d869888b6"; + sha512 = "28e9d308d29a8400506a497a2b2bbb3a8462646c7c0039015d74e2405971bd17c53357e994ec24bf61593e64443c90308034637e25b52b61c05c1870b8cd35ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ko/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ko/firefox-63.0b13.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "373738364d15ecd81112a64e8f32822ad00994a1e4014c33631f05c4ad3656e7398d8ecf2ee9988bb3a885282190599c2b19941457ac405438f6f5304a92e6c0"; + sha512 = "de5cb0e68eedc4dc3893ddd92ae1380ed13a3c629af353a84210bf606fec6afc6a14c34408e84a9671a489a73bc1e041055dedff66d903a832878b918ac22814"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lij/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lij/firefox-63.0b13.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "11530c0504400332469a654363825e08b5c338c6b8e27be5721a23ab49ed69d8a69e97286ba5e930ecd9a67cf17e453dc130ae8f8c100450f6fdc8507972d8f4"; + sha512 = "bdf96509b64cd3d6fcc6fe573409ba95252d9ce8b903279ec866a796b2f84da09d1a8361fbded06f5ba7a632b4e5b9dab5d278fd5307f09274a2a6f1921db524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lt/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lt/firefox-63.0b13.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "63970fb0d3005a4da865789623d302f45e4dfe5e140e6a7158ccabdcafd53a48eaca43a5d016c7bff3b522888c8def078eaf95bd8b7cd8710df492d89a7c8ca5"; + sha512 = "7533b8894aebce270fe279d38ada97f2daf1e21f412386e59f4fbc8da1b833d8c0999102870ad3ef77274240ba4428ff44a3e19ce66e7d8502cd09fd9b09c38f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lv/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lv/firefox-63.0b13.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3b5d286ea467cbf1e3435ab13a1a7ca90694af534a11b34e2efa1b3eb1dd4d9bb18402959c247628b97b698f0a62447b23027995125387e1be84dc39e42584a6"; + sha512 = "207e76a7168535e019e302996fe90e187652e78d114119a01b85247bdc2c35c8f99a1ec7ce4aea50206ef3515f24b21823271d5ac708ce48d66dd98ef65995e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mai/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mai/firefox-63.0b13.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "da8d85e7160207670043fc03f2a7bb1053fe6480e0a0e5f5ba583dbaf922ebd5a77b5faa6c3ade512c4ba53378df083b8c9a59485e5330a63fb9c876f6b7f4a7"; + sha512 = "eb53a363dc68e5ff0913a264eac23fd55966d779a421fd73adb8ca48343b31a72fe4281a25875c4bf75df1e600cdf8cb15ac2444933cfbb4239ea097fd337c8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mk/firefox-63.0b13.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "fc375837230aa468dcf1e5a89a162f46c386f95d07e007698470e5bfb48900750709dc57a723bd54aa89dcb466fed768cdc4ac5edb2acc51b3cf56fec2c22e79"; + sha512 = "cae33d4b6712fd95891da966e3382c6bd3d9cb643a1a8e38a56de719f066f01b0219a158faeddf8a001021b489cef85369243ff51279261bd456f70c6da759a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ml/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ml/firefox-63.0b13.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "f4d8615fb76480b4af8ba497632c45b06c0e464109ece1bc425dadf376581b01d7a34540178334081b485ec280de46d83616b0570f50eeced483cc4eb6bf344e"; + sha512 = "d6752487843849640e2104c285ec6c0981cde2905b25c2cf93a9b4602322fd3f232043832e933cdfaad8552a137398b2bb70fed7846a57c67703372bb6e710c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mr/firefox-63.0b13.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "30b7e1c97aab33077d1c322f3e25391fb3a47378e8365d7437e0cdb814a45ccbd5e7f03129aedfb83f51ec06785427dcf180f41ac247f562cda7f32d9d6ec060"; + sha512 = "120f02bf41cee52f8a0d0244622c02df18e3870a389428aa2fd2d3f3b3ca4763c3a1e2c93b68f2eb2efc57abc308838128410abcdd6edcba7089458771eb4386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ms/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ms/firefox-63.0b13.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8aa1546bddd95c28cd155e614532090d01a6343c46f67eb55ad9b82c48f6f0b83aa27852b67756e58869496b4c3ba3b27cf130a69c24ace248c092cb877b87c0"; + sha512 = "813c1912d70069c36de7c54a6797a635c7838d2befa50e9cce21b718ab4f00443ba53f714b8a6447aeb1b1b72e02f4c66f31436f17be7b1f6e9eb4bcdbbcdd13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/my/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/my/firefox-63.0b13.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1e38cf10b3ae242610d81a964e0816cbd947e7cc0ca5445aa3cc4af14e27b4e4ee2f7325d9011e01f3b45a3ef1ef8c8880c80bbefd9c88f1e4fddefdf871c74f"; + sha512 = "bb112178b58424654e0f384733d52a2f99a3769f4314b62a911db7bc67d4c08b0a75c9281fe853d774535cd74a14816e78bffd4df00ea50534b95c113d79e212"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nb-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nb-NO/firefox-63.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d5ecc468ee26cd61f65984ebb02e21898a4eabbe3f81f3dd98b127e4b98b14237b6c72b94bd96e890e44a3a92f70d9a4c3734d80bf52b58e2160f3d3febc831f"; + sha512 = "e9116f7ed4a375c35ffe574194b846c336c1603946115eff03fc0a79556a7ff4ccee5bd2853f925aa08e4f7c40b596644bce09b3930a0c541a00c134f2f68da5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ne-NP/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ne-NP/firefox-63.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "f0ed61857efb6527ae2d1be0e141e61c3b43d7e1a4b6415b2d7717924332603910d2df02f9124c77f67736b776eb99f035498f104fe863b7dc071a7f5431caa0"; + sha512 = "688515bfebcc238c16861eb2044dd6f715e08f61eadc28eed5bc639138e32b94db74e4e9f06833bbc81cd681473dd3e8c3c3a3c5cea58a476eccef7eb40ecb81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nl/firefox-63.0b13.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "0b4aad92078da9071a17c0abdcdcaaf800b2028c4154d35974daebe6253427cc22cbf322f974acc84b4f6ac6b669088813fd3bb6f6cde35155f281db0656f7b4"; + sha512 = "23fde17dd874441f13c73439f9ddccbc08485d21325fd92ff4201ef61b969e5db30b1228bbfd0f6f32ac8a596c19e44e8edb8fbd28e910b41b2b272afee8e19e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nn-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nn-NO/firefox-63.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "cbb3cb267763dbce0ab77aee54b2211eff26f7307ff6a7dfdebd8f6f1321ea3ffd396bdffec17ebbbf7a274a4d37503dc9f0b70cae0854c740df158de5360e36"; + sha512 = "f90ba4addda86e2b8fead3e1d2ea3105204e5173b85ac0ede40a2d69b5b9a3a2c29f0b75015eb93210909c61df8f73ca8bf9c428767019355ed98f402be5d7ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/oc/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/oc/firefox-63.0b13.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "26656804968ec7287441bc28a0e5d6a43d8c47c922e33784e2186fe3552c68c054602483b99cf97f093fa7457bfe07f94d0f6838253354283d3a705b29cf5313"; + sha512 = "af7672a5cdea2e0d834e510711db4d1a2de541c44e97ee501af113d5dc102b2c5bffac86bdd363d2b541107ff1d121a182b14e90e9a68a8792977a3e73361023"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/or/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/or/firefox-63.0b13.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "fa55e0b1c927d698bc0c640dedf0b134996b56e12a73ea493f30c3321ad4df3587dba0829f1cd116f95d6e9bc5a35732dd32a4b4a1b9de611a70e93977780f47"; + sha512 = "49cedc91af113cfad9a15d6933bef8c1bc9c6d0174cb1d6f57aded210296db6a248561c4ecedcc44dbd605922761e220404c335b0e7206402a4ff6d039b5b9c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pa-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pa-IN/firefox-63.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "2a394a2d29ff2c63f8db24c09b85c4d7a488a4e0a4b17121ca54b95a0c7a3f40a12c59105c959eb4baded027de8301ea7161475d3f4130d353e7bd95e2d36cef"; + sha512 = "48fffe7aac458bf9879c6471733d7d0d4fd43b3609aa3ba04647721e7dc60be609009136d42e58d760a4ff298ee83c2e624529cd1b08daacfe60d7bfec7f1f43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pl/firefox-63.0b13.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "1f4fadb6767b7c58cf242c9714925aabfabd9a080a3b29d39f1002b9f01e73b6f19f39427d57c7604eb3f3518922ca4f2127322565080817e674bce64aa6f3d6"; + sha512 = "a7c613e88606be20d514be2e2dbd2a09f94fc500541ded40ba73b5e4c66dcd01ea5f7a96a55059f0714d321f712655c67ca86a0a328783a2a9aa9ca9d2802b57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pt-BR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pt-BR/firefox-63.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e15090e6a2b79ba0829b3727e6ef7349443b51263e596a39fef83951142b6ed0ab2a10bdad9afc1b78941f1c38c996b4556548bbb92553b48335e183c210f92d"; + sha512 = "6ab1c44c2a04f14a89385a2708916dfaa4f8d095a56c1bb1dc06c4e59a23f5faa356b1e86d26a905523855aa11d332a9f290291953e6fb9517cc73318935e0ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pt-PT/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pt-PT/firefox-63.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "eee661bca9d04cd7c479e1f371b0d426061ed691c85067ac3c36e9fa7c11aa03e1bb137459fc3f638aecc17e94254d4f4290caeffcdde9225075bdbc3b68f5eb"; + sha512 = "965e5973a197f1122adf63b39e9dbdf1e2cf88653c7eb3eeb77ec498a1bff5abe54ecb3b76d2e39e267fb78ad13417e376e0ef5aba2ebee7ab21f0f4735a006e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/rm/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/rm/firefox-63.0b13.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8152b4f2811eb156c45850851a801e4d9c3f235357a0a42b25f4257ddbf1e4494df612f5a94c99e7c3f3927f94f697f34dc233d4c88c042c17648b538ea63968"; + sha512 = "e2eadf2a965e62b9fad998d3897eec6f888c95fd52e149ee85a2557ec5c7fb85f77dbe77817e919f868cd4f50d374a4557815cbdc6dd7219ba9260ee25c804bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ro/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ro/firefox-63.0b13.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0930ebfd13a5ac96322458fbe4ff98f0ad2faa69de467275e345f55ccf836d4393d5a78f3d47f363b73602374a331496461f68c1a76eeeb7586ae6dc1171ef7e"; + sha512 = "d5f848de1c19d1bfd9a10e14c356002524e07692be8383ea7d31f3f30b623b2503b986ea33f7c1cfcb03886652b551d58b1fbc50e37f02975548e03f490def07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ru/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ru/firefox-63.0b13.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "618814427d173a0219a223bf3052bba7c8c7d22e244d66ed1fbddb061bcdb786d78176842e34ee0cfa7c739f958043a52a6f55904512e766a9315fbcbdaef351"; + sha512 = "d85f76ef591e0349083681bbd24d2f7fb4dc2a7483a21665c1f9b71396a29573e7aeafc431422bba271c63eaa4dc11b9cc87036338cb62084cc5e13b4b187c2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/si/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/si/firefox-63.0b13.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "e5407e2469f78e73a78eeed46d0e5cb310313c5bfadd0dcdc12670bb63f8e399b7bcbaada3ecd17e77596be4fb15f28d1706a193743cb7d519f8cc0350b8ed30"; + sha512 = "e44299e24ab160ae39acbc1b3b6ccac1e8eeb30d99a2a60fa39ab7bb1dd1c7296383040542cd81da8fe8fc5a778eadc10d90ade11346bc8886b714762f8d2ae0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sk/firefox-63.0b13.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "7eb1c68eea484df32aae65dc87961f58c59c97b31a12c5e9de7d7805cfd4ed9fddbd1da7fb8e7b9857a835979b2a6635111e211f72bc1bfc78aa0534b40e03fc"; + sha512 = "20c1a9437398ab3f0509850e23fbc8dec319fabdb139d0e953f3e0782df3f355fbc48701a08f13ead7689b094fa1f7df2308e8e47b2095d55ab5dcfa93f701fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sl/firefox-63.0b13.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3574599de52fe2c887cf81992f9cd7302524082a00b26324d3ca701f2eb2c59eae870c70abe7dd424bf9c0a2ee869a34107265c0d8ea6bb7a7df149f12345af1"; + sha512 = "ca4433207bf6321b822e273977c3c432a322c66b9132cbd91fa0993eb142997f304aedf5c96e4e62b2fb7b2530942d9f48bd40a329d10266efe9af8c062de89d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/son/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/son/firefox-63.0b13.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "6487b05d6b6657b2565d506ce7bdba7cb7281fe6d0acd5a20052012e22488acadce65f238c0195e089c2da4b9bb13781e5b31b2bb85208da9622853c12a8f648"; + sha512 = "4534137bbc75738b4246d899ca5e16489a025b37315fa81e6bf0bc71edf4736749e90c953fa7dc7c829f1494f18d7c94ee84b6bfaf70ee3ccfd11b8d7636323b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sq/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sq/firefox-63.0b13.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "e69a3757a5c752f3e417787c4cb02c2330a467ff76c4930eb4c32faf64e63943162ec0681af1899b8e96782de6f50c5c31ab25e7ac1f777b52e4da223df5ee49"; + sha512 = "b2bf90fac89b89f3d61aebc26978120531d757c8500d2ade97e9c48f2168c64cb8da1be6d6c3c8ddffd23fbc463d54123e322b04febecfccb7bd4327620aac99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sr/firefox-63.0b13.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "38c57fb51a76c912d07a9a56f81f4428aa2fe47be395009af1e2b6221e0baaa4f3ed8d31693a737d615b5e97d8fcec33ef22a3151210877e625c20759b355034"; + sha512 = "4c28ba897cdfa60f548f52ee4cd98444010204a59efb7fcd8bdc5b6318a9f001500cdef11c7b7ea7637168adf6491ba269c30996ddcf526b5e1a2dde1388d6d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sv-SE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sv-SE/firefox-63.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "6b2319ce5e131e05419b946435c901f654d9d3b35374396220b89290600ac05a6df41cb344f0b3d6366cde1693b925870221f2d8f98d69e0f6bb41f0ab6e4dbc"; + sha512 = "04db58a9c1f80d4fd77a32f663ca95aea107b61c90fff8307b077c666af1369536e668c60c89ab8ae92b7b6a585a41c35f487c92e96484f0ce0c138525614e87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ta/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ta/firefox-63.0b13.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "39641d56d492786df53a39dc9a12c26aaea0035895b225a4b0c82484e32ef1a907a07d158e20962d3243cfa7bbd4205c7e3bf7b5ed5fbc5ac92e0e28d1cd6f35"; + sha512 = "5a2efde48546042d640de3cc76f6e7918ccc8b34df3c53935505b321d23611d86999b1c3ef00c08af003cf7991b7b00909ee5825251c9a13521e1477bd9242fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/te/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/te/firefox-63.0b13.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3beea5023cabd7c5c30e9d95eb162987cf44dbf34885d5b72e931adb0ffa8385be8a72190109558a6af7050cd479757dd5426553c22a321b4c21073956e5d1ca"; + sha512 = "cefe7a27d4a246549dd19f6c95d99cfc21ccd8b7b48b57425b51ff081cbfee4e35ee06350d7b90f40ed60029883ec7ad3d0a9ad64bfd851996bb301279a688b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/th/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/th/firefox-63.0b13.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "40eb8a38fd4a66d5a1b81563b05dfc5d8e22767ac7e7a69f47c02ee34d132868e9b2b2be3591c6183e5e9c659e8e27c99c7e002c8846b069233b91bb65c1552a"; + sha512 = "68a997083d7c8fde45746ac55c8994f54d87b5ffe48c3aa1fb83460ac5bb61bd13d5b9f1d33e2ec6e6c2b9c965ed7ea8f1642b3145edd8a4977206c38da42044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/tr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/tr/firefox-63.0b13.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "69214b1e322743ae364f86efe15a4589b283ef2bb19cca99dfaede9b9672f79ccfcab5b2929f910ffa203a74de9fb6ac2945bf79af55a701394ee499a0f7278c"; + sha512 = "02718cabffcf3585faad05e07697ba1b832d2af7fe9c99adefd4d68b2ff19773884467fe3f9c6fe6cc0e8ca47056f500f4b76b184f7fa8fd899e9e26c024f013"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/uk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/uk/firefox-63.0b13.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "3f8e68f2e665909bd531a24d6d66d1f8e23bbe3c6bb40def5c28e71a8cd8418ab604adb19750d1ac509e583264bae41804a228b854a0df479a2a32aaaf452145"; + sha512 = "202043343fe98673ad33d032267a5696d0554348c709cb2e356136a6becd5a0e2c1147d07fd752afb80384cf13a56296b859c4b771ab993d5a3feebe5415fecf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ur/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ur/firefox-63.0b13.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "3020c7e26afbe079c87c4a64631ccf57003135fa2e06516503bb40cd0e499e935a95a94bd729890090a4037bd2bd400a68d68e26bf8b6af91465dd5235310abe"; + sha512 = "834849bea96f7176bd4b897a1877b56447674bd32ed0bb5b15715fb5d37fa1bbcb8d10af459bf08d7def3f973489aa33e6fb359be81f69a5492c5aecc20c57da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/uz/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/uz/firefox-63.0b13.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6b7895cb2425071f77705fce09b7de49e01eae4c00af1d35fe31783bfb83d62e310988c73612689aec9f05b3825f1fef663ee7d42b52ecc84a04a3c1aaa45bbc"; + sha512 = "b360d917901e693c29f49bbb349d10bc4129bffbd8f105b2b9e9e6169dc13edd0d453368a831bf1be21b5d856766bccc4536f50727b5f7b7a6f6d2fa287bc803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/vi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/vi/firefox-63.0b13.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e34f384f75faac4bc45c9cbc0d92fadf238b8d9d0d877312b3bec2bd9e47ae0bbfd7097dc647e5b4fe68a28fe351a659600bc860f2caf6fb6a9cd9d22ad7273f"; + sha512 = "279807df6ac7d0a19d8010311973b5e623ec91909d952120f565656fcf78f3a549b3eeaac3fd27ed1e30554a7b57c4a129757f37bb8971fed7785867277d14c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/xh/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/xh/firefox-63.0b13.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "e11dec71ea6c8cc54cc785f264f280c4983fcb0e3f5a6c21e73f660d455a1f96e3266fa5d714072fd868b09ce381cdef0f6497948fb4dea44adb3a89da901db2"; + sha512 = "313dfce1b88243761718b313b0753e09def7cfef69c1f65088872543ce31c6957739dec51113b301c5c788d1b89aa173d750c3b214dba6413fc5522378ac333c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/zh-CN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/zh-CN/firefox-63.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2a1af884c86303c07162b3750394d3ab9faad5f5dd8d1867ae88385b70b66b757c53afdb51ae12f1c8ab7f57c347259f561d176dd9104068d5f3f1271fab2d4e"; + sha512 = "1351106b16c20d80eacea77e26ab6235b00d16f33a94577184f61ce926675bdc9bd662dbcc39cadaca18c9ade0ba786690b12aea752520c671157f5525f581fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/zh-TW/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/zh-TW/firefox-63.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b9568016dadd0fee3c01e37206b515762edd21a558b523723f6764f469af99054f5e17712327ecb883f1a84ed799bd263e11fd867073ea2f68a238b78e0b189f"; + sha512 = "da9808a83c45d5a233aa1649a7bcb7d88fc3fafe59d93d9a872de2902b8b0c7f80be073f905bc2dee587b53bb5d010e66f2926d2c35d50a9237884d3d03fb6b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ach/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ach/firefox-63.0b13.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "099ee11bce1f4cae44427463b45713821f2e0363119446c3ea04425504cb2b812f9f9c28102b38fd65bb4115d38ffdc0249079cfdc3f850c3a59755f6429eec6"; + sha512 = "98f43a0ec582e6753f12a079f07a4e55f8e699b9a8624a632e141b09afc8484901ab3cbea5609d7cf2107fd90da3d10308245a28ef3d93e07d35cbad68200bd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/af/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/af/firefox-63.0b13.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "77930408b3feb29e49582ebabed8859fdfd488feecc250aa6c8315975d6cbff09a551ab5e3c4330eb3d4ed8ef43a3c4776fdda2bd2baa876591f634a4ce0bfbf"; + sha512 = "b8ab0b90538b7b8ced483b2771c8340228d23d39f28413f82468626553aeb81169c629fb9f1a1b4e17ac312b8bcc984ecfe711e4a85af8afb02ec485ae589a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/an/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/an/firefox-63.0b13.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "0c3b334a51ed74cde2296745177df5ce57eedb43644af43ee16cd4fb0d070dc1bd117012bf5759975a708098791b6d0ff637a0501b064874c9d8decc2778111e"; + sha512 = "43b923b7b99c4aa1a3efda001c60b9570f15ccb648d70dba5f7ae57c282a1923d310ec48b3424a641d8508d05a18a1da76fd7203d947c9383695d91d2b7e2da2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ar/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ar/firefox-63.0b13.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "9591eb30ce5bd4779629faa60316651c90e6c97754c8580dbbafe7ac85d345488b4af613068ed5778390dbdf9e1e06cdd28f9b758bc5940dd87ee39b77bc31d9"; + sha512 = "562a1a314a598f442acbc92a0d752e48136dfb10303e0dd51bb3ab0a2c2774e5f5eb3f932d9a880fe37674be3288f5406ab4a0251aca2ef1bb3d23f5e0ab303f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/as/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/as/firefox-63.0b13.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "cc3eb28017b91a77cc72984669cf5f62e7ac4d9fc0b415597cb4216bbbc62028e3864ea897d3b3ae616da7c603fa3109456b1bb331e712fcdd10e48151fa87dc"; + sha512 = "acb3076508c51621d11ad6c0a8031e6aa9f26fb376fbdc0b1eaedbdeed5e84e61682e5f1d45511567e1159125bede12be12f0e0f7c716a1addca8affe12cdb00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ast/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ast/firefox-63.0b13.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "23c04d3674afffdea2f9abcbd0fcffd45f9e6e1c7288fc22cb457f80c664ba25f89b154fa1ef80a12594b93417da943eb12e803a74c3467ff523e27feb3eff6f"; + sha512 = "c262869d7a4aea66cfea24911cae4e43de2a17a371167f4d78f3353f598187a1e6102708346afde86166f360e9d42842016f65a272d9106ef54938e21048a83b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/az/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/az/firefox-63.0b13.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2c99eed922b254e6b1f64ae62f958a6156de1fef5a26185b1d70f5569f4452f52ed3b58dfeb3dd0ccd121fdcb365c68a613d25c2d0b55b4ad15b5a91145e1a46"; + sha512 = "a9da5d539e4ebe59b1d21b21bd018413e935cd7eadeb60c437f3a5e972851b1087a2269d31b414a17fc712c1f9cf180287b8a69d7b3d4faf34a61b555d1d109d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/be/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/be/firefox-63.0b13.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1d0299bdb7f4bdf8967888e1e749c0f84a96bc2f9b7ac6cf857e0f368ffd66df08dd65da20d6a8c93ce5831f9328870c5d50078e29a3698e521a5dabc19f49b3"; + sha512 = "661f58b200c1d18c4b837aec8b2ec334270a06d68ceb48b4d6cf6762ee8fc94c6c871cc9bb956ca67c2759da3450c08fd2870bf32f88798396ccf3c24ecd7fe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bg/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bg/firefox-63.0b13.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "4659e8ff47719639f6fa0c16c974e02ac73d4bb51635352647bf006238c916280217c9ee2691723ca40ef10451ec5940b2317730a322c00c609f01ff68634d06"; + sha512 = "f8517bcfebede31aaab3c20c10be22b2dd4e9ee56ab37fd8c0c362933f375189ad41df04a2452b83759555211a9699998143aae224f688473fd4da8d258e8566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bn-BD/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bn-BD/firefox-63.0b13.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "54b366a1b07867d6d24d051eb367183489a0bc87b5ad72607aa1c6f7393f0420d7cd38d1ce7c2ed5cbfd910fd1c9d0ab65fee4aaa1a18792e09798ef85d44098"; + sha512 = "98eba90fd685eb3e5a22f68027464735e6eae764ab5063fc3b49cb2a0888839eb7fed41978ef9edbf2729a66278368313a61363c7b0a9abddb68d7a93a22fff5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bn-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bn-IN/firefox-63.0b13.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "6224053e229ba628ca78e54bee868113709bf4e6e559681e74d8c6a656958842f1d9f0e157dff7fe003215f3880c237e060ff5b5c6b5ac9882237edd8bbb90a6"; + sha512 = "e916abc4c8e0f547f0f510a2919637029d9531dc275e8330164d0092864d5912697c89ea23100c1c411632a6f4238554e83162aaaa50f23d85534838e05d9b87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/br/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/br/firefox-63.0b13.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "0e96eb748c5cbf4d21ddb9ae6d98d4c87c54db7c6f59205b77365522137598a29f97dcce47f6d91ff479fbd5830b316e29a9a36f69045d5fb078e340309208bf"; + sha512 = "db5c9c663c0b12654602ceb5b73033cc97c0d45e3ec6b5d755b94ce3daf7743417777fdcadd8263b1272f7503ea6ace25358285fa22a8fcb7d4bf50038bb2727"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bs/firefox-63.0b13.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "5eef8480eb7166c78ae9552e783ada29b1a2ed0774414c1807089263ad3b6b4726ace0f68af4454f03fbd379cd9e69d7963ed4a9b23ea383d71f33f2e77af5d4"; + sha512 = "4216655dc3ffeb28fba06405b5854114e0ed5cdf014e3bdbc3873083a27b336e5348b326b85f09d690bc6345589889738f5ec92b0c1776cf93bda76310d3e117"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ca/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ca/firefox-63.0b13.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3480209479c215604c4f7b34d41b5d766d4c5a0c3d6e5d71f249a5c27d22c2049fdcbedf49b766f4aad950d1601af061e98c1be22c8d919ef3e78d125a8a6ada"; + sha512 = "164b57623737c0ad20f5f470b39293872aaca3018db55f181fce19a40c11650111ebce4b54b5fcbeea7292455f9d5ac7f5d3c1460c50c1b577b935a7c8738d9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cak/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cak/firefox-63.0b13.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "6a8e24323139654e8e484699df06cd6109f343a9a7e524f50a8f5366c2de2869b92bb56b742f9ad3191830f0dd62a4bf11b0b60c40214ea1b32dc56235ce04d8"; + sha512 = "e7e03b8a6f70978528d9d0671ae0dc73f78f6af998bb1ca6c84dad5186559087bda0aeb1c870c377eb009e7ad6f14490dd959cd28beb564731c43b9f699ebc6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cs/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cs/firefox-63.0b13.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3cd2d6c739348e939bf84ab793d3ea105e37f16aec9cb353c31f772219be2cb1ed4fdc3fc99b71754e0450545086694a94e86c53354c7dfbec7436c655c0aa04"; + sha512 = "b0c17ae3f61f6829b7d578968eb1166ce4043d33b81935e1c5ca51353a0bfe64ae2c326ba555008a30c59f34af72ab8ef8460e204caea203a6b174f2e3b92993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cy/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cy/firefox-63.0b13.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "db650f6c6201c8d6885a364e3477c8f0341c526aaa0e708039c545814bf95c66b516275ef464a1c1ab2f1bc4d5e7c58d03b4d6deae8cb6a4de477f64108f128b"; + sha512 = "88e93d54fadfa6149c8de03e82b898ab4c319cf66c0aa1f6a16b24f73815031a943d0c91d9b382e97c29ac0bcb83f09cc391e01b7bd3120e8f2c9328e85da4ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/da/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/da/firefox-63.0b13.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "ed189013ee62440e2f6a326e2ca1ff3a0764ff589e514a2eda489e519695144cd9378bc78d10fd18bfef65e39a27500fbe4f09c64ec9904693db153d83b884b9"; + sha512 = "1ff1029bf7486c6ec3516ed7e57d22d0dab95bcd8b21aa5e60d32c630ff88c15eaa484892e35a473d962b89f49b281bd25b6d16db3a6446fc9959fd64d75aab9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/de/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/de/firefox-63.0b13.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "f77538811ea28c701db8a4d38d9286aeb6782f4b56153c98d2133caff823aaffb23a3b3c014adb09d2a5c295a68a8e0e1a071f41d86ecec21c6f284c52a9338e"; + sha512 = "6523e7ed4aa0ef502f2a64653c7d06909b67c6a8f173295783c97e97b39f9c00b36b1f06038352bb2a247a156e4a1310ff0fed5b688a5f2b84efbad1d1406362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/dsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/dsb/firefox-63.0b13.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "366fff164bc3dbdbbc143ba37aa3a66befd5c2bd89bace5c9bb669fa5d812e7505140405c08919994cd65e937e91035b9c62bfbb2a5668f4273f295fc6dad485"; + sha512 = "34aae423aa61bbe02f31b07513cdd4734d94dca42cfd64dd3db7f3e55529316815a266d578af1771135a264e69b8869373df061370e4046a2046ca1e0f75b74a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/el/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/el/firefox-63.0b13.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8898b25d271037fe02772270f358ab2e44d286bf1d5be45b67d57907ead81be2990aec0104e724d8d105793e45454d571e7eb45ba67dc75dbd25ab0a467f698e"; + sha512 = "542ec3370d58e4ee767013c3511e7e04e76d84926f12986d9e9611dd337c1a649de3e8bb95365bb92f339a95058f8cbc9194d3f22f54f96504cda24860c1fcc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-CA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-CA/firefox-63.0b13.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "5ee77fd93d9b557fb729031f96880b9ba72990d47ddfdfb3e4eba38a6eabcbf63587b0892551b1d9c023472fc8681deb529c6d4f8b283d11b4832f9e2992cb4f"; + sha512 = "bc11f690284b11100608002f3e1402f758d9d1cb981390f14d16c841ef605451b7cd043928ffad60c3505423bd89f7d3dbb268abeb8f1835aeb1d2ce185286de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-GB/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-GB/firefox-63.0b13.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "74e415c2545b0fb760be6c459c7262e309c72b3e41a580e36250f381a74dd1d48a2b62db4ca93274dcb71b0951cbc42f897275a8664242d0424281f227699a37"; + sha512 = "9fbf9ca0c1da0a80b77c975a980acf7afb2ac7f99c3f69a1d8cce88c8651957e1e203ac97fff9a67965a36d85f09c7a80e970d043e0affa2f273615d8fb9aedb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-US/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-US/firefox-63.0b13.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c37ae4711dc74c4beb8bdac272e0e6353c4c88b170c84de86003c11d0d7a6d615f28d567d2e3a36b7dd9a06eaa68f21a5e2e64d12ecfa8c4e6f8cd2eb8eb9925"; + sha512 = "25d9a0510fea951dfaa432117adf90591bba6dfb021fb18bdcd8849e71f59e8ba3ce9067e8291dd0d7769f1d2c8e5ac803c1d76d52e98e8ea7233ad5daadc45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-ZA/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-ZA/firefox-63.0b13.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "bbfc1d6bd97fdf2302c399ac1c0e76f949b73cb3af99af04ec0e502f2b9b0e353cc3ada738dad6699cd658170098b6f87f87aa231e563d62527f75106e1d101f"; + sha512 = "c8a6ea2aab2bfec44dd0d13d3f8f8f3e17377f54889f9b13ad1e6529bfc8b27a4f08fd287964edb5f63e8bba00ab961e413fa23b37cc05e46e050d11622a324b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/eo/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/eo/firefox-63.0b13.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "2c7cc1b01a4348ea18b6fc39e773c79a0dfe60a72b9637cda0ac4cc05de65eeaaaf6bbc05b5b15f92c1cebbde0b385d58b173f347af4538f2545709800877070"; + sha512 = "1335b46db5961afa02401f4f318c52aae40c00611688f2eb32506f10faf24046d2d495f4c3e8579d7271e0728e5608aa7af461ee3c3e3940a2c5532ae52bc270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-AR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-AR/firefox-63.0b13.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4e9a3fb356d0e88c8b620a0ff00eb56bd25e341e951f3e4139d631ee276dabf78575ee9b2b30e159708388a25ebf088b7c5c88dc7004ad4e0fa8b1bd8daa5667"; + sha512 = "db631bc0fa67e2440ff068f009f1cd59f8f0004341911af9372a09c89f8882ddd82fb7cc350bf609b81ffb7ed23fa0a0aaafc91ac3aa0a7e03c9a52b10eafaca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-CL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-CL/firefox-63.0b13.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5b85539c1d8c30e817c4b82996f9a5cc8d078224b97c32c910931965db45a09a186472722de84e7de7349e8f9f086b9d76d2fc87c8775f67ac829e9137305e32"; + sha512 = "e65a58b49ae8c24466f9762276fd3f006dbae2ec4c200ec298d787bc4aaeb742cd17e5dcda24226327377082cb4aa5f4b37966e94d30bbd920bc1f8b7210fd6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-ES/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-ES/firefox-63.0b13.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "5a39cf930255d271e8e318bc285446a5346cff9443db8dc5270ae0232d2b4b61345dce191136da2531bc3213f4e0abf6902231abdaaf5bdf6baff2b7b689e84c"; + sha512 = "0d4dc421d87aa50bfb43be4d80405741901d6ee69ce0537dff064077f5713afd692cdd1405c1504e8ed3bca1affd672985f8dafce63a398d8ed8758a259c6c1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-MX/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-MX/firefox-63.0b13.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "2a57741f8a2f2325ab6ebfa46d3e26f92b07daef81dc01997d8ea981e9713240a08830741f37542ddf948f022a2ff56378915b5bdffa4215f64a84136850c648"; + sha512 = "798b502fe83e7ea9d0e32786e618009d7631018b303f31489754e2b04b5c89ddd8dca48a0472f8b4785da5aaf2a2a4454428d5794c6e1f8e2ee8d08c655d2137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/et/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/et/firefox-63.0b13.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1b8bcf9dc03af2ee215a24eaf82ad75efe8c8ce6dc9c2fbd4b7d8f751f7854604b0fcf3ae941f7b19ed2b36daa03fd603b1ec2f8bfca87b16fc8741b939ba8e1"; + sha512 = "4e32583343514637080a7d41366949d415a8caf6abb2d220f55fb0623fa2df08eb51f8e1205e38fcb0635052eda52c1175728a63dc06ab555e1d26ef22035b1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/eu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/eu/firefox-63.0b13.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "04ed8f610132573951d32e2532543e8a056a89f6f2ae252c72c3dfe1450bfa1d969ceb6ead5c707ec0a5b9e44d16b25238db1d4e52035d2555339bcef20c1947"; + sha512 = "4619ff888774f2da4c0a745d08462c6b584e49f6bed7cf4a9f38f1e69c0553eb40f461491858bbba9d26835bf86493459c273ced320f5292306863d7e1b4900c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fa/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fa/firefox-63.0b13.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "71204442585640cec6f2ca6f554b403f4a44a5aad4d899d264b1c224280a03fe5053e21d030d2c21be41571f26f6d97468d26add6fd4c8b3e82a97ab1be528a1"; + sha512 = "d47c39364157f96bca30c84795ab216a3d12677f39a43fa3a411b2d6c1a58ff60204242266b4ffd0b48474417d791ae6cb01ff657d3b66a01932a632a23e4a68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ff/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ff/firefox-63.0b13.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "cc9d2d4de8a29cab8ced52ee92e810f43ab15052baddec3275f5a5245246be4f5fa1c19d9eae8d6dce4337421a88cc81ccd3e87538e85740531ae1140512a396"; + sha512 = "b816e4d844112785a33a8519833dbc1ac5b4832b6186946b0e0866e53c47936bffb385f464ff04659f03db8938c25f330de75e3940c644e8e19fb5d9cc30f1cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fi/firefox-63.0b13.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "28b1be8512bea62cd40c83d52a1e5a0d3e1ef1e12cb7e40df2205f0a973558ab70a88a7df5d9bf0c3aaad2d73c55b0dd6cd0130f89e844d555369e844552f092"; + sha512 = "e6420db4cd448e62ce975f4090365749bccdaaff39b881e7c40eb75686799851f264ee3e9c9b2d69ce833b59ce5d1cba2a2fba4017e03495b23b7501a87e046b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fr/firefox-63.0b13.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "f946653b1ca82eb83fffdc2ccf4df81dbd3952acdf77f6f7c3f2bdeca4b4b09af9f7ed282743494fb790a14bab9863c99e18ec3077c6d03e979621ca2ead6387"; + sha512 = "1ad0a3de8e08007ea64a0476bed1c202e35f938f31152a18a4bf043f78c0e3e9a172c9be73a578a69c1d873ba702116a484b921f9e0de48c0e00d551e973417f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fy-NL/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fy-NL/firefox-63.0b13.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5d4bc41b40f8bb680f3e4d81c011994d73f84f8040d05b5427f0932013789935e064272621c25b19bd51c2cf3c8316f62aaac60b75c2f950de77d2e306dfd52d"; + sha512 = "3b082ee567267ebe7e846cc928607c832c96c9a4d996e098c0fcc887bc4cf52d696fe1dffcae9a06a927b45d2f29d4137c55cc99f2ddb95b79dc2c61ba561912"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ga-IE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ga-IE/firefox-63.0b13.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "09a34eb4a3866998b7a26aedbc6d4e7ae5bc5b091c5edaf0675c473730f42fc8446727e7fb3936f5768269de43786ac823911038272ba615d745df43e23e6928"; + sha512 = "1bddad6efd191825751252c6c543286614e5c52c2fe514c3cb5835953f28b11eb642abe72460d55fbbcd937fa93a57cbe6dc8cfdc3fe179961922402f81e90d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gd/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gd/firefox-63.0b13.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "77c8f4d6a3fdd2a8525d173fffd36254419f87f46b42d91b050faf5779c0fae4944df3bc646f1d893477f3aca943e09438b467b5ba6d8862a9f3ffb2848e69de"; + sha512 = "55d1dffb686b0f0c9072171b1dbb6059ae31a88f77252d922ca0f52e8210e724a1e951a1049ff5f5395eb247ddc3d93ef6e865b50b94fa8226394a1c32768e66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gl/firefox-63.0b13.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "9634ff8df8c375013d020415d6b4fa944b539511291a6c0e2e4994ff618b4cdb36420bcd78285427f9aa146fe774207f39ad2c0ccb6e23040e15e3cb0ce39cc2"; + sha512 = "11ebfffae756c46685091c63245e8bde2068c192f335d37585629a646a78478e76eea84d01b4dca85b6fbc0d53c09477ce59a29a3ce4219593c24cddbdf3cbbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gn/firefox-63.0b13.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "226e115d8e26e9c06dc07a3611db551632fc383f3347ca421df3fd82d21001c51ab2e16c937be2c98bf07d00529d19de090bf9427d548a2f6c2280d03ad81006"; + sha512 = "9f2ce62956775b7b75014d62a6af3caa6e55cad0bce6b69a5bf41f83c89db0a7d6446c8b13d84b0bcb59e14f11a92c998e489339fd15c1c92c7ae2273ae4219c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gu-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gu-IN/firefox-63.0b13.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "6522b70c7122a18e9d975ef2dbc51c6fe3d23cf8e5fa287210bc29a7e63821ca3fe3d24b6a6fddb0fb800116ae55010eea95f7d555c94468beb90bc9f3e5ec1f"; + sha512 = "185c6a2daf7ea7c221c2de73aa113d81ab0b28b085e2098943e1d315be52ddb43deb90ce1fc53a94bfac20562923e7aa90ebbe959c0d66bd9035674eb2e146f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/he/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/he/firefox-63.0b13.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "3a2481485d2c641f9d2205bf2679a733be224fc463476bb7f3ca8ea275d27a1490410fd9fd54f09b3d91bf165d46d26f4fbf8d173f01740280b50119ad25d80b"; + sha512 = "8b40e3c315ae5b6f90c396a68bcb08781c4161715f9b4ba1fa7d1c6b584b8093942e9da3dde7232a0e97847eb3749ae9225e0a136c5ac6c3e95eea0710ad0ede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hi-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hi-IN/firefox-63.0b13.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "b5a6241c748654d858337b81febe8a2219ba2d3ed3e03725ca1432fcb5dccb1d715920b2a009a00ba330ff51d202b4da27ac6bddc329011e830a4e715a089db7"; + sha512 = "bcdd3223262d192e07e68e51cc610654387f4c3c05b21652740c11fea1010aa6e5dc564974daac1801bd50d0b0f78f0e8173b3cd2b0ef8a0719251bcc83e66b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hr/firefox-63.0b13.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f704b353e92532c8ab0598263a5ad92323f46289a9a4369f05487f22dfbbefc59893938916689b0bdf1c07a079ecd8f6d8754b16c9cfb99333673f94ab1699c3"; + sha512 = "4075cd52c92433515fd97ad2b04878d21711d52fcf388ae19477ddad63a7a1d88fe62983f47fcad844ee8be1881e1fa353e18865b8c0c02c57d43b2be6250c48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hsb/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hsb/firefox-63.0b13.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "44517eb11cd22ee1bb201b14c7cd18dbb1663f0e2a52c8cd1d0e215985f2f9e67d80ba4e10ee599f693e9b12436a9757eed94e3dd4b82a8ae37d1892296b1428"; + sha512 = "2534c74303a9e40de6e32ed3552c575a38a2be612237e9daeca2334c4f3354698d640c62f7bb170b38bc8267735e75ff2c7dc61bbe1b9e0a7b4adfeda891a1a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hu/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hu/firefox-63.0b13.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "24d7a30076378d584f8f524353dee730d9ebd5be16a5e6ba0a44af1e7f0b51fc96670f8fb1f6a661b662d649bfdc1b6be6ff19410a913031a108f610f0f63e2b"; + sha512 = "002b67ca863b1da0e68c39cb05b11b956f4f8a47968b88541b73b45bf795235d1b851bfb3c06200a71c7205806d637c8da315303f8050e56f5560d1066d2eb97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hy-AM/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hy-AM/firefox-63.0b13.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4bd50fcb8405a59b4624277ccfb2a528667dc386b87f815551ef264655d6c9cef4cf0d2452b1c7babde138aa81fbdc6a6484cdc6890e0f6a4e926786ac0fbeb5"; + sha512 = "2ee7f78a9a8eae99792be88885b9d10f596473e9fc03d935d4d16b927cfb5e6305a037edfd5d4cef1e253a46a9d7b2c2c3bca3f86e557302e326f1002ba12ba7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ia/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ia/firefox-63.0b13.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "d62d825507c92878bc022d85947d59d93c9913cfb02a8dce0e2937a4527a80444e59bb324f175d18322726f1ba9686faf349236ebb12fb268a3e13eab32fe317"; + sha512 = "c901603efeb9b40a0eae5c6c52973dacd218cd4a31f94a597f3cd20338dae8dc2a10c0b991e4367a72e8ee473d000e972ca6aabf2dbc4ea16f0d4dac4b2edad7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/id/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/id/firefox-63.0b13.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "955ac0a9b30e9209a0fbcec5e88b94d75bec3b8455a78e08770e5ce54b10f73b8642a8a2a1b534ab9b3671611fc6a9278c597c3a3e84b073008c42745fdb6892"; + sha512 = "8c215c9bdd711f9165a99dd5276b73036590234be62f42c93587598d0d6423ee26d312fb015f176de4afe799ffdacdf860f0d00b3006f0229c1dec84d2af9f7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/is/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/is/firefox-63.0b13.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "984a706f8ae3bfd09ef720e5586c69da7bee182281b8231132431080b6504a265e891114bd7937381c64dbd9dd09904b9e531849998409c29c235783ad8c22cb"; + sha512 = "39af62503e8de0c74630e4c877c920553902661deff8a2271252a0b15ab3f544d4c843f53e6ef3a6f386dfbf047d2ecf47d29b3b91a683dae181f1bd5c175791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/it/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/it/firefox-63.0b13.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "5d917c06052408d11c22945aaf0f26b1c312c8aadb631c935fb341893d3d2c762feaf1fac8aedd944fea13518a73fddc5fd4850863036e05964e4ae72cca6542"; + sha512 = "50e8f50ae82f3cd13799884367968bc3e1d1b01f029bad18a2ee1f658c1c45a98782b831172d9bc65c2c97da29478767429a299851a7f498b534c121ab493d13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ja/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ja/firefox-63.0b13.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "3fa9888377d958d879cc04f2763593a7e88871d09e304e597f27997b4c4291d5db7d9345cc3c19d09de8cde34d5c4c1e9488eb205d075cc9b6f368db6c77cf29"; + sha512 = "01d52a8d525bae042f78f865284412bac2861f8804e214725671a25d2d4128671bdda564e73b9342520939426f7c1c68349637cc5a85030f1a559a5af940507a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ka/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ka/firefox-63.0b13.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b0e49faf822c1145e185069e001d63480132619b39b76ec2baa36456f2402f88e6d500cfb86b3edd7387e11f145283e1256218e0fae8d95bf716f00c5d682a44"; + sha512 = "dbad627cfb3eb60b4c7ff47f54faf75df232fae7919073641a394e6c882035af32e8bef25084115b25959fbbbfbf30753f32a2868838e87c7905fee109ad5037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kab/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kab/firefox-63.0b13.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "1b4f60da621fd4d7e2690b84541edb16f58a4065f87bb6062efa8efc650b1e12de51ad583c5f11941dfb9849572edd27e5bea83d766a9b629337a3f13b3d0502"; + sha512 = "ae48811af05c1ac602270e8e6acc230dbf2e497567fafe9c7b402897f4e5cfb34c3645f14e63f463cb784e56bd49aba1b8ab692b9500a5241b5f91bb3a89e239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kk/firefox-63.0b13.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "97aebb3ff8b39d2bd5fc7bac22db0169eb30fd16523b8e92fa25d840b289331cfd3aabe8686f85e76396fe8d57e5c4c7b32d5f28bb949166b48eb88858285f65"; + sha512 = "70077e5aa220d6e67c819e98f230894277d8ee9446885397bd2bdfc886f1075907639ead92007dac2c74cc0ff7baac75c921b7c6ddf56120d87f66714e1e9388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/km/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/km/firefox-63.0b13.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "2dea52a11615a8fdac422cc495a5a344ada2540778c0300eea3e85ef5cd906bb6fd009631fd62565bbeb01a65470f9833cb66345fab63493fbc0e8fd8c4d85d1"; + sha512 = "25e487b8dea02fa31211cf9b8e143911293f14485ec167e5524be0ff61db8cd9cdc86d2e4ccba58e63f14a82439dd11f6e25b9c9b591d0915c8119cabab81551"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kn/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kn/firefox-63.0b13.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "72ccf22a789a7aae6132c9522138e5482024e61550fd81122969a641227448d4e781fa40e0472e95b36e66abd0c74be3a96f4479781894be1323cde248c00e8f"; + sha512 = "9a947d844a81c3f6e2f62ee5a9dc0129afac82d9c6e77e59232ff3e140b3552b146a702a4be49fec64edeb3f506f4ee86c4c85345315f76171cfbf72c3f269da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ko/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ko/firefox-63.0b13.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "b9d627ecd91bc9510b777d355cc821f6eb4830748eec14ef44ff1022fc3daf42caf9212e9bb4ad541584cef9eb41f5ff56b216c2c6e68dd067e91e75202f4eeb"; + sha512 = "c56662d013ac5ebe4cd6bb64785ea165321aee492dd37fb5c7368c4932c4f871d2bd33128d3201dd9c3e73fbabe4319190eb1701332891f62bbb48fd5c5776a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lij/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lij/firefox-63.0b13.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "fab085b0db9c01852def72428421440731a17656f9d77da2e5f5743703aa7ae3e51e1a2172efe47610a4f02b5655520776ce2b48a7e6ecf9cefced78cf533ec6"; + sha512 = "c1f6944f4f52e4e6b6f84a69050b5692a2982a30a9ae7ddb747ecc2f183d9be225428675ac1ed1553efd573f71bd3350efd9d247d16ae0c3d80044000b0cbbf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lt/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lt/firefox-63.0b13.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "28ec2617cf310b2a007112b308bb47f668f89511515375b2e822947a7ca9218c3209975845fdb91989a70285601c2b5f7b04e1ea98055d1c0804f73956e3b5df"; + sha512 = "5be16d895d58829791afed1c9fec00a2c84c849729cdf5b0a0e51ab06fc55deeee24bf98107f4e75ca8616f936676630455cfefc9034d6f53167247438e956a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lv/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lv/firefox-63.0b13.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "08dc0583e0c7642aab90c9d4536b567026cb245fb44cbaeea8e91bfde9ba1bbfe90667ddffe8c1224ac59867d4626c4e3641b044d7b25fc85d4832c2fe0e3522"; + sha512 = "f75d0186d228a03137aa9174122109c42e9aee19a1ffb0e810f53b8f0af9f72d1a81ad86468db3bdcf0401ade5407764253ae1176457f1823afa8d1f2e44db11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mai/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mai/firefox-63.0b13.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "dcc85c2b60851cafd12bad1c018cde11150b946147fcc2e213eaeffa5e89f4eae9b346ce90552b0ccff6efea64fe126eaf51d5a442173e0954bcc4d33e616b8a"; + sha512 = "e010c961c9e6dc4d7c8b29a2acda5aaaa7c0e4f2ef2bcbcc9b3a29e8b1a80f375c877b8f925cfe0a35e018fea2acd3acb67394547943f2dd1818a2138db7b83a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mk/firefox-63.0b13.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "56a8dd0b99aaaf975e932d18a89dd5364c0277e11ffb6077bfd38b63e38a9960b16f638e304e836599add79db4d35c05db13110a5a0081c24855caaf0ad25f88"; + sha512 = "91d984cab9a39cbdb9bb5a6971ed107b0de33ebec913db1c8c48c459abefaecada9267d1b7211626c4617edaf85c1f827e92e0f8fb2af42dd67a09792e4cdfff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ml/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ml/firefox-63.0b13.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "d89b9385905130130373612a6f0e79da26e0ab2bd7b0a28101b429b3d226d833ad2b415f6ce02746bc6b9c5fe5eec80e7ffa733a547835c636408559281766ad"; + sha512 = "868cf98a5cb99e9a5879d13a7de79f62178ec8dccbe7b36ef7392f5313fc93b4252e08fa9e2926b51a1f885c86e2198712523e9d144da36d4c0e84ecb2b7a563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mr/firefox-63.0b13.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "a1c76c260d4347e7e3feea2eb5070dab80301a305195befc2d988f2cd982e8a7d6dddd16dd4b0016fa71709426ef3e9bc533aaaa3d3e07fcb8c1817994baf3d5"; + sha512 = "07e3df41fb1f8e4ae97ae02b3d559fc5e1ac133478913b0bb3767bf5f528aae34d241a1aa8b1de876d20d244afe5ce5ec88d9663bc6b4d81a6c89a72b5435a92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ms/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ms/firefox-63.0b13.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "a68f7794f28ad0f083d6200b5bce8849b370afb6e5cc0b5013659f7818afd3dae38fd2216c80a2b555a0dad897365e6cef2c2152d969cdc5d4e4e59ef73d23b4"; + sha512 = "c07bb19e1cd42a6b7125140ebba6b76801ce6120075e5dd1c93dcafa78cede7e2f905c1cafa2d16272278468019808334d6428039b94816fbefe358e5c20a54d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/my/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/my/firefox-63.0b13.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "936b3fcd3bb4b3119768bb49f382cda0e5d6601a83432939801248b0fd3e1f734438a0f5d69bee96469be25333a77dc12d57f2ab65462feb13d6f50f8671d85d"; + sha512 = "3153f92490938d546c7f7b8497c08a5a71c78a847948f1853fe2faeb5c077311b8e42175f639bc27d0ea4bb72343e0a35fc2ccbd1cf04e5e556619eb11282ce3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nb-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nb-NO/firefox-63.0b13.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4bd3ee6c762423d3e10b96f583b0b785778ca7a72074122941e3cbacb8e8680fc6d6fb4daf2a8d13615947297a27dde03cb415579762c015a6fdd3dbd23bfd31"; + sha512 = "e4a63f4a19d28e248f97b4f6791873f6bdefd61f80cf8476a555864ed5ba6ff2001e69c02a2a271c8b78c28e1c78adc7c766b8e1bc2791111127eceef777c30e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ne-NP/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ne-NP/firefox-63.0b13.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "de6f295ea831a91249857e896d888d3866db4aa39fa9a2bc57d46d4f8e0c0db2858733fd6db7326803dd75d6d5a9eb9f34d85b285851ac2066a6dbf7242e1a5f"; + sha512 = "abadef6736bd802c81e1a741e77291600dd7f90cd12d623a3c39392515c23191c1a3d5f1f9771b62c6d8a7add46dadf5722dc9d0dc47d8a4e15227879875c6d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nl/firefox-63.0b13.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "603e7b90798d500dd9c6dc10b29735f8a0e1dbdf8ae8c776f1433ea92291550b67581a0a58b60314fe32a1e3b9856d3c2cc22b42d23f5c339201240e91047d8c"; + sha512 = "a3654dfaf19fe2a30445e9f0e8007739e446a78c3f630ec42d28d802698fb41fcfe7c8977b9d05dbbb9bf5eab264ab73b70993825f285473c941c10293df1863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nn-NO/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nn-NO/firefox-63.0b13.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e4a4513296533a965f470464b1530a14225f71cda1edf17605d49a565b91ccad25ec226878c315d1ed1cb80d491c9e3b2577e41ce252f0b8b5c7fd99b136b6c6"; + sha512 = "06817e98fa2f89f7fc513f8b439ea12d2d7cce4b24384cc5c442d61b6d974261d6cca5f3ac06db267be22988a87a9e672ef948a78bfd3cf92e83a3f11620543a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/oc/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/oc/firefox-63.0b13.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "d95abb474023bed4471f366c1109f28f7be2a938d333cf30d3e0b76429a6625078f78cfa7deea42a541bdb815611e46ba6c4c77f3e890143cb001aa26a1b6ef8"; + sha512 = "67b3baeaf105149491bb98f7a7e1d38a056116ad331ce56e39263172240f89a76c6a0b7e322069c9f23f11cd0486cf51d7847b70bb28801fd8abf0d669326c07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/or/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/or/firefox-63.0b13.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "16eaab71e1896ba201a44cabb84083d3aecd75a8f1e4736d9046976e2ddd983de63b287512c41ec2fb0b942af7d2f36b2b7f8923d77ecbfdfb751f64416d0b19"; + sha512 = "447a66d8938c9fee0ff2c8c0b2e7c5539e55ee7151e46ddba3e6ba09499138e0fc1f6ae8cd954463c65a58ecdf69bc65996bad02580b16e5a5e963c6ff268f88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pa-IN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pa-IN/firefox-63.0b13.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "0b274e05f65cb11be8c0b6b70cbdefe5c910b8a9e8c7200b6778e40e755e656c4849bb1bfb128b36150a7fcfe1cf5b641c7a1872cf14549c9d039aebed7ccc07"; + sha512 = "5f3cbd069ce774d5055b39e9a6a97fc421e47f4e49e05d0505a2386d017a76dc25d14b7bbb19a53ac4d5a5baa858257633a4d2f8c4f5f4965587da4dcc7a7c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pl/firefox-63.0b13.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "2b03845b3795bdabe1b38ec890164cd4d83e2ecc2ac36fb2a96aa37c9db97f79ce3e8b7d8d113c2a88decda342b445b2caf0f137aed25def4177197fe4ea9d2b"; + sha512 = "b07d5d238eccae9447cb2fba17b4dfbf8c11e983bd57e75460d4219be2cf9883fe26efae3319491baec68539840c3bd0a707e5c7b74c3449b950b2e1e1aa7c48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pt-BR/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pt-BR/firefox-63.0b13.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "80f1105afefbff17774f5389a95453d9f2c89684329506ac9c6bd9ad8c7c40b29a65c0f6773bd9ad6988ecb89a29e21dcb1eaf1d53b91f6186632f4cc1de8858"; + sha512 = "0ae1543d6e0b49353963a2e7ccc271ada1ab79018975895c838c83da3bccc01c9f5c420b186086eb2204dedf2cdc9a8321bc164963e6e45bf1f919b32bbc798e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pt-PT/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pt-PT/firefox-63.0b13.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ee0b41a61efce3b9c439b08de1e518e8c886655d0952b1c7c575c413c042dad19da3f4da6505615706046c522ffe918c7bfb26c5ad97525d60ccf36a0e17adb2"; + sha512 = "5100ffba1866e21c83254e8bb49ad7f18167500d03f034d2b9db298130ee8804317692a1fbf177c39f997b4c9d1fbec0112836fd1930137f740c779069050dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/rm/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/rm/firefox-63.0b13.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6c761c8b83da4361398efdc196e2390677d485c12fa5a696ed5a9b9bd8974d693cf199048369d1804df739a6f1cc45de406afb08cce2354bcae35c66230f66ce"; + sha512 = "2c4efea31a1c091a417b35d3007db737baec62f9b19174b7f8254ac0277909f3c5751613effee4b344b3ea2da2bb04408eb337870efbcc339e44e7327a023eb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ro/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ro/firefox-63.0b13.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "59f679d4113a12d14f99bc3faf765c7ef0a811ee1b638ea1b6e04f67cf3a97da81f9388833e94a38bb47bd88eb8c16b0134508289128771ec7135001b79b199b"; + sha512 = "a2db9d68c20467cae286929d168bdcf2992d95cbe8c7cd8cce792110c8fd66e0bb8d1e1f5a0d671d6de4b220afd88d326f2ca842f6ae89ba4117d8b3e30750ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ru/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ru/firefox-63.0b13.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2296a95fd6417eaccf832f33811c6a65cbce5e6520ad4cc79ce3adbc1b773ff51169654ac348c6ae3040abada2b3d1b1d3981fb3ade7998df033e5fa52fce391"; + sha512 = "01caeb7ea42435fa560866f8acbbbf1a3ef34e2a97a5616dfc0e017469b86e730076591121eb1ae4e8542a5d9dc297f1b8081e9815ca2f191245362c7bab409f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/si/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/si/firefox-63.0b13.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "4b67e4731bc9d5e0570a5d03864d1857cb4864768006740c8f5880aef4bddb499976d4f69223def08a7db104eb459bbe06c2e9023e2e2c84af85166b17457451"; + sha512 = "879a4adf470d5dba2e3b99a8415aa34bd491cd7392bc138d5a98cac9cbfbc53ad23aacc947f14775cbd438f5af7a28abf2c9072847a42e53a9ad6d43a5e01082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sk/firefox-63.0b13.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "0fbe91caef978c857f765d3bfa4d6c116f0a4d80d1fdd4d9d1f65baa8358a53ab0f18d8527e301e36229230d28a68e1b840ed5bc4fdd5751be39b1e9c3095609"; + sha512 = "52abceea5248ea7fdf70e9d7f6ffcbfe903ef09fa91458930d1fd9a39717621491b65b198fc72bb6e39d5dc189fd4a7aea59482cbfc851df76a3e53904ec784b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sl/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sl/firefox-63.0b13.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "75345e5b882142b16ffd1a978fe91f3185cf7dc906494ec1a886130d9a51189bb2cd3a2d3b340b63b8c7ccaddfc60d46e2e7c9314a9337dd1db21e0a1dda03d0"; + sha512 = "b6e55f76896463fb6b9e964dbac60be2dae5aa60bb59be2a22f4742249539ce35791c408e7b5258f35e9d24c1732d0a8900e8855e7866d401e636ab7c603fe77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/son/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/son/firefox-63.0b13.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "25f9791dd9fa9ec38d52291de240130c998fc6186ced18a41128b6c68d3375702794260a77b7ab8c28dbfac2afe0bce0f80bbb8ebfa3f3529346e264690c934d"; + sha512 = "2a27edaf71212ce13e2b841db8892fbe6bab969767833475abbb1e63b075d3811e00d95f39008a1a0a198f98059d8148b78939657f7ed0837d438dcc7e9f460c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sq/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sq/firefox-63.0b13.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6e199b772d1e89ee6b74add0ebe53a1ad590abc7c436851445ef5eb060011d27d371d06f8dfb08316e84f4971637450c76272bc77e57b76d3f8945a4f1e36169"; + sha512 = "e347bdc355e4dcfe7e2fc85d0ac6e2bdc72d51d697820b00cf5e6f30ee4a4117765430fa1f0a40ad647a87e4c9ca0721be1fa345c6c31dd9da403ac576091779"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sr/firefox-63.0b13.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "331fcf1f0ffe68d3925518a044c40562d37480392534e161df9546c4da2e648b0c1a765714bc2fc3457ddf80bb7ff4b65c0092d3e2a6f2a11af1b66a099086c3"; + sha512 = "b32eb6ba5290674d81893419f38279d0761d0a45a68204f3fec0625db09ae53e959c02276a852d7cbc59dc8bccef149ed024246c343836e57750ab73ed739a43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sv-SE/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sv-SE/firefox-63.0b13.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ce9b87e63e9fbc975d48432996d12c31e13548f328befc9c52a5da9b2998f3bf286e7d4cbd1fe36b77e0f99dee32cf186ab81e90ab4760771bbe7fd98e70adf6"; + sha512 = "b5244288fcc8dbcbfe705e20b754214f26bc0c28b929ebfc946a5ee93230094486cb06313eb130d5782a874369b4690edb9f40ef960cdf367363db3bdac2467d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ta/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ta/firefox-63.0b13.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d40ec15bd52e4a71c73366a3a5fa58458401300375723eb76fdf68d5bcfd101cbc18d15f773d58005cc80f78b3f8d52e6d2c7e969a351e8ceb9e0226bf2cabc2"; + sha512 = "ac680424cf44999fd33473f96a82f9ab5b05fa2ec415370694449aa5513423f4d7a416026047d04660d2273c3953c60a72e8f31120a88bcf77f9c9ddfcbfa209"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/te/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/te/firefox-63.0b13.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3a1f6a31f6f6ae2c50a9a082314489e23a294ae8df8bff191b18606621e1eafafbb4b1d8172a61cf62e2572864d3973b8edd82cdd352e2227883cd020ff05285"; + sha512 = "ef821bac5631cddfa1cd5c6ecd5bc10b3e6085d94c2d2a1f86c4a557ceec8d0081c41fdd46b83bd3f03412bc9dd4ff66988ccc2a4447b134e3a7115d02714558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/th/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/th/firefox-63.0b13.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9f8b425f1acb31e1cb147daf0139d6d74235b0c73cb7fc9b371eaabcb543e75409f9fac5027d0475acba7d811e3fd69e406788a7eec5f958329b1b159511aea0"; + sha512 = "ee5733a21ff7ef0d58ff1b5dd056ff2b97de2f6a90c733b3244235e9d51aa3d14cf16f2b6738d53e33ae9bf641197ef129571ee297401663286d93303e6fd6c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/tr/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/tr/firefox-63.0b13.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "6b9e1de61d667f47d6f77d92872a24c360e8cc0833c14338d16db9af6eac511c2b92a371b5afb64af08c50e5367ae8c7567a3473080227cefc8ed9e04e1dba86"; + sha512 = "49ffe5b0ac9b2987d330b8c34dafa352a5c2d327cd7af652ccaadc85c45d63d5bd4222cb4fbccc513f13f2797a7525a0456f30de0603f65581001ed629e0bc8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/uk/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/uk/firefox-63.0b13.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "e9dd5bb21770ca8fac633c22cdce120d2e1eefd10eab66345afa76c0c7e4533dc325ef954878e13c223f545eebcfb15875a4735f990c5ee121eddf976ece1cff"; + sha512 = "bf6eacd5877f6d157d35f532878f6806eb2bbc6946fb3dcd79c7ca608e649da3f86428182d596242c7c57d3daeaaafdba62a4cb62bd6eb3df57f7788dbfaf0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ur/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ur/firefox-63.0b13.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "54ab27f01b7885f9c99c2df40bc660d642a5671c348ecc587f7989816d6ee0ad8003c7c6ca92c6ff644edf04fb72444d87bc041d75d13ab70c713e0f52ae17ef"; + sha512 = "07d175fa078d9be7effc148380b737e2611c301c2af833c9b475388d2b3715a2207ed20f2d4f583a921196199e10816674428c68e7410e7e237f74243fc0641a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/uz/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/uz/firefox-63.0b13.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "da7c03cad4b58447d41d74f6ba36544290cd1a68b9b822473685c8d467cd3570d0ec172f5d510f9fe9b0554c138e4484e64c5fc7858ebe68912d4cf7cbe4f7d7"; + sha512 = "b9a52df09d30406fc21f82e683ce8704df9ce69816f52288ce8d04f72a18842d2cec8fc560bf9fb4e18d513150a14c3b93d3fd15b3dcacfa304f4026666f2a4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/vi/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/vi/firefox-63.0b13.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "246880d50325895b6cdf549b48f3abda0ce0983284623907f8a08cdfc32f9e748e0918e07c606b398fe48d1e23e713b53cdaeca218c54282c68221420cd94b8d"; + sha512 = "2f255254ce614dd77c8a5f250a83020b5649dc7f8a6b2f4007c857bf7528ee7b959425ca54b1878261cdc26ed5c51fb0539aa05551f2591909ca0728d0415bf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/xh/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/xh/firefox-63.0b13.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "dc59e7c637964ffee861ec41a7012ce96980301548882d4c115b8963217487e82eca939f73fab76fdb67d1c676a580eeebdee1b332d22f45435c5d58dadf9499"; + sha512 = "79ae1a6c8ed23b37764be436a0d6cce60c14d91bebd44c8644adf8800f894b475383132f37620893f994aa6620146f08f48d8c2721ba54ff2ddd9ce063918f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/zh-CN/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/zh-CN/firefox-63.0b13.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "fc6518d0dd4c24b2c4c3bb72fec23690e8647210f97e2154817bf0793049943becd6d25061c3a57e36f693082af93084faf2357a35d9e19ca1eb8722a7587ba1"; + sha512 = "6f99f8239f5ed00003ce61d82e82c9df5ea6f30b68b6c5b51f26e153e3b2f5ec26c38b09e9b05bd12e9ebf9e1156d59ac102a9258017a1359cd66763945c38d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/zh-TW/firefox-63.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/zh-TW/firefox-63.0b13.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c85ca42f38731e27ebff681af104330d486744215f8db829dbf0f4abd9460a655a5b6d93bbfc4ee83aa6b1bccdd90d3b8743d340a818d84f6fe4a715f775f7f4"; + sha512 = "9a61516afb0fe59775794dabfe0a9a7bae2a71472453bac321468391541d3d052817d5f7650d1b2d1a554af57434c11845d5591bc9e7e79336b8a57706aa133b"; } ]; } From 8609055ac23630599c4b3702dad50170707ed3a5 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Tue, 9 Oct 2018 12:41:47 +0200 Subject: [PATCH 317/992] kubernetes: 1.12.0 -> 1.12.1 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 776a1667514f..343380c60751 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0bnfhrli9xqf7ygfq5i5p6nsgv7ic57b5b705zbqsxrc24pvsy4s"; + sha256 = "1gm0v5p008w9i4k94ddjdyfqfsbx7a6ngmh81p155599hifm32zc"; }; buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ]; From 9ee3f9dbc3d11b8a111b5a84f2a8aa71a5148ba8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 9 Oct 2018 13:19:21 +0200 Subject: [PATCH 318/992] hwloc: 1.11.1 -> 2.0.2 Enable netloc at compile time (was added in 2.0) --- pkgs/development/libraries/hwloc/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 90a16bcf7f94..8aebe0e66e7d 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -7,15 +7,16 @@ assert x11Support -> libX11 != null && cairo != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "hwloc-1.11.10"; + name = "hwloc-2.0.2"; src = fetchurl { - url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; - sha256 = "1ryibcng40xcq22lsj85fn2vcvrksdx9rr3wwxpq8dw37lw0is1b"; + url = "http://www.open-mpi.org/software/hwloc/v2.0/downloads/${name}.tar.bz2"; + sha256 = "1phc863d5b2fvwpyyq4mlh4rkjdslh6h0h197zmyk3prwrq7si8l"; }; configureFlags = [ "--localstatedir=/var" + "--enable-netloc" ]; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. From daf21814e0a819c36417eaf0f260f346ac3fe475 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 9 Oct 2018 13:19:56 +0200 Subject: [PATCH 319/992] hwloc: add markuskowa as maintainer --- pkgs/development/libraries/hwloc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 8aebe0e66e7d..8f38170d87e4 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { # http://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; homepage = https://www.open-mpi.org/projects/hwloc/; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz markuskowa ]; platforms = platforms.all; }; } From 4d88ce447a7068c2dcec374913312cd1fe854838 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 9 Oct 2018 19:30:44 +0300 Subject: [PATCH 320/992] midisheetmusic: add version to name --- pkgs/applications/audio/midisheetmusic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index 26962ad9cc85..448977e5705b 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -5,7 +5,7 @@ let version = "2.6"; in stdenv.mkDerivation { - name = "midisheetmusic"; + name = "midisheetmusic-${version}"; src = fetchurl { url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz"; From 6e78a003761971d5b8fc903c634fcf3a8f6bbebf Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 9 Oct 2018 19:42:42 +0200 Subject: [PATCH 321/992] atom: 1.31.0 -> 1.31.2 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 25b5cad34dd2..6cfba39ed4b3 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -73,8 +73,8 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.31.0"; - sha256 = "184vsj7qcpzwiq2v5kh8i21wfzhinhybxmr71y41sjqp78s2gy57"; + version = "1.31.2"; + sha256 = "1szx9p2nz1qzjpig0l8h4hj5mqwpjvkcynn8crh21drply4bpfr0"; }; atom-beta = { From 04d2af6b1a0f62d63251cfd30bd8f0dbfdf74cc4 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 2 Oct 2018 12:57:54 -0700 Subject: [PATCH 322/992] urbanterror: 4.3.3 -> 4.3.4 --- pkgs/games/urbanterror/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 8ceff15b93d0..1cd87541b8c3 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.3.3"; + version = "4.3.4"; srcs = [ (fetchurl { - url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror433_full.zip"; - sha256 = "0rrh08ypnw805gd2wrs6af34nvp02x7vggfp0ymcmbr44wcjfn63"; + url = "http://cdn.urbanterror.info/urt/43/releases/zips/UrbanTerror434_full.zip"; + sha256 = "1rx4nnndsk88nvd7k4p35cw6znclkkzm2bl5j6vn6mjjdk66jrki"; }) (fetchurl { - url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.zip"; - sha256 = "1624zsnr02nhdksmwnwmvw129lw3afd8h0hvv2j8qmcyxa7jw68b"; + url = "https://github.com/FrozenSand/ioq3-for-UrbanTerror-4/archive/release-${version}.zip"; + sha256 = "1s9pmw7rbnzwzl1llcs0kr2krf4daf8hhnz1j89qk4bq9a9qfp71"; }) ]; From d4f5f3a504249c8e380e8a0e7261b0d1f068d185 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sat, 6 Oct 2018 10:04:09 -0700 Subject: [PATCH 323/992] mwprocapture: 1.2.3773 -> 1.2.3950 --- .../linux/mwprocapture/default.nix | 6 +- .../linux/mwprocapture/linux_4_14_fix.patch | 71 ------------------- 2 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 72095bc8cdab..f6f6c10112a7 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -15,17 +15,15 @@ let in stdenv.mkDerivation rec { name = "mwprocapture-1.2.${version}-${kernel.version}"; - version = "3773"; + version = "3950"; src = fetchurl { url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; - sha256 = "1ri7c4l4xgkhpz0f15jra1p7mpzi8ir6lpwjm7q7hc9m4cvxcs1g"; + sha256 = "1im3k533r6c0dx08h9wjfbhadzk7zawrxxaz7v94c92m3q133ys6"; }; nativeBuildInputs = [ kernel.moduleBuildDependencies ]; - patches = [ ./linux_4_14_fix.patch ]; - preConfigure = '' cd ./src diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch deleted file mode 100644 index 94da5a00a2e2..000000000000 --- a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c ---- ProCaptureForLinux_3773/src/sources/ospi/linux-file.c 2017-12-15 01:59:57.000000000 -0800 -+++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c 2017-12-23 22:47:33.666823299 -0800 -@@ -7,8 +7,9 @@ - - #include "linux-file.h" - --#include - #include -+#include -+#include - - struct file *linux_file_open(const char *path, int flags, int mode) - { -@@ -28,29 +29,36 @@ - filp_close(file, NULL); - } - --ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size) -+ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) -+ return(kernel_read(file, data, size, &offset)); -+#else - mm_segment_t oldfs; - ssize_t ret; - - oldfs = get_fs(); - set_fs(get_ds()); -- ret = vfs_read(file, data, size, &offset); -+ ret = vfs_read(file, (unsigned char *)data, size, &offset); - set_fs(oldfs); - - return ret; -+#endif - } - --ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size) -+ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) -+ return(kernel_write(file, data, size, &offset)); -+#else - mm_segment_t oldfs; - ssize_t ret; - - oldfs = get_fs(); - set_fs(get_ds()); -- ret = vfs_write(file, data, size, &offset); -+ ret = vfs_write(file, (const unsigned char *)data, size, &offset); - set_fs(oldfs); - - return ret; -+#endif - } -- -diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.h ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h ---- ProCaptureForLinux_3773/src/sources/ospi/linux-file.h 2017-12-15 01:59:57.000000000 -0800 -+++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h 2017-12-23 22:46:22.028545189 -0800 -@@ -13,9 +13,9 @@ - - void linux_file_close(struct file *file); - --ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size); -+ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size); - --ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size); -+ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size); - - #endif /* __LINUX_FILE_H__ */ - From dcd8cec0f0a39dcefa3331b7aa5671c3001353fe Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 8 Oct 2018 06:06:29 -0700 Subject: [PATCH 324/992] winetricks: 20180603 -> 20180815 --- pkgs/misc/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index c2665353a390..b1af27807316 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20180603"; - sha256 = "02valprlb64cc40ivd8sxgxy2hsgqn22s49a47inl6pknj5nmvar"; + version = "20180815"; + sha256 = "0ksz2jkpqq8vnsc511zag9zcx8486hs8mwlmkkygljc8ylb1ibn5"; owner = "Winetricks"; repo = "winetricks"; rev = version; From 2c881054f8ac71a6373e9b7d275cc180bd212ce1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 9 Oct 2018 21:50:30 +0200 Subject: [PATCH 325/992] scdoc: Update the URLs (homepage and download) --- pkgs/tools/typesetting/scdoc/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 3a4c7813c695..270fd7da1717 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "scdoc-${version}"; version = "1.5.1"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/scdoc"; - rev = version; - sha256 = "0fm3x6ma1pzlajfcy32ayqrcab8lwl64nxfaqgc6019mxw87y1ja"; + src = fetchurl { + url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; + sha256 = "0hcwpyy97afwq40qn8jq75f1b2p0172lil1v0hs9a0rislpqk5nm"; }; postPatch = '' @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { scdoc is a simple man page generator written for POSIX systems written in C99. ''; - homepage = https://git.sr.ht/~sircmpwn/scdoc/; + homepage = https://git.sr.ht/~sircmpwn/scdoc; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; From 11c0d07761f692e2bc1285d7f45a57e99a9cf0c7 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 9 Oct 2018 16:37:18 -0400 Subject: [PATCH 326/992] f2fs-tools: fetch src from HTTPS instead of SSH (#48110) All users can use HTTPS, but some enterprise users may not be able to access external SSH endpoints behind corporate firewalls. --- pkgs/tools/filesystems/f2fs-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 20e1853a3af6..a1428a257742 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.11.0"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv"; }; From 2f7c24295357240da704cb28c4240ecef36bcd7c Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 9 Oct 2018 22:44:29 +0200 Subject: [PATCH 327/992] net_snmp: fix CVE-2018-18065 --- .../monitoring/net-snmp/CVE-2018-18065.patch | 30 +++++++++++++++++++ pkgs/servers/monitoring/net-snmp/default.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch diff --git a/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch b/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch new file mode 100644 index 000000000000..c33f7bb03fa8 --- /dev/null +++ b/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch @@ -0,0 +1,30 @@ +commit 7ffb8e25a0db851953155de91f0170e9bf8c457d +Author: Robert Story +Date: Thu Oct 6 10:43:10 2016 -0400 + + CHANGES: BUG: 2743: snmpd crashes when receiving a GetNext PDU with multiple Varbinds + + skip out-of-range varbinds when calling next handler + +diff --git a/agent/helpers/table.c b/agent/helpers/table.c +index 32a08033a..2666638b5 100644 +--- a/agent/helpers/table.c ++++ b/agent/helpers/table.c +@@ -340,6 +340,8 @@ table_helper_handler(netsnmp_mib_handler *handler, + else if (reqinfo->mode == MODE_GET) + table_helper_cleanup(reqinfo, request, + SNMP_NOSUCHOBJECT); ++ else ++ request->processed = 1; /* skip if next handler called */ + continue; + } + +@@ -409,6 +411,8 @@ table_helper_handler(netsnmp_mib_handler *handler, + else if (reqinfo->mode == MODE_GET) + table_helper_cleanup(reqinfo, request, + SNMP_NOSUCHOBJECT); ++ else ++ request->processed = 1; /* skip if next handler called */ + continue; + } + /* diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index a6b738270a9a..0e7a53306eb4 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m") (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid") (fetchAlpinePatch "remove-U64-typedef.patch" "1msxyhcqkvhqa03dwb50288g7f6nbrcd9cs036m9xc8jdgjb8k8j") + ./CVE-2018-18065.patch ]; preConfigure = From 2ac35c806bcacc65385b89e1f47dcfd6bed6bb17 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Tue, 9 Oct 2018 23:36:13 +0200 Subject: [PATCH 328/992] gutenberg: 0.4.1 -> 0.4.2 (#48104) --- pkgs/applications/misc/gutenberg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix index c5982f68201d..c71dcf2e0182 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "gutenberg-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "Keats"; repo = "gutenberg"; rev = "v${version}"; - sha256 = "0is7156aim2ad8xg2f5068crc4gfvm89x8gxa25vc25p0yr1bpla"; + sha256 = "0kzxz26khk5rwb9mz0wi9r8y7r93w4n2dbq6v2qr07cy5h14pa6w"; }; - cargoSha256 = "146vlr85n9d06am5ki76fh1vb5r8a4lzx5b7dmgi292kc3dsn41z"; + cargoSha256 = "0n4ji06chybmcvg5yz6cnhzqh162zhh5xpbz374a796dwp1132m8"; nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; From dd58c35332eaabf5f48613f6bc34fbbbb189cfa0 Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Tue, 9 Oct 2018 23:39:52 +0200 Subject: [PATCH 329/992] prometheus-alertmanager: 0.15.1 -> 0.15.2 (#48121) --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 38b789261773..516a537bb247 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.15.1"; + version = "0.15.2"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "110l8xy3bkgq137hvvz2v5cr464j02fy43lvgd3l8n5v8qmv81vy"; + sha256 = "1r4j22jnxayicz9hn0pwm77cgzzywr5haq0hwz6sx5j2xwjmnwm7"; }; # Tests exist, but seem to clash with the firewall. From 5ead27394d6adf7ea41497768ada6faee1bf1f88 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 9 Oct 2018 23:45:43 +0200 Subject: [PATCH 330/992] journaldriver: 1.0.0 -> 1.1.0 (#48106) Included changes: * upstream repository has moved, URLs changed accordingly * journaldriver bumped to new upstream release The new release includes an important workaround for an issue that could cause log-forwarding to fail after service restarts due to invalid journal cursors being persisted. --- nixos/modules/services/logging/journaldriver.nix | 2 +- pkgs/tools/misc/journaldriver/default.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix index 74ac3d4c2365..9bd581e9ec0e 100644 --- a/nixos/modules/services/logging/journaldriver.nix +++ b/nixos/modules/services/logging/journaldriver.nix @@ -7,7 +7,7 @@ # to be set. # # For further information please consult the documentation in the -# upstream repository at: https://github.com/aprilabank/journaldriver/ +# upstream repository at: https://github.com/tazjin/journaldriver/ { config, lib, pkgs, ...}: diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index 58c9ee770b7f..e97f4048f0ff 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { name = "journaldriver-${version}"; - version = "1.0.0"; - cargoSha256 = "04llhriwsrjqnkbjgd22nhci6zmhadclnd8r2bw5092gwdamf49k"; + version = "1.1.0"; + cargoSha256 = "03rq96hzv97wh2gbzi8sz796bqgh6pbpvdn0zy6zgq2f2sgkavsl"; src = fetchFromGitHub { - owner = "aprilabank"; + owner = "tazjin"; repo = "journaldriver"; rev = "v${version}"; - sha256 = "1163ghf7dxxchyawdaa7zdi8ly2pxmc005c2k549larbirjjbmgc"; + sha256 = "0672iq6s9klb1p37hciyl7snbjgjw98kwrbfkypv07lplc5qcnrf"; }; buildInputs = [ openssl systemd ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Log forwarder from journald to Stackdriver Logging"; - homepage = "https://github.com/aprilabank/journaldriver"; + homepage = "https://github.com/tazjin/journaldriver"; license = licenses.gpl3; maintainers = [ maintainers.tazjin ]; platforms = platforms.linux; From 205b3d94e13324fe5af8a6c692e41e294b68eb83 Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Wed, 10 Oct 2018 00:18:54 +0200 Subject: [PATCH 331/992] nginxMainline: 1.15.3 -> 1.15.5 (#48127) --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 49f212a8fe57..f830f0acee35 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.15.3"; - sha256 = "11dysslkz76cdzhshc6w5qivdplk10pjpb73li0d1sz2qf8zp4ck"; + version = "1.15.5"; + sha256 = "0vxfbnc1794al60d9mhjw1w72x5jslfwq51vvs38568liyd8hfhs"; }) From f9ba5e9407a313c7640349cf439d61d51a8b99f5 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 10 Oct 2018 07:28:07 +0900 Subject: [PATCH 332/992] accountsservice: 0.6.50 -> 0.6.54 (#48112) --- .../libraries/accountsservice/default.nix | 18 ++++++++----- .../accountsservice/no-create-dirs.patch | 26 ++++++++++--------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 36d7912d0f8a..66d540f8d66b 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -1,22 +1,26 @@ { stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper, shadow -, libtool, gobjectIntrospection, polkit, systemd, coreutils }: +, gobjectIntrospection, polkit, systemd, coreutils, meson, dbus +, ninja, python3 }: stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.50"; + version = "0.6.54"; src = fetchurl { url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "0jn7vg1z4vxnna0hl33hbcb4bb3zpilxc2vyclh24vx4vvsjhn83"; + sha256 = "1b115n0a4yfa06kgxc69qfc1rc0w4frgs3id3029czkrhhn0ds96"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper meson ninja python3 ]; - buildInputs = [ glib intltool libtool gobjectIntrospection polkit systemd ]; + buildInputs = [ glib intltool gobjectIntrospection polkit systemd dbus ]; - configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--localstatedir=/var" ]; + mesonFlags = [ "-Dsystemdsystemunitdir=etc/systemd/system" + "-Dlocalstatedir=/var" ]; prePatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + substituteInPlace src/daemon.c --replace '"/usr/sbin/useradd"' '"${shadow}/bin/useradd"' \ --replace '"/usr/sbin/userdel"' '"${shadow}/bin/userdel"' substituteInPlace src/user.c --replace '"/usr/sbin/usermod"' '"${shadow}/bin/usermod"' \ diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch index f26f5c738227..ef1a59b0249f 100644 --- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch +++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch @@ -1,13 +1,15 @@ ---- a/src/Makefile.in 2014-04-23 22:30:00.276005326 +0200 -+++ b/src/Makefile.in 2014-04-23 22:30:16.809409113 +0200 -@@ -881,8 +881,8 @@ - gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml +diff --git a/meson_post_install.py b/meson_post_install.py +index ba95055..17f7926 100644 +--- a/meson_post_install.py ++++ b/meson_post_install.py +@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1]) + # FIXME: meson will not track the creation of these directories + # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39 + dst_dirs = [ +- os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), +- os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), ++ #os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), ++ #os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), + ] - install-data-hook: -- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users" -- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons" -+# $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users" -+# $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons" - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. + for dst_dir in dst_dirs: From 6424a1425c09f789b3e0fca3b9650e0ecb71e3ca Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Oct 2018 17:36:03 -0500 Subject: [PATCH 333/992] gpgme: 1.11.1 -> 1.12.0 https://lists.gnupg.org/pipermail/gnupg-announce/2018q4/000429.html --- pkgs/development/libraries/gpgme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 416ecb5631ed..04ceea137cdd 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { name = "gpgme-${version}"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "0vxx5xaag3rhp4g2arp5qm77gvz4kj0m3hnpvhkdvqyjfhbi26rd"; + sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l"; }; outputs = [ "out" "dev" "info" ]; From 0f2869a8063daff487fb0d69ea53a7a568c7afb1 Mon Sep 17 00:00:00 2001 From: Lassulus Date: Wed, 10 Oct 2018 01:24:58 +0200 Subject: [PATCH 334/992] quickserve: init at 2018 (#48083) --- pkgs/tools/networking/quickserve/default.nix | 35 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/networking/quickserve/default.nix diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix new file mode 100644 index 000000000000..06e5918dccd8 --- /dev/null +++ b/pkgs/tools/networking/quickserve/default.nix @@ -0,0 +1,35 @@ +{ stdenv, makeWrapper, fetchzip, python3, python3Packages, writeScript }: +let + threaded_servers = python3Packages.buildPythonPackage { + name = "threaded_servers"; + src = fetchzip { + url = https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz; + sha256 = "1irliz90a1dk4lyl7mrfq8qnnrfad9czvbcw1spc13zyai66iyhf"; + }; + + # stuff we don't care about pacserve + doCheck = false; + }; + wrappedPython = python3.withPackages (_: [ threaded_servers ]); +in stdenv.mkDerivation { + name = "quickserve"; + version = "2018"; + + unpackPhase = ":"; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + makeWrapper ${wrappedPython}/bin/python $out/bin/quickserve \ + --add-flags -mThreadedServers.PeeredQuickserve + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A simple HTTP server for quickly sharing files."; + homepage = https://xyne.archlinux.ca/projects/quickserve/; + license = licenses.gpl2; + maintainers = with maintainers; [ lassulus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8a54a8b6827..392102b4285e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4925,6 +4925,8 @@ with pkgs; qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + quickserve = callPackage ../tools/networking/quickserve { }; + quicktun = callPackage ../tools/networking/quicktun { }; quilt = callPackage ../development/tools/quilt { }; From cd1f5914bdecd4f9a2faed3ca285a330e367f8ef Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 9 Oct 2018 21:02:27 -0400 Subject: [PATCH 335/992] pythonPackages.atom: init at 0.4.1 --- .../python-modules/atom/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/atom/default.nix diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix new file mode 100644 index 000000000000..0a7dbf561a0f --- /dev/null +++ b/pkgs/development/python-modules/atom/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, future }: + +buildPythonPackage rec { + pname = "atom"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0awzja4k3f32y01gd068yyxvh35km62m4wka0vbg1yyy37ahgjmv"; + }; + + propagatedBuildInputs = [ future ]; + + # Tests not released to pypi + doCheck = true; + + meta = with lib; { + description = "Memory efficient Python objects"; + maintainers = [ maintainers.bhipple ]; + homepage = https://github.com/nucleic/atom; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7445c6d8bb..eafa80eb131e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -190,7 +190,9 @@ in { astral = callPackage ../development/python-modules/astral { }; - astropy = callPackage ../development/python-modules/astropy { }; + astropy = callPackage ../development/python-modules/astropy { }; + + atom = callPackage ../development/python-modules/atom { }; augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; From b721a1b9a91a0a6b203be286dedd37dfbd9f3f7c Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 9 Oct 2018 21:23:37 -0400 Subject: [PATCH 336/992] pytest: add license --- pkgs/development/python-modules/pytest/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 6146159ad0ab..deb9cbdb7d0a 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -37,8 +37,10 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; - platforms = platforms.unix; + homepage = https://docs.pytest.org; description = "Framework for writing tests"; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = licenses.mit; + platforms = platforms.unix; }; } From 3ec3116faeb2daf6b970aa95e9956ea8d0bdf1dd Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 9 Oct 2018 21:27:05 -0400 Subject: [PATCH 337/992] harfbuzz: add license --- pkgs/development/libraries/harfbuzz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 383f7f60f9bf..b3ab9c7881a9 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation { homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz; downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/"; maintainers = [ maintainers.eelco ]; + license = licenses.mit; platforms = with platforms; linux ++ darwin; inherit version; updateWalker = true; From 87a089bacc358d7d8c788105090d34c5cbb50bde Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 9 Oct 2018 21:29:08 -0400 Subject: [PATCH 338/992] xen: add license --- pkgs/applications/virtualization/xen/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 6d0344d46865..968d998792df 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -234,5 +234,6 @@ stdenv.mkDerivation (rec { + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.''); platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ]; + license = stdenv.lib.licenses.gpl2; } // (config.meta or {}); } // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) From d78da463c52cf54fa6d24a0cb4860538b124f962 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 9 Oct 2018 21:35:12 -0400 Subject: [PATCH 339/992] par: add license --- pkgs/tools/text/par/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index c7a686201b0d..5f9ca5212d30 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -28,9 +28,11 @@ stdenv.mkDerivation { ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.nicemice.net/par/; description = "Paragraph reflow for email"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + # See https://fedoraproject.org/wiki/Licensing/Par for license details + license = licenses.free; }; } From b10940cd2367c3331ddb8961ebd8fbd842242ccd Mon Sep 17 00:00:00 2001 From: Free Potion <42352817+freepotion@users.noreply.github.com> Date: Wed, 10 Oct 2018 04:45:38 +0300 Subject: [PATCH 340/992] boohu: leave one package There will be only one version of the package with the fewest external dependencies. --- pkgs/games/boohu/default.nix | 14 ++++---------- pkgs/games/boohu/deps.nix | 20 -------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 pkgs/games/boohu/deps.nix diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 6d4129edbd00..92eccd67a1f1 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -1,8 +1,8 @@ -{stdenv, lib, fetchurl, buildGoPackage, ansiTag ? false}: +{stdenv, fetchurl, buildGoPackage}: buildGoPackage rec { - name = if ansiTag then "boohu-ansi-${version}" else "boohu-${version}"; + name = "boohu-${version}"; version = "0.10.0"; goPackagePath = "git.tuxfamily.org/boohu/boohu.git"; @@ -12,15 +12,9 @@ buildGoPackage rec { sha256 = "a4d1fc488cfeecbe0a5e9be1836d680951941014f926351692a8dbed9042eba6"; }; - goDeps = ./deps.nix; + buildFlags = "--tags ansi"; - # If ansiTag is true, the "--tags ansi" will be passed - buildFlags = if ansiTag then "--tags ansi" else ""; - - # If ansiTag is true, binary output file name will be "boohu-ansi". - # Otherwise it will be "boohu". - postInstall = if ansiTag then "mv $bin/bin/boohu.git $bin/bin/boohu-ansi" - else "mv $bin/bin/boohu.git $bin/bin/boohu"; + postInstall = "mv $bin/bin/boohu.git $bin/bin/boohu"; meta = with stdenv.lib; { description = "A new roguelike game"; diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix deleted file mode 100644 index 8b6b32811938..000000000000 --- a/pkgs/games/boohu/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "b66b20ab708e289ff1eb3e218478302e6aec28ce"; - sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index becd4148f1f6..f3e54fa8d76d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19933,8 +19933,6 @@ with pkgs; boohu = callPackage ../games/boohu { }; - boohu-ansi = callPackage ../games/boohu { ansiTag = true; }; - braincurses = callPackage ../games/braincurses { }; brogue = callPackage ../games/brogue { }; From 804c227b83faa017c377eb899d18e5931e0ad936 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 10 Oct 2018 16:06:06 +0800 Subject: [PATCH 341/992] uchiwa: 1.2.0 -> 1.3.1 --- pkgs/servers/monitoring/uchiwa/bower-packages.nix | 4 ++-- pkgs/servers/monitoring/uchiwa/src.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index f18ea3875516..a8180c5de3dc 100644 --- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -1,7 +1,7 @@ # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix) { fetchbower, buildEnv }: buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ - (fetchbower "uchiwa-web" "1.2.0" "1.2.0" "0733ha6bahzg9qlvhz75agi8hwwqdk99hfx9j8dhpdf1v5xkj2fz") + (fetchbower "uchiwa-web" "1.3.1" "1.3.1" "0vhfwm4z3d4v4p2vfq1vvk4fifxm43f8lyccwpgmw153z4gj14gk") (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws") (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d") (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn") @@ -19,7 +19,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3") (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71") (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb") - (fetchbower "ua-parser-js" "0.7.17" "~0.7.12" "1dx46rm9han9fj409rjxrlnrk9zxmaqbnn62ljnh32ihngd4yxh0") + (fetchbower "ua-parser-js" "0.7.18" "~0.7.12" "0qi7y5yrsdh2brpmwx0xs53bzr4pja5x1k2875x6zh259ag3zdkn") (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x") (fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx") ]; } diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix index 0cf6815fbe5d..51c343d01da8 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "1.2.0-1"; - sha256 = "1gj9cr0gkiivxdlq7ha6gxq9s8s26j79crijkrlrsqpg59jz063p"; + version = "1.3.1-1"; + sha256 = "1cjb7k19iy79hh9gbjx67yrz44y92s516d0h403bf6w272g23yzi"; } From 018573b7579b4212d7001bf6f0e9b31e1bdadb14 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 10 Oct 2018 01:20:42 +0200 Subject: [PATCH 342/992] nixos/weechat: add setuid wrapper for `screen' to ensure true multiuser capabilities Previously you either had to set the setuid bit yourself or workaround `isSystemUser = true` (for a loginable shell) to access the weechat screen. `programs.screen` shouldn't do this by default to avoid taking too much assumptions about the setup, however `services.weechat` explicitly requires tihs. See #45728 --- nixos/modules/services/misc/weechat.nix | 4 +++- nixos/modules/services/misc/weechat.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix index 1fcfb440485d..c6ff540ea12f 100644 --- a/nixos/modules/services/misc/weechat.nix +++ b/nixos/modules/services/misc/weechat.nix @@ -46,10 +46,12 @@ in Group = "weechat"; RemainAfterExit = "yes"; }; - script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}"; + script = "exec ${config.security.wrapperDir}/screen -Dm -S ${cfg.sessionName} ${cfg.binary}"; wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; }; + + security.wrappers.screen.source = "${pkgs.screen}/bin/screen"; }; meta.doc = ./weechat.xml; diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml index 9c9ee0448c92..b7f755bbc5c7 100644 --- a/nixos/modules/services/misc/weechat.xml +++ b/nixos/modules/services/misc/weechat.xml @@ -54,7 +54,7 @@ Now, the session can be re-attached like this: -screen -r weechat-screen +screen -x weechat/weechat-screen From d3b79965df495f09d37fa5216a7dd271d000589b Mon Sep 17 00:00:00 2001 From: Renaud Date: Wed, 10 Oct 2018 12:53:48 +0200 Subject: [PATCH 343/992] Revert "Increase Virtualbox disk image size" (#48151) --- nixos/modules/virtualisation/virtualbox-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 3d4c06f1f23f..60048911658c 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -12,7 +12,7 @@ in { virtualbox = { baseImageSize = mkOption { type = types.int; - default = 100 * 1024; + default = 10 * 1024; description = '' The size of the VirtualBox base image in MiB. ''; From 11c17034b6bb89aff62eed3ab285fa420e6c3ecb Mon Sep 17 00:00:00 2001 From: pandaman64 Date: Mon, 8 Oct 2018 09:16:13 +0900 Subject: [PATCH 344/992] ibmquantumexperience: 2.0.2 -> 2.0.3 --- .../python-modules/ibmquantumexperience/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix index 82f6cb144ac7..22b809c46c20 100644 --- a/pkgs/development/python-modules/ibmquantumexperience/default.nix +++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "IBMQuantumExperience"; - version = "2.0.2"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "f2a5662d7457c297af0751985979e64a88569beb07cfedad0ce1dfa5a7237842"; + sha256 = "c5dbcc140344c7bdf545ad59db87f31a90ca35107c40d6cae1489bb997a47ba9"; }; propagatedBuildInputs = [ From ce5e1b5b0a8e524d6ca5c5b48f6e41debe866f2a Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 8 Oct 2018 22:14:29 +0200 Subject: [PATCH 345/992] codimd: update patch --- pkgs/servers/web-apps/codimd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix index d99542d3ea27..e9f5e0898720 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/codimd/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { # fixes for configurable paths url = "https://patch-diff.githubusercontent.com/raw/hackmdio/codimd/pull/940.patch"; - sha256 = "0n9lfaxirngywx8m5f0nqzykqdjzc8f3cl10ir1g7s5kq4zc7hhn"; + sha256 = "0w1cvnp3k1n8690gzlrfijisn182i0v8psjs3df394rfx2347xyp"; }) ]; From cf4742365012a6718de0a2bee991066ae0e9697d Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 8 Oct 2018 22:15:18 +0200 Subject: [PATCH 346/992] nixos/tests: fix non-determinism for good --- nixos/tests/codimd.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/tests/codimd.nix b/nixos/tests/codimd.nix index 9dedac96844a..562f6f24f999 100644 --- a/nixos/tests/codimd.nix +++ b/nixos/tests/codimd.nix @@ -40,8 +40,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: subtest "CodiMD sqlite", sub { $codimdSqlite->waitForUnit("codimd.service"); $codimdSqlite->waitForOpenPort(3000); - $codimdSqlite->sleep(10); # avoid 503 during startup - $codimdSqlite->succeed("curl -sSf http://localhost:3000/new"); + $codimdSqlite->waitUntilSucceeds("curl -sSf http://localhost:3000/new"); }; subtest "CodiMD postgres", sub { @@ -49,8 +48,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: $codimdPostgres->waitForUnit("codimd.service"); $codimdPostgres->waitForOpenPort(5432); $codimdPostgres->waitForOpenPort(3000); - $codimdPostgres->sleep(10); # avoid 503 during startup - $codimdPostgres->succeed("curl -sSf http://localhost:3000/new"); + $codimdPostgres->waitUntilSucceeds("curl -sSf http://localhost:3000/new"); }; ''; }) From d66ce10ce63c409ae98de14b815e8fa995b0ccaa Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 10 Oct 2018 08:59:24 -0400 Subject: [PATCH 347/992] Remove .dir-locals.el --- .dir-locals.el | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .dir-locals.el diff --git a/.dir-locals.el b/.dir-locals.el deleted file mode 100644 index a53c8aa6db54..000000000000 --- a/.dir-locals.el +++ /dev/null @@ -1,8 +0,0 @@ -;;; Directory Local Variables -;;; For more information see (info "(emacs) Directory Variables") - -((nil - (bug-reference-bug-regexp . "\\(\\(?:[Ii]ssue \\|[Ff]ixe[ds] \\|[Rr]esolve[ds]? \\|[Cc]lose[ds]? \\|[Pp]\\(?:ull [Rr]equest\\|[Rr]\\) \\|(\\)#\\([0-9]+\\))?\\)") - (bug-reference-url-format . "https://github.com/NixOS/nixpkgs/issues/%s")) - (nix-mode - (tab-width . 2))) From e79623115f1ad5736154f7ef36b21cac84eab29b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Oct 2018 09:27:50 -0700 Subject: [PATCH 348/992] libdap: 3.19.1 -> 3.20.0 * libdap: 3.19.1 -> 3.20.0 (#47785) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libdap/versions * libdap: homepage has moved --- pkgs/development/libraries/libdap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 5a0006ad6c6e..d399998455e1 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.19.1"; + version = "3.20.0"; name = "libdap-${version}"; nativeBuildInputs = [ bison flex ]; @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "0gnki93z3kkzp65x7n1kancy7bd503j4qja5fhzvm1gkmi5l65aj"; + sha256 = "0cr3d7dlzq583dqqrkbs1bkcrwag4hp7hwrx5c0mjk7q4vrslh92"; }; meta = with stdenv.lib; { description = "A C++ SDK which contains an implementation of DAP"; - homepage = https://www.opendap.org/download/libdap; + homepage = https://www.opendap.org/software/libdap; license = licenses.lgpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; From 1ba4d23c3a1409c954bca89e69fe04a5ce9a1517 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 10 Oct 2018 10:00:23 -0700 Subject: [PATCH 349/992] Revert "coqPackages.fiat_HEAD: Update 2016-10-24 -> 2018-02-27" This reverts commit f5f71c08cdbf1f66b654a1321460b6a7d771c26a, due to insufficient testing. --- pkgs/development/coq-modules/fiat/HEAD.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index bc5c0fdd6bb7..b970747c7726 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -1,23 +1,22 @@ -{stdenv, fetchgit, coq, ocamlPackages, python27}: +{stdenv, fetchgit, coq, python27}: stdenv.mkDerivation rec { name = "coq-fiat-${coq.coq-version}-unstable-${version}"; - version = "2018-02-27"; + version = "2016-10-24"; src = fetchgit { url = "https://github.com/mit-plv/fiat.git"; - rev = "253fc133397f73d6daed0b9518ca7ab5507a1cb0"; - sha256 = "0b5z7nz0cr1s7vy04s996dj0pd7ljqx6g5a8syh4hy2z87ijkjzd"; + rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a"; + sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64"; }; - buildInputs = [ ocamlPackages.ocaml ocamlPackages.camlp5_transitional - ocamlPackages.findlib python27 ]; + buildInputs = [ coq.ocaml coq.camlp5 python27 ]; propagatedBuildInputs = [ coq ]; doCheck = false; - enableParallelBuilding = true; + enableParallelBuilding = false; buildPhase = "make -j$NIX_BUILD_CORES"; installPhase = '' @@ -34,6 +33,6 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + compatibleCoqVersions = v: v == "8.5"; }; } From fc29f68e3f2af611f3d253b8fa9fc59ba227bebb Mon Sep 17 00:00:00 2001 From: rys ostrovid Date: Wed, 10 Oct 2018 19:01:29 +0200 Subject: [PATCH 350/992] openra: 20180307 -> 20180923 (#47545) --- pkgs/games/openra/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 069ed900e8f0..d0649237b127 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "openra-${version}"; - version = "20180307"; + version = "20180923"; meta = with stdenv.lib; { description = "Real Time Strategy game engine recreating the C&C titles"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "OpenRA"; repo = "OpenRA"; rev = "release-${version}"; - sha256 = "05c6vrmlgzfxgfx1idqmp6czmr079px3n57q5ahnwzqvcl11a2jj"; + sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5"; extraPostFetch = '' sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh @@ -64,7 +64,8 @@ stdenv.mkDerivation rec { in '' wrapProgram $out/lib/openra/launch-game.sh \ --prefix PATH : "${binaries}" \ - --prefix LD_LIBRARY_PATH : "${runtime}" + --prefix LD_LIBRARY_PATH : "${runtime}" \ + --set TERM "xterm" mkdir -p $out/bin makeWrapper $out/lib/openra/launch-game.sh $out/bin/openra --run "cd $out/lib/openra" From 61c83b108d4141d57c242aa769caca9a55411ed0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 13:10:47 -0400 Subject: [PATCH 351/992] pythonPackages.escapism: 0.0.1 -> 1.0.0 move to python-modules --- .../python-modules/escapism/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +--------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/escapism/default.nix diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix new file mode 100644 index 000000000000..b2ac36582357 --- /dev/null +++ b/pkgs/development/python-modules/escapism/default.nix @@ -0,0 +1,24 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "escapism"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "5f1cc1fa04a95f5b85b3da194750f8a71846d493ea332f62e8798949f10c9b86"; + }; + + # No tests distributed + doCheck = false; + + meta = with pkgs.lib; { + description = "Simple, generic API for escaping strings"; + homepage = "https://github.com/minrk/escapism"; + license = licenses.mit; + maintainers = with maintainers; [ bzizou ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7445c6d8bb..c89de5708256 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2223,25 +2223,7 @@ in { enzyme = callPackage ../development/python-modules/enzyme {}; - escapism = buildPythonPackage rec { - name = "escapism-${version}"; - version = "0.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/e/escapism/${name}.tar.gz"; - sha256 = "1yfyxwxb864xrmrrqgp85xgsh4yrrq5mmzvkdg19jwr7rm6sqx9p"; - }; - - # No tests distributed - doCheck = false; - - meta = { - description = "Simple, generic API for escaping strings"; - homepage = "https://github.com/minrk/escapism"; - license = licenses.mit; - maintainers = with maintainers; [ bzizou ]; - }; - }; + escapism = callPackage ../development/python-modules/escapism { }; etcd = buildPythonPackage rec { name = "etcd-${version}"; From 1c7c1be1a8a3324dfdc4f01945661a0246d92331 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 8 Oct 2018 16:34:46 +0000 Subject: [PATCH 352/992] ocamlPackages.merlin: 3.1.0 -> 3.2.1 --- pkgs/development/tools/ocaml/merlin/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 4ad1bfb3234d..d74b480c9c5a 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchzip, ocaml, findlib, yojson -, withEmacsMode ? false, emacs }: +{ stdenv, fetchzip, ocaml, findlib, dune, yojson }: assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.1.0"; + version = "3.2.1"; in stdenv.mkDerivation { @@ -13,15 +12,12 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "1vf0c2mmflp94r8hshb44lsvnfdy03ld6mld2n79cdxr3zl24ci2"; + sha256 = "1szv2b7d12ll5n6pvnhlv3a6vnlyrkpya4l9fiyyiwyvgd4xzxwf"; }; - buildInputs = [ ocaml findlib yojson ] - ++ stdenv.lib.optional withEmacsMode emacs; + buildInputs = [ ocaml findlib dune yojson ]; - preConfigure = "mkdir -p $out/bin"; - prefixKey = "--prefix "; - configureFlags = stdenv.lib.optional withEmacsMode "--enable-compiled-emacs-mode"; + inherit (dune) installPhase; meta = with stdenv.lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; From de2a995c83511ab88e9f13b298c350467b3f2ec8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 13:32:38 -0400 Subject: [PATCH 353/992] pythonPackages.facebook-sdk: 0.3.0 -> 3.0.0 refactor move to python-modules --- .../python-modules/facebook-sdk/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +--------- 2 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/facebook-sdk/default.nix diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix new file mode 100644 index 000000000000..249acb262fba --- /dev/null +++ b/pkgs/development/python-modules/facebook-sdk/default.nix @@ -0,0 +1,32 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, requests +, python +}: + +buildPythonPackage rec { + pname = "facebook-sdk"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "f3d450ec313b62d3716fadc4e5098183760e1d2a9e0434a94b74e59ea6ea3e4d"; + }; + + propagatedBuildInputs = [ requests ]; + + # checks require network + doCheck = false; + + checkPhase = '' + ${python.interpreter} test/test_facebook.py + ''; + + meta = with pkgs.lib; { + description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; + homepage = https://github.com/pythonforfacebook/facebook-sdk; + license = licenses.asl20 ; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7445c6d8bb..a15295db93b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2367,22 +2367,7 @@ in { ezdxf = callPackage ../development/python-modules/ezdxf {}; - facebook-sdk = buildPythonPackage rec { - name = "facebook-sdk-0.4.0"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/facebook-sdk/facebook-sdk-0.4.0.tar.gz"; - sha256 = "5a96c54d06213039dff1fe1fabc51972e394666cd6d83ea70f7c2e67472d9b72"; - }; - - meta = with pkgs.stdenv.lib; { - description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; - homepage = https://github.com/pythonforfacebook/facebook-sdk; - license = licenses.asl20 ; - }; - }; + facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; face_recognition = callPackage ../development/python-modules/face_recognition { }; From 7ac0a231949f23a716e379dfab5aed4d179acc4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 10 Oct 2018 16:24:24 +0200 Subject: [PATCH 354/992] prooftree: 0.12 -> 0.13 --- pkgs/applications/science/logic/prooftree/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 2d5fcfd2d261..a88a84e3b0d1 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (rec { name = "prooftree-${version}"; - version = "0.12"; + version = "0.13"; src = fetchurl { url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; - sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m"; + sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3e54fa8d76d..7596a49bae29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21277,10 +21277,9 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = (with ocaml-ng.ocamlPackages_4_01_0; - callPackage ../applications/science/logic/prooftree { - camlp5 = camlp5_transitional; - }); + prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { + camlp5 = ocamlPackages.camlp5_strict; + }; prover9 = callPackage ../applications/science/logic/prover9 { }; From eaf0de5985ef1316323c7da4026ed268399a3589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 10 Oct 2018 16:32:05 +0200 Subject: [PATCH 355/992] ulex: remove version 0.8 --- .../ocaml-modules/ulex/0.8/camlp5.patch | 72 ------------------- .../ocaml-modules/ulex/0.8/default.nix | 36 ---------- .../ocaml-modules/ulex/0.8/meta_version.patch | 10 --- pkgs/top-level/ocaml-packages.nix | 4 -- 4 files changed, 122 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch delete mode 100644 pkgs/development/ocaml-modules/ulex/0.8/default.nix delete mode 100644 pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch diff --git a/pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch b/pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch deleted file mode 100644 index 2fa92527035e..000000000000 --- a/pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch +++ /dev/null @@ -1,72 +0,0 @@ -Author: Stefano Zacchiroli -Description: build (and install) using camlp5 instead of camlp4 ---- ulex0.8.orig/META -+++ ulex0.8/META -@@ -1,5 +1,5 @@ - version = "0.8" --requires = "camlp4" -+requires = "camlp5" - description = "Runtime support for ulex" - archive(byte) = "ulexing.cma" - archive(native) = "ulexing.cmxa" ---- ulex0.8.orig/Makefile -+++ ulex0.8/Makefile -@@ -20,7 +20,7 @@ - ocamlopt -a -o ulexing.cmxa $(ULEXING) - - pa_ulex.cma: $(ULEX) -- ocamlc -a -o pa_ulex.cma -pp 'camlp4o pa_extend.cmo q_MLast.cmo' -I +camlp4 $(ULEX) -+ ocamlc -a -o pa_ulex.cma -pp 'camlp5o pa_extend.cmo q_MLast.cmo' -I `camlp5 -where` $(ULEX) - - pa_ulex.ml: pa_ulex.ml.src - ocaml mk_pa_ulex.ml -@@ -29,14 +29,14 @@ - rm -f *.cm* *~ test custom_ulexing *.o *.a *.html *.css pa_ulex.ml - - view_test: pa_ulex.cma -- camlp4o ./pa_ulex.cma pr_o.cmo -sep "\n" test.ml -+ camlp5o ./pa_ulex.cma pr_o.cmo -sep "\n" test.ml - - run_test: ulexing.cma pa_ulex.cma -- ocamlc -o test -pp 'camlp4o ./pa_ulex.cma' ulexing.cma test.ml -+ ocamlc -o test -pp 'camlp5o ./pa_ulex.cma' ulexing.cma test.ml - ./test - - custom_ulexing: ulexing.cma pa_ulex.cma -- ocamlc -o custom_ulexing -pp 'camlp4o ./pa_ulex.cma' ulexing.cma custom_ulexing.ml -+ ocamlc -o custom_ulexing -pp 'camlp5o ./pa_ulex.cma' ulexing.cma custom_ulexing.ml - - - doc: ---- ulex0.8.orig/README -+++ ulex0.8/README -@@ -142,7 +142,7 @@ - - Compilation of OCaml files with lexer specifications: - -- ocamlfind ocamlc -c -package ulex -syntax camlp4o my_file.ml -+ ocamlfind ocamlc -c -package ulex -syntax camlp5o my_file.ml - - When linking, you must also include the ulex package: - ocamlfind ocamlc -o my_prog -linkpkg -package ulex my_file.cmo ---- ulex0.8.orig/mk_pa_ulex.ml -+++ ulex0.8/mk_pa_ulex.ml -@@ -1,10 +1,4 @@ - let s = float_of_string (String.sub (Sys.ocaml_version) 0 4) in --if (s < 3.09) then ( - print_endline "Old camlp4 (loc)"; - Sys.command "sed s/_loc/loc/ < pa_ulex.ml.src > pa_ulex.ml" --) --else ( -- print_endline "New camlp4 (_loc)"; -- Sys.command "cp pa_ulex.ml.src pa_ulex.ml" --) - ---- ulex0.8.orig/pa_ulex.ml.src -+++ ulex0.8/pa_ulex.ml.src -@@ -1,4 +1,4 @@ --let _loc = (Lexing.dummy_pos,Lexing.dummy_pos) -+let _loc = Stdpp.dummy_loc - - (* Named regexp *) - diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix deleted file mode 100644 index 6c0cf9214f29..000000000000 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{stdenv, fetchurl, ocaml, findlib, camlp5 }: - -let - pname = "ulex"; -in - -if stdenv.lib.versionAtLeast ocaml.version "4.06" -then throw "ulex-0.8 is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "0.8"; - - src = fetchurl { - url = "http://www.cduce.org/download/old/${pname}-${version}.tar.gz"; - sha256 = "19faabg8hzz155xlzmjwsl59d7slahb5m1l9zh1fqvvpp81r26cp"; - }; - - buildInputs = [ocaml findlib camlp5]; - - createFindlibDestdir = true; - - patches = [ ./meta_version.patch ./camlp5.patch ]; - - propagatedBuildInputs = [ camlp5 ]; - - buildFlags = "all all.opt"; - - meta = { - homepage = http://www.cduce.org/download.html; - description = "A lexer generator for Unicode and OCaml"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - }; -} diff --git a/pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch b/pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch deleted file mode 100644 index 7a39510cf0b4..000000000000 --- a/pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch +++ /dev/null @@ -1,10 +0,0 @@ -Author: Stefano Zacchiroli -Description: fix a typo in the findlib package version number specified in META ---- ulex0.8.orig/META -+++ ulex0.8/META -@@ -1,4 +1,4 @@ --version = "0.7" -+version = "0.8" - requires = "camlp4" - description = "Runtime support for ulex" - archive(byte) = "ulexing.cma" diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5f6d6fc9bc1d..0840aa66100b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -592,10 +592,6 @@ let ulex = callPackage ../development/ocaml-modules/ulex { }; - ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 { - camlp5 = camlp5_transitional; - }; - textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; tls = callPackage ../development/ocaml-modules/tls { From 2fdd38ed2df0f6df08154a8982c87d77b9ca7b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 10 Oct 2018 17:27:19 +0200 Subject: [PATCH 356/992] camlp5_transitional: remove in favor of camlp5 (strict) --- pkgs/applications/science/logic/coq/default.nix | 7 +++---- pkgs/development/ocaml-modules/elpi/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- pkgs/top-level/coq-packages.nix | 3 +-- pkgs/top-level/ocaml-packages.nix | 16 ++++------------ 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 0ede4230aa6d..23f1ff85edf0 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -27,7 +27,6 @@ let "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; }."${version}"; coq-version = builtins.substring 0 3 version; - camlp5 = ocamlPackages.camlp5_strict; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; csdpPatch = if csdp != null then '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" @@ -37,8 +36,8 @@ self = stdenv.mkDerivation { name = "coq-${version}"; passthru = { - inherit coq-version camlp5; - inherit (ocamlPackages) ocaml findlib num; + inherit coq-version; + inherit (ocamlPackages) ocaml camlp5 findlib num; emacsBufferSetup = pkgs: '' ; Propagate coq paths to children (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") @@ -93,7 +92,7 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.num ] + buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ]) ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; postPatch = '' diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index db188a720b88..3eecb9b45b7d 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5_strict +{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5 , ppx_tools_versioned, ppx_deriving, re }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ppx_tools_versioned ]; - propagatedBuildInputs = [ camlp5_strict ppx_deriving re ]; + propagatedBuildInputs = [ camlp5 ppx_deriving re ]; createFindlibDestdir = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7596a49bae29..f6db3528430e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21277,9 +21277,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { - camlp5 = ocamlPackages.camlp5_strict; - }; + prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { }; prover9 = callPackage ../applications/science/logic/prover9 { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 305d9ba351ba..ca367aeb0d1a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -56,8 +56,7 @@ in rec { filterCoqPackages coq self; coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { - inherit (ocamlPackages_4_02) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_02.camlp5_transitional; + inherit (ocamlPackages_4_02) ocaml findlib lablgtk camlp5; }; coq_8_5 = callPackage ../applications/science/logic/coq { ocamlPackages = ocamlPackages_4_05; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0840aa66100b..c9df0f908ee2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -88,15 +88,10 @@ let then callPackage ../development/tools/ocaml/camlp4 { } else null; - camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { }; + camlp5 = callPackage ../development/tools/ocaml/camlp5 { }; - camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 { - transitional = true; - }; - - camlp5_strict = camlp5_6_strict; - - camlp5_transitional = camlp5_6_transitional; + # Compatibility alias + camlp5_strict = camlp5; camlpdf = callPackage ../development/ocaml-modules/camlpdf { }; @@ -1042,10 +1037,7 @@ let enableX11 = config.unison.enableX11 or true; }; - hol_light = callPackage ../applications/science/logic/hol_light { - inherit num; - camlp5 = camlp5_strict; - }; + hol_light = callPackage ../applications/science/logic/hol_light { }; }; in (ocamlPackages.janeStreet // ocamlPackages); From 9fd53e02ad12d63de44c72b03d62ccbc657da1a5 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 10 Oct 2018 20:15:14 +0200 Subject: [PATCH 357/992] erlang: temporarily disable wxSupport on darwin Workaround for #48065 --- pkgs/development/interpreters/erlang/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 9393c87b0a88..f6ff1e0db864 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -18,7 +18,7 @@ , enableKernelPoll ? true , javacSupport ? false, javacPackages ? [ openjdk ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] -, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ] +, wxSupport ? !stdenv.isDarwin, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" From f9d247a8d8ae8b4a8a36cc732d56f2e17f18e5a6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 10 Oct 2018 20:15:21 +0200 Subject: [PATCH 358/992] tdesktop: 1.4.0 -> 1.4.2 tdesktopPackages.preview: 1.4.0 -> 1.4.2 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 9b14ac6f2c3c..56bf7ee078db 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.4.0"; - sha256Hash = "1zlsvbk9vgsqwplcswh2q0mqjdqf5md1043paab02wy3qg2x37d8"; + version = "1.4.2"; + sha256Hash = "025qld597b6x7wbf1y1qpcsz0brpf3qsqj650mq9fpps1yi1vfk7"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "388730"; archPatchesHash = "1gvisz36bc6bl4zcpjyyk0a2dl6ixp65an8wgm2lkc9mhkl783q7"; From adc6e9c2c4f4772defc36452e9aaf61da2e99cbc Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Wed, 10 Oct 2018 22:22:04 +0200 Subject: [PATCH 359/992] prometheus_2: 2.3.2 -> 2.4.3 (#48118) --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index b254b8470c42..2430a8cf1711 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -50,7 +50,7 @@ in rec { }; prometheus_2 = generic { - version = "2.3.2"; - sha256 = "09q3p3kvgrvgyfkkvpy2mmlr6jxzxad6nzjni3iycs4bahsxl27a"; + version = "2.4.3"; + sha256 = "1kci2zhh4ixil0b72d138vm8006y117mw51wsyz8j0gyy4180msj"; }; } From 4e7c822dc6bad757f704e3f7a522f19eea8ea2c9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Wed, 10 Oct 2018 16:25:14 -0400 Subject: [PATCH 360/992] grub: fetch from HTTPS instead of FTP; update meta (#48137) HTTPS is unlikely to be worse and is often better than FTP. Aside from being faster, there are many networking setups where outgoing FTP traffic is blocked. --- pkgs/tools/misc/grub/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index f5ba8b7fe100..87e9814d8993 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,12 +1,10 @@ -{stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}: +{ stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }: -let -in stdenv.mkDerivation { name = "grub-0.97-73"; src = fetchurl { - url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; + url = https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; @@ -29,6 +27,8 @@ stdenv.mkDerivation { passthru.grubTarget = ""; meta = with stdenv.lib; { + homepage = https://www.gnu.org/software/grub; + description = "GRand Unified Bootloader"; license = licenses.gpl2; platforms = platforms.linux; }; From 6a5a5b9fa0a0e2865f62de9824835f875c617db9 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 11 Oct 2018 05:46:29 +0900 Subject: [PATCH 361/992] gnome3.gnome-contacts: fix compile failure due to clutter-gtk change (#48135) --- pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index effb3d521ef6..2acf04e657a3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { # /nix/store/*-cheese-3.28.0/include/cheese/cheese-widget.h:26:10: fatal error: clutter-gtk/clutter-gtk.h: No such file or directory # #include # ^~~~~~~~~~~~~~~~~~~~~~~~~~~ - NIX_CFLAGS_COMPILE = "-I${clutter-gtk}/include/clutter-gtk-1.0"; + NIX_CFLAGS_COMPILE = "-I${stdenv.lib.getDev clutter-gtk}/include/clutter-gtk-1.0"; doCheck = true; From fd9518a53272a22c07e20b788200badbb9c597f4 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Wed, 10 Oct 2018 13:52:38 -0700 Subject: [PATCH 362/992] powershell: 6.0.4 -> 6.1.0 (#48130) --- pkgs/shells/powershell/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index a9b34824e494..2c89ea0f2c60 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -4,8 +4,8 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "01j92myljgphf68la9q753m5wgfmd0kwlsk441yic7qshcly5xkw" - else if stdenv.isLinux then "0al1mrlz3m5ksnq86mqm0axb8bjdxa05j2p5y9bmcykrgkdwi3vk" + platformSha = if stdenv.isDarwin then "0jngmqxjiiz5dpgky027wl0s3nn321rxs6kxab27kmp031j65x8g" + else if stdenv.isLinux then "0nmqv32mck16b7zljfpb9ydg3h2jvcqrid9ga2i5wac26x3ix531" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { name = "powershell-${version}"; - version = "6.0.4"; + version = "6.1.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; @@ -25,15 +25,12 @@ stdenv.mkDerivation rec { buildInputs = [ less ] ++ libraries; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - # TODO: remove PAGER after upgrading to v6.1.0-preview.1 or later as it has been addressed in - # https://github.com/PowerShell/PowerShell/pull/6144 installPhase = '' mkdir -p $out/bin mkdir -p $out/share/powershell cp -r * $out/share/powershell - rm $out/share/powershell/DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ - --set PAGER ${less}/bin/less --set TERM xterm + --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 ''; dontStrip = true; From cbda94201cc72384e5128be27c8b5b0d690144de Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Wed, 10 Oct 2018 13:55:14 -0700 Subject: [PATCH 363/992] fastlane: 2.91.0 -> 2.105.2 (#48085) --- pkgs/tools/admin/fastlane/Gemfile.lock | 68 ++++++++------- pkgs/tools/admin/fastlane/gemset.nix | 109 +++++++++++-------------- 2 files changed, 78 insertions(+), 99 deletions(-) diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 9cb80eb131c0..631d9cb9628a 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -4,7 +4,7 @@ GEM CFPropertyList (3.0.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - atomos (0.1.2) + atomos (0.1.3) babosa (1.0.2) claide (1.0.2) colored (1.2) @@ -13,20 +13,20 @@ GEM highline (~> 1.7.2) declarative (0.0.10) declarative-option (0.1.0) - domain_name (0.5.20170404) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - dotenv (2.2.2) + dotenv (2.5.0) emoji_regex (0.1.1) excon (0.62.0) - faraday (0.14.0) + faraday (0.15.3) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - fastimage (2.1.1) - fastlane (2.91.0) + fastimage (2.1.4) + fastlane (2.105.2) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -41,7 +41,7 @@ GEM faraday_middleware (~> 0.9) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.13.1, < 0.14.0) + google-api-client (>= 0.21.2, < 0.24.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) mini_magick (~> 4.5.1) @@ -50,7 +50,7 @@ GEM multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) public_suffix (~> 2.0.0) - rubyzip (>= 1.1.0, < 2.0.0) + rubyzip (>= 1.2.2, < 2.0.0) security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) @@ -59,24 +59,24 @@ GEM tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) - xcodeproj (>= 1.5.7, < 2.0.0) - xcpretty (>= 0.2.4, < 1.0.0) + xcodeproj (>= 1.6.0, < 2.0.0) + xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-api-client (0.13.6) + google-api-client (0.23.9) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.5) + googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - googleauth (0.6.2) + signet (~> 0.9) + googleauth (0.6.6) faraday (~> 0.12) jwt (>= 1.4, < 3.0) - logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) - os (~> 0.9) + os (>= 0.9, < 2.0) signet (~> 0.7) highline (1.7.10) http-cookie (1.0.3) @@ -84,60 +84,56 @@ GEM httpclient (2.8.3) json (2.1.0) jwt (2.1.0) - little-plugger (1.1.4) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) memoist (0.16.0) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mini_magick (4.5.1) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nanaimo (0.2.5) - naturally (2.1.0) - os (0.9.6) + nanaimo (0.2.6) + naturally (2.2.0) + os (1.0.0) plist (3.4.0) public_suffix (2.0.5) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - retriable (3.1.1) + retriable (3.1.2) rouge (2.0.7) - rubyzip (1.2.1) + rubyzip (1.2.2) security (0.1.3) - signet (0.8.1) + signet (0.10.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.3) + simctl (1.6.5) CFPropertyList naturally slack-notifier (2.3.2) terminal-notifier (1.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-cursor (0.5.0) - tty-screen (0.6.4) + tty-cursor (0.6.0) + tty-screen (0.6.5) tty-spinner (0.8.0) tty-cursor (>= 0.5.0) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.3.0) + unicode-display_width (1.4.0) word_wrap (1.0.0) - xcodeproj (1.5.7) + xcodeproj (1.6.0) CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.2) + atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.4) - xcpretty (0.2.8) + nanaimo (~> 0.2.6) + xcpretty (0.3.0) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.0) xcpretty (~> 0.2, >= 0.0.7) @@ -149,4 +145,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 1.14.6 + 1.16.3 diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 4a0d0467d804..c2133c7c8c9c 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -11,10 +11,10 @@ atomos = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10z69hjv30r2w5q5wmlf0cq4jv3w744jrac8ylln8sf45ckqj7wk"; + sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; babosa = { source = { @@ -85,18 +85,18 @@ dependencies = ["unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; + sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; type = "gem"; }; - version = "0.5.20170404"; + version = "0.5.20180417"; }; dotenv = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1f9s04xwa9gcsql734nwxvacgsl1si7xka4g4w3r6d3ab8a274y9"; + sha256 = "1va5y19f7l5jh53vz5vibz618lg8z93k5m2k70l25s9k46v2gfm3"; type = "gem"; }; - version = "2.2.2"; + version = "2.5.0"; }; emoji_regex = { source = { @@ -118,10 +118,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr"; + sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52"; type = "gem"; }; - version = "0.14.0"; + version = "0.15.3"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -144,19 +144,19 @@ fastimage = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0dzv34dgpw1sakj4wdd26dnw1z7iwvwfdvfr9aiirspabibfq6vc"; + sha256 = "0i7p9jgb9x1lxkhkwq8xlq7an5qbgdq6gsyrbs2xnf5ffa8yx1i2"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.4"; }; fastlane = { dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04k6pn95qbpvbmqxrs4pngvfyk4pifcv8is3819b33p754pkiqrp"; + sha256 = "1fq1zqvwim939klkx2893cbm1v4gi3a991qrj8933l3qg1y41fx2"; type = "gem"; }; - version = "2.91.0"; + version = "2.105.2"; }; gh_inspector = { source = { @@ -167,22 +167,22 @@ version = "1.1.3"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; + dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y"; + sha256 = "1z925kbqyaxdi6ld3gvaqc9527xfi8k3rr6snq5mvx5kibdi072a"; type = "gem"; }; - version = "0.13.6"; + version = "0.23.9"; }; googleauth = { - dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; + dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; + sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.6"; }; highline = { source = { @@ -225,23 +225,6 @@ }; version = "2.1.0"; }; - little-plugger = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; - type = "gem"; - }; - version = "1.1.4"; - }; - logging = { - dependencies = ["little-plugger" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; - type = "gem"; - }; - version = "2.2.2"; - }; memoist = { source = { remotes = ["https://rubygems.org"]; @@ -254,18 +237,18 @@ dependencies = ["mime-types-data"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; type = "gem"; }; - version = "3.1"; + version = "3.2.2"; }; mime-types-data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; type = "gem"; }; - version = "3.2016.0521"; + version = "3.2018.0812"; }; mini_magick = { source = { @@ -302,26 +285,26 @@ nanaimo = { source = { remotes = ["https://rubygems.org"]; - sha256 = "03x5f7hk0s21hlkj309w0qipjxz34kyd3c5yj25zq3s2yyn57idi"; + sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6"; type = "gem"; }; - version = "0.2.5"; + version = "0.2.6"; }; naturally = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0avn8b2qbfm22afln2p7rky73zns8c444mdhdh4ki8hbjsn0f8cx"; + sha256 = "0dzqdawqr4agx7zr1fr5zxdwl8vb5rhpz57l1lk7d2y46ha6l4l7"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; os = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; + sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; type = "gem"; }; - version = "0.9.6"; + version = "1.0.0"; }; plist = { source = { @@ -351,10 +334,10 @@ retriable = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar"; + sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.2"; }; rouge = { source = { @@ -367,10 +350,10 @@ rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; + sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; security = { source = { @@ -384,19 +367,19 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; + sha256 = "14rhv3riz6ki4ix4l79b6ckq7d015673gxkxvzdcxjl1h8plpdcy"; type = "gem"; }; - version = "0.8.1"; + version = "0.10.0"; }; simctl = { dependencies = ["CFPropertyList" "naturally"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l1hwxkbpgfhla6dbf0f6nhj794c0k6ilxlh07zcm8by3vdrsvib"; + sha256 = "0bbvbpdk955q1g797md960fdznw6p6hmj2pc62yrbpvb1ymag1sf"; type = "gem"; }; - version = "1.6.3"; + version = "1.6.5"; }; slack-notifier = { source = { @@ -426,18 +409,18 @@ tty-cursor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmggqwbikamd4qjwvahrv0vpbznm06bqpl498pb5fy3pra2xyxz"; + sha256 = "1f4rsapf4apaxn11xnqrq7axgrlvn6pdlqxqb2g34jnpfh5yrk1i"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; tty-screen = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19iq03prqjbm0nr7yn0181lph52d994jwbcsqss3lwpwkl20s6bv"; + sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1"; type = "gem"; }; - version = "0.6.4"; + version = "0.6.5"; }; tty-spinner = { dependencies = ["tty-cursor"]; @@ -476,10 +459,10 @@ unicode-display_width = { source = { remotes = ["https://rubygems.org"]; - sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8"; + sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; word_wrap = { source = { @@ -493,19 +476,19 @@ dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "16743g16mrh47f1lxkbw28xn9mmlf1r0zicin4malalsxxkc7ykz"; + sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7"; type = "gem"; }; - version = "1.5.7"; + version = "1.6.0"; }; xcpretty = { dependencies = ["rouge"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b8x9m53a1hbw0lamffjm4m1ydigj3azl97jc5w7prv1bm27s2y3"; + sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; type = "gem"; }; - version = "0.2.8"; + version = "0.3.0"; }; xcpretty-travis-formatter = { dependencies = ["xcpretty"]; From 1c84e29bd1e15c2d507c292632b26d4e02153498 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 10 Oct 2018 16:59:47 -0400 Subject: [PATCH 364/992] lollypop: 0.9.601 -> 0.9.604 --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 2ba35a9a0444..ec9122406993 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -4,7 +4,7 @@ , gobjectIntrospection, wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { - version = "0.9.601"; + version = "0.9.604"; name = "lollypop-${version}"; format = "other"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "029hyylwjsbwkw1v75nbkkmrncgz30y2qwdysmpz0xyb5q7x6zbj"; + sha256 = "0pfljs5q0xzqll6dybslin4nr7w18bn1yi0xn79vh44zn3l0r8q4"; }; nativeBuildInputs = with python3.pkgs; [ From e74c7666c7cb80fb48e65403b916ba775538cd0e Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Wed, 10 Oct 2018 21:06:12 +0000 Subject: [PATCH 365/992] CONTRIBUTING.md: Clarify clarification on periods Commit 9428c28f7a37038b594c5ff36b1669b0f21afe41 added a note in `CONTRIBUTING.md` saying that, "For consistency, there should not be a period at the end of the commit message." I believe it would be more correct (with respect to consistency) to say that there should not be a full stop/period at the end of the commit message's *summary line* (the first line of the commit message) (indeed, the example commit message just above this note clearly does use full stops outside of its summary line), and this patch changes `CONTRIBUTING.md` accordingly. --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2b88f15d276e..07eddc80c253 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -20,7 +20,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. (Motivation for change. Additional information.) ``` - For consistency, there should not be a period at the end of the commit message. + For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message). Examples: From af6e2464bba2d178b278c66d822f8c95378e6f58 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 10 Oct 2018 23:07:44 +0200 Subject: [PATCH 366/992] nixos/display-managers/startx: init (#47773) Dummy display manager that allows running X as a normal user. The X server is started manually from a vt using `startx`. Session startup commands must be provided by the user in ~/.xinitrc, which is NOT automatically generated. --- nixos/modules/module-list.nix | 1 + .../services/x11/display-managers/startx.nix | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 nixos/modules/services/x11/display-managers/startx.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b6849a4df574..261de6955ec2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -735,6 +735,7 @@ ./services/x11/display-managers/lightdm.nix ./services/x11/display-managers/sddm.nix ./services/x11/display-managers/slim.nix + ./services/x11/display-managers/startx.nix ./services/x11/display-managers/xpra.nix ./services/x11/fractalart.nix ./services/x11/hardware/libinput.nix diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix new file mode 100644 index 000000000000..15609540a6e7 --- /dev/null +++ b/nixos/modules/services/x11/display-managers/startx.nix @@ -0,0 +1,44 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xserver.displayManager.startx; + +in + +{ + + ###### interface + + options = { + services.xserver.displayManager.startx = { + enable = mkOption { + default = false; + description = '' + Whether to enable the dummy "startx" pseudo-display manager, + which allows users to start X manually via the "startx" command + from a vt shell. The X server runs under the user's id, not as root. + The user must provide a ~/.xinintrc file containing session startup + commands, see startx(1). This is not autmatically generated + from the desktopManager and windowManager settings. + ''; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + services.xserver = { + exportConfiguration = true; + displayManager.job.execCmd = ""; + displayManager.lightdm.enable = lib.mkForce false; + }; + systemd.services.display-manager.enable = false; + environment.systemPackages = with pkgs; [ xorg.xinit ]; + }; + +} From 05f0026af3d39538ea69fcfde1fed4e95972d439 Mon Sep 17 00:00:00 2001 From: Anatolii Prylutskyi Date: Thu, 11 Oct 2018 00:17:32 +0300 Subject: [PATCH 367/992] goa: 1.0.0 -> 1.4.0 (#48147) --- pkgs/development/tools/goa/default.nix | 6 +-- pkgs/development/tools/goa/deps.nix | 67 ++++++-------------------- 2 files changed, 19 insertions(+), 54 deletions(-) diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index dfb603d101fc..7469d506244b 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "goa-${version}"; - version = "1.0.0"; + version = "1.4.0"; goPackagePath = "github.com/goadesign/goa"; subPackages = [ "goagen" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1"; + sha256 = "1qx3c7dyq5wqxidfrk3ywc55fk64najj63f2jmfisfq4ixgwxdw9"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/goa/deps.nix b/pkgs/development/tools/goa/deps.nix index 14e9234be8a2..d92489259055 100644 --- a/pkgs/development/tools/goa/deps.nix +++ b/pkgs/development/tools/goa/deps.nix @@ -1,39 +1,12 @@ -# This file was generated by go2nix. +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ - { - goPackagePath = "github.com/armon/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-metrics"; - rev = "3df31a1ada83e310c2e24b267c8e8b68836547b4"; - sha256 = "1l99f1bzvdhyqhnsrpi1pd07bps0msilzilrd7m4w7i1m5kra529"; - }; - } { goPackagePath = "github.com/dimfeld/httppath"; fetch = { type = "git"; url = "https://github.com/dimfeld/httppath"; - rev = "c8e499c3ef3c3e272ed8bdcc1ccf39f73c88debc"; - sha256 = "0452zvrzjvy8pk5q6ykivz2cks082r4lmh7hghscxfqw6gf3siwi"; - }; - } - { - goPackagePath = "github.com/dimfeld/httptreemux"; - fetch = { - type = "git"; - url = "https://github.com/dimfeld/httptreemux"; - rev = "96acf0909c0b45ebf4a25a816cedc6d317e63679"; - sha256 = "0f9qbm1b8l7b21i2v8vmjyzfwf1mgkvxlk5250bwkp5i8n4ml2r6"; - }; - } - { - goPackagePath = "github.com/goadesign/goa"; - fetch = { - type = "git"; - url = "https://github.com/goadesign/goa"; - rev = "ea323df387ea68f8ac9fd79336f523c25e12c92e"; - sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1"; + rev = "ee938bf735983d53694d79138ad9820efff94c92"; + sha256 = "1c1kic8g3r78g6h4xl8n2ac1waxsb9fqz40k20ypi08k24mv3ha9"; }; } { @@ -41,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/manveru/faker"; - rev = "717f7cf83fb78669bfab612749c2e8ff63d5be11"; - sha256 = "1p6laz0hnb2vhfvam83rz6vl2amajqa6nifnsj2lg3mcs9ga8c0f"; + rev = "9fbc68a78c4dbc7914e1a23f88f126bea4383b97"; + sha256 = "1cnrf4wdjhxd9fryhlp2krl9acz6dzwic89gshs49pg3aajlf4dy"; }; } { @@ -50,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/satori/go.uuid"; - rev = "0aa62d5ddceb50dbcb909d790b5345affd3669b6"; - sha256 = "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w"; + rev = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e"; + sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; }; } { @@ -59,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; - sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; + rev = "4dab30cb33e6633c33c787106bafbfbfdde7842d"; + sha256 = "1g7p7c2azqaxbfkx5yaznk0z1inqnajlbwv921k6vh8i1xdblxk5"; }; } { @@ -68,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; - sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + rev = "1ce0cc6db4029d97571db82f85092fccedb572ce"; + sha256 = "02wsc01npnpc7srqw7rzaihn2hjmrkfy2x412fxbb675j2hk9cx6"; }; } { @@ -81,22 +54,13 @@ sha256 = "113kx47ryhyb803v8ckizlrc34cmwcwb0h28v34bahd2mir8nq3l"; }; } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "71a035914f99bb58fe82eac0f1289f10963d876c"; - sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm"; - }; - } { goPackagePath = "golang.org/x/tools"; fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09"; - sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg"; + rev = "f60d9635b16a5a57b06eaa119614ba4df421966a"; + sha256 = "1h587gvgwlpjdn8q3s8i1blfwfklqi0cpb0szj99w1mkgl0ads13"; }; } { @@ -104,8 +68,9 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "31c299268d302dd0aa9a0dcf765a3d58971ac83f"; - sha256 = "14jkpa8g0s448n2x5qdi05m59ncsdscby1wy2p089zxl9nqavm8h"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] + From c047572a1798f142c24b1e9c673f5ce91ff48dfa Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 10 Oct 2018 17:20:34 -0400 Subject: [PATCH 368/992] dia: fix on darwin (#48176) Fixes runtime error: GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported --- pkgs/applications/graphics/dia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index a1f26f7bc09f..222328d2b917 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme, -gtk-mac-integration }: +gtk-mac-integration-gtk2 }: stdenv.mkDerivation rec { name = "dia-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl libart_lgpl hicolor-icon-theme ] ++ stdenv.lib.optional withGNOME libgnomeui - ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; + ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration-gtk2; nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ]; From 5a6c4d39fbc9514b64345c4e679633dea2250fa6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Oct 2018 14:27:28 -0700 Subject: [PATCH 369/992] dovecot: 2.3.2.1 -> 2.3.3 (#47814) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dovecot/versions --- pkgs/servers/mail/dovecot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 5b7f433feb63..3e628f876dd7 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.3.2.1"; + name = "dovecot-2.3.3"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "0d2ffbicgl3wswbnyjbw6qigz7r1aqzprpchbwp5cynw122i2raa"; + sha256 = "13kd0rxdg9scwnx6n24p6mv8p6dyh7v8s7sqv55gp2i54pp2gbqm"; }; preConfigure = '' From e00bfcd798c2981433ef57a6b6a981f8b575b1c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Oct 2018 14:27:56 -0700 Subject: [PATCH 370/992] dovecot_pigeonhole: 0.5.2 -> 0.5.3 (#47820) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dovecot-pigeonhole/versions --- pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 1b744181096c..a0b03193729a 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.5.2"; + version = "0.5.3"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "0d95q2yj2f750jwg599jlizlglldcz9hs52y4mhrflwfqlaqw3lm"; + sha256 = "08i6vw6k2v906s4sc6wl9ffpz6blzdga6vglqpqjm7jzq10jfbz0"; }; buildInputs = [ dovecot openssl ]; From 1039da1556d4e7b9f966a5848a4dac8b4ed11bb4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Oct 2018 14:28:22 -0700 Subject: [PATCH 371/992] copyq: 3.5.0 -> 3.6.1 (#47818) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/copyq/versions --- pkgs/applications/misc/copyq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 7b34674c2183..39a87314ca7b 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.5.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0hzdv6rhjpq9yrfafnkc6d8m5pzw9qr520vsjf2gn1819gdybmr0"; + sha256 = "0drhafnr1d595wa8zwvmgmrrqb86navdk4iw6ly6gmh0i800wz0z"; }; nativeBuildInputs = [ cmake ]; From a5d839f874c6cd23256592040a1014661217e006 Mon Sep 17 00:00:00 2001 From: Renaud Date: Wed, 10 Oct 2018 23:33:43 +0200 Subject: [PATCH 372/992] nsjail: 2.2 -> 2.7 (#48024) --- pkgs/tools/security/nsjail/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index 8f087ef3d93c..80398d2d30cb 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, autoconf, pkgconfig, libtool -, bison, flex, libnl, protobuf, protobufc }: +{ stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which +, libnl, protobuf, protobufc }: stdenv.mkDerivation rec { name = "nsjail-${version}"; - version = "2.2"; + version = "2.7"; src = fetchFromGitHub { owner = "google"; repo = "nsjail"; rev = version; fetchSubmodules = true; - sha256 = "11323j5wd02nm8ibvzbzq7dla70bmcldc71lv5bpk4x7h64ai14v"; + sha256 = "13s1bi2b80rlwrgls1bx4bk140qhncwdamm9q51jd677s0i3xg3s"; }; - nativeBuildInputs = [ autoconf libtool pkgconfig ]; - buildInputs = [ bison flex libnl protobuf protobufc ]; + nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ]; + buildInputs = [ libnl protobuf protobufc ]; enableParallelBuilding = true; installPhase = '' From 81e3fb3cf71064b2cad78ae28e3033ad10270fa8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 10 Oct 2018 16:35:09 -0500 Subject: [PATCH 373/992] xdg-utils: 1.1.2 -> 1.1.3 (#48089) --- pkgs/tools/X11/xdg-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index d8ae32c6ee4c..44016b801e5d 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -17,11 +17,11 @@ in stdenv.mkDerivation rec { name = "xdg-utils-${version}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "https://portland.freedesktop.org/download/${name}.tar.gz"; - sha256 = "1k4b4m3aiyqn9k12a0ihcdahzlspl3zhskmm1d7228dvqvi546cm"; + sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"; }; # just needed when built from git From 608f6b4f138e6f5012181a55fafbe7d2537e5ead Mon Sep 17 00:00:00 2001 From: sjau Date: Wed, 10 Oct 2018 23:43:31 +0200 Subject: [PATCH 374/992] Flexget: 2.14.21 -> 2.15.1 (#48035) --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 70639e364c3e..d10043751599 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -36,11 +36,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.14.21"; + version = "2.15.1"; src = fetchPypi { inherit pname version; - sha256 = "08z0pf1g5xp3760da48v9h9hja2j8cgrwkgim156drk259bf5vm2"; + sha256 = "0c0qyafm01j94m9vky6x4k6j6g3nygzhgm79fb25brc2fyydkm3c"; }; postPatch = '' From 632ae0502e1671c887c538097b431809762e8099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Oct 2018 23:47:09 +0200 Subject: [PATCH 375/992] resilio-sync: 2.6.0 -> 2.6.1 (#47973) Changelog: https://help.resilio.com/hc/en-us/articles/206216855-Sync-2-x-change-log --- pkgs/applications/networking/resilio-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index b59219d99366..b6c54a6d4525 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "0041axi9carspkfaxvyirfvsa29zz55al01x90nh93nzxvpvywsz"; - "i686-linux" = "1ar36lp4f6a1z9i82g3gpak4q4ny09faqxdd59q1pvfzq25ypdhs"; + "x86_64-linux" = "02wbllrj80kqpyywfr05fsqpgwrv2i8smr3gfdpn7ni9b8hkj0ji"; + "i686-linux" = "02zhh6gfds6miznbx30ghzihhm330mh5xnm42mxj8j29aqlzgd95"; }.${stdenv.hostPlatform.system}; }; From bde4483d1336333f7c0bcd099a110dd8954c539e Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 10 Oct 2018 23:49:40 +0200 Subject: [PATCH 376/992] flashplayer: 31.0.0.108 -> 31.0.0.122 (#48126) previous version was removed upstream (404) --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 9faa7e5e31fd..60e94e137676 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,11 +98,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "31.0.0.108"; + version = "31.0.0.122"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0dcwyx0fp7wbsx0cyi7xpwq0nnvcvkzfgi6zyy75487820ssc4h1"; + sha256 = "16cx92lq7zx8k22mfnsfjj09kyh3fi266qc5vvjz5b2rj53rmkdg"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 07ef1397f9fb..38b064ec6e29 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "31.0.0.108"; + version = "31.0.0.122"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1mn29ahxjf6pdy2zp2na14cz46jrl88f54kp3bs3cz75syyizyb6" + "0mjyb8mk4av8cia34gmqi0n4nq0spiblgn18z6f4nkx12wgdka2c" else - "0inpj6bcsn5lh8gdv1wxpgipzrmpc553nhr68a55b2wff9fkv1ci" + "07qgawd4xgy9690gbx0c6k97cp7lp04l70ccp4jd81y4xjsc9bq3" else if arch == "x86_64" then - "1dfgsl5jf8ja9f7wwkzj5bfz1v5rdsyf4qhg1shqqldadmyyha7p" + "0264kcn0frgcl7zfd60ybs4r7x1p3f8nj496z264ax6qc390qr02" else - "0yiqwwqs3z9zzkfgqzjwqqdr2vaj1ia5xychs9fgxix3y4j934da"; + "0w170wz920imca8wc7kggl2vldn9k7cqm2xwvx8yqqi1p42a1941"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 03255e6eecc0..108d7c5f4a1a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "31.0.0.108"; + version = "31.0.0.122"; src = fetchurl { url = @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0i047fvj3x9lx7x8bf7jl1ybf9xpmr6g77q0h7n2s8qvscsw0pmm" + "1psd49bxn6w6kgcjhml44g5wb4za18m8apas8qyly4xcapdylias" else - "19wfs452ix57yfi4cy2din6mi5jky9hjzbdjny1bl8w32fy8xmm3"; + "0g3h31pdxw91r3067zrkgyziwl18i5kidwx83y13ff4d17v999ss"; }; nativeBuildInputs = [ unzip ]; From 33b68f87680d138326a559625e38f138cef9a158 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Oct 2018 19:47:41 -0400 Subject: [PATCH 377/992] linux: 4.4.159 -> 4.4.160 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index bafa975b6184..39e96d4b5dc2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.159"; + version = "4.4.160"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hivz1pyy4scp4s09ibz36ni4d1pwivizwls5dbh5qjy0pdvn00f"; + sha256 = "1i0wqccab2xxjsx58pgzgbmm5cclfd3hh3yjasnfrqsdaarxvgkd"; }; } // (args.argsOverride or {})) From 8f9743d2b70143a88c8f08bcf443112df3b2e02f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Oct 2018 19:47:57 -0400 Subject: [PATCH 378/992] linux: 4.9.131 -> 4.9.132 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index cdd2c67d25b2..24c11fca7935 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, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.131"; + version = "4.9.132"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0q2xmbkh42ikw26bdxgk1f9192hygyq9ffkhjfpr0fcx8sak5nsp"; + sha256 = "1lz53r6p293y5fwx7pz9ymj9sss3wmip8hcc48zwkcwm8phnmrk7"; }; } // (args.argsOverride or {})) From fab0c8824ac1e56f1680c87ea2e28e70be4b279e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Oct 2018 19:48:16 -0400 Subject: [PATCH 379/992] linux: 4.14.74 -> 4.14.75 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 6755e8f90ee1..9afc81eddf52 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.74"; + version = "4.14.75"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wjw05brv7l1qpi38drc2z01sa7kpk3kadw36gx9cbvvzn4r3rkh"; + sha256 = "084176rl51ls0dhy39vpj9fhasm4436iqv6aa0s5a74g1cixg4sh"; }; } // (args.argsOverride or {})) From cf440dae56392484f893eb6913b56cb5865976e8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 10 Oct 2018 19:48:22 -0400 Subject: [PATCH 380/992] linux: 4.18.12 -> 4.18.13 --- pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index aa936929a44c..2b65ed377ffc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.12"; + version = "4.18.13"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1icz2nkhkb1xhpmc9gxfhc3ywkni8nywk25ixrmgcxp5rgcmlsl4"; + sha256 = "0l4n72gajgw2vqghl6ps0yjy1safnypyzkcp841zkkwinp3a31yw"; }; } // (args.argsOverride or {})) From 0041d742aba89f035b3740b94a457a90e806f312 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Thu, 11 Oct 2018 01:53:34 +0200 Subject: [PATCH 381/992] nodejs: 10.11.0 -> 10.12.0 --- pkgs/development/web/nodejs/v10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 784c59c7c1e1..471808980082 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.11.0"; - sha256 = "16wfgwnb2yd6y608svj2fizdq3sid44m0wqn4swkvclxb71444mr"; + version = "10.12.0"; + sha256 = "1r0aqcxafha13ks8586x77n77zi88db259cpaix0y1ivdh6qkkfr"; } From c04e6e04e2f5ed33816c59b1fade01ca3e00aa3f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 11 Oct 2018 02:06:16 +0200 Subject: [PATCH 382/992] xsecurelock: hardcode path to xset --- pkgs/tools/X11/xsecurelock/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 4ee51100b339..88e36bfde39c 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , libX11, libXcomposite, libXft, libXmu, pam, apacheHttpd, imagemagick -, pamtester, xscreensaver }: +, pamtester, xscreensaver, xset }: stdenv.mkDerivation rec { name = "xsecurelock-${version}"; @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { "--with-xscreensaver=${xscreensaver}/libexec/xscreensaver" ]; + preInstall = '' + substituteInPlace helpers/saver_blank \ + --replace 'protect xset' 'protect ${xset}/bin/xset' + ''; + meta = with lib; { description = "X11 screen lock utility with security in mind"; homepage = https://github.com/google/xsecurelock; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ef3780f9e7d..626054c2a562 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6212,7 +6212,9 @@ with pkgs; libxml2 = libxml2Python; }; - xsecurelock = callPackage ../tools/X11/xsecurelock { }; + xsecurelock = callPackage ../tools/X11/xsecurelock { + xset = xorg.xset; + }; xsel = callPackage ../tools/misc/xsel { }; From 6892cbce0905fed4f67904425478e5fb35d05582 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 11 Oct 2018 02:07:24 +0200 Subject: [PATCH 383/992] equilux-theme: init at 20180927 --- pkgs/misc/themes/equilux-theme/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/misc/themes/equilux-theme/default.nix diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix new file mode 100644 index 000000000000..42fe402a4860 --- /dev/null +++ b/pkgs/misc/themes/equilux-theme/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }: + +stdenv.mkDerivation rec { + name = "equilux-theme-${version}"; + version = "20180927"; + + src = fetchFromGitHub { + owner = "ddnexus"; + repo = "equilux-theme"; + rev = "equilux-v${version}"; + sha256 = "1j7ykygmwv3dmzqdc9byir86sjz6ykhv9bv1pll1bjvvnaalyzgk"; + }; + + nativeBuildInputs = [ gnome3.glib libxml2 bc ]; + + buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + dontBuild = true; + + installPhase = '' + patchShebangs install.sh + sed -i install.sh \ + -e "s|if .*which gnome-shell.*;|if true;|" \ + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|" + mkdir -p $out/share/themes + ./install.sh --dest $out/share/themes + rm $out/share/themes/*/COPYING + ''; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "A Material Design theme for GNOME/GTK+ based desktop environments"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 626054c2a562..866adafff53f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21724,6 +21724,8 @@ with pkgs; electricsheep = callPackage ../misc/screensavers/electricsheep { }; + equilux-theme = callPackage ../misc/themes/equilux-theme { }; + flam3 = callPackage ../tools/graphics/flam3 { }; glee = callPackage ../tools/graphics/glee { }; From bd9ce1a7614564ad4350de0c30d6ffece8a56b2b Mon Sep 17 00:00:00 2001 From: Kim Burgess Date: Wed, 10 Oct 2018 00:36:07 +1000 Subject: [PATCH 384/992] maintainers: add kimburgess --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a77df8e8cc27..061703dce75d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2153,6 +2153,11 @@ github = "kiloreux"; name = "Kiloreux Emperex"; }; + kimburgess = { + email = "kim@acaprojects.com"; + github = "kimburgess"; + name = "Kim Burgess"; + }; kini = { email = "keshav.kini@gmail.com"; github = "kini"; From 1cb5b509f1a78ed7a38a327fb122abdf971c1222 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 10 Oct 2018 21:04:08 -0400 Subject: [PATCH 385/992] redmine: refactor, cleanup, bug fix, and add functionality - added package option to specify which version of redmine - added themes option back in to allow specifying redmine themes - added plugins option back in to allow specifying redmine plugins - added database.socket option to allow mysql unix socket authentication - added port option to allow specifying the port rails runs on - cleaned up Gemfile so it is much less hacky - switched to ruby version 2.4 by default as suggested by documentation http://www.redmine.org/projects/redmine/wiki/redmineinstall#Installing-Redmine - fixed an annoyance (bug) in the service causing recursive symlinks - fixed ownership bug on log files generated by redmine - updates reflecting renames in nixos options - added a nixos test --- nixos/modules/services/misc/redmine.nix | 152 +++++++++++++++--- nixos/tests/redmine.nix | 40 +++++ .../version-management/redmine/Gemfile | 64 ++------ .../version-management/redmine/Gemfile.lock | 48 +++++- .../version-management/redmine/default.nix | 9 +- .../version-management/redmine/gemset.nix | 151 ++++++++++++++++- pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 384 insertions(+), 82 deletions(-) create mode 100644 nixos/tests/redmine.nix diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index f763ba21d0b2..c25901708e01 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.redmine; - bundle = "${pkgs.redmine}/share/redmine/bin/bundle"; + bundle = "${cfg.package}/share/redmine/bin/bundle"; databaseYml = pkgs.writeText "database.yml" '' production: @@ -15,6 +15,7 @@ let port: ${toString cfg.database.port} username: ${cfg.database.user} password: #dbpass# + ${optionalString (cfg.database.socket != null) "socket: ${cfg.database.socket}"} ''; configurationYml = pkgs.writeText "configuration.yml" '' @@ -29,6 +30,19 @@ let ${cfg.extraConfig} ''; + unpackTheme = unpack "theme"; + unpackPlugin = unpack "plugin"; + unpack = id: (name: source: + pkgs.stdenv.mkDerivation { + name = "redmine-${id}-${name}"; + buildInputs = [ pkgs.unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unpackFile ${source} + ''; + }); + in { @@ -40,6 +54,14 @@ in description = "Enable the Redmine service."; }; + package = mkOption { + type = types.package; + default = pkgs.redmine; + defaultText = "pkgs.redmine"; + description = "Which Redmine package to use."; + example = "pkgs.redmine.override { ruby = pkgs.ruby_2_3; }"; + }; + user = mkOption { type = types.str; default = "redmine"; @@ -52,6 +74,12 @@ in description = "Group under which Redmine is ran."; }; + port = mkOption { + type = types.int; + default = 3000; + description = "Port on which Redmine is ran."; + }; + stateDir = mkOption { type = types.str; default = "/var/lib/redmine"; @@ -66,6 +94,41 @@ in See https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration ''; + example = literalExample '' + email_delivery: + delivery_method: smtp + smtp_settings: + address: mail.example.com + port: 25 + ''; + }; + + themes = mkOption { + type = types.attrsOf types.path; + default = {}; + description = "Set of themes."; + example = literalExample '' + { + dkuk-redmine_alex_skin = builtins.fetchurl { + url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; + sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; + }; + } + ''; + }; + + plugins = mkOption { + type = types.attrsOf types.path; + default = {}; + description = "Set of plugins."; + example = literalExample '' + { + redmine_env_auth = builtins.fetchurl { + url = https://github.com/Intera/redmine_env_auth/archive/0.6.zip; + sha256 = "0yyr1yjd8gvvh832wdc8m3xfnhhxzk2pk3gm2psg5w9jdvd6skak"; + }; + } + ''; }; database = { @@ -78,7 +141,7 @@ in host = mkOption { type = types.str; - default = "127.0.0.1"; + default = (if cfg.database.socket != null then "localhost" else "127.0.0.1"); description = "Database host address."; }; @@ -119,6 +182,13 @@ in . ''; }; + + socket = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/mysqld/mysqld.sock"; + description = "Path to the unix socket file to use for authentication."; + }; }; }; }; @@ -126,17 +196,20 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.passwordFile != null || cfg.database.password != ""; - message = "either services.redmine.database.passwordFile or services.redmine.database.password must be set"; + { assertion = cfg.database.passwordFile != null || cfg.database.password != "" || cfg.database.socket != null; + message = "one of services.redmine.database.socket, services.redmine.database.passwordFile, or services.redmine.database.password must be set"; + } + { assertion = cfg.database.socket != null -> (cfg.database.type == "mysql2"); + message = "Socket authentication is only available for the mysql2 database type"; } ]; - environment.systemPackages = [ pkgs.redmine ]; + environment.systemPackages = [ cfg.package ]; systemd.services.redmine = { after = [ "network.target" (if cfg.database.type == "mysql2" then "mysql.service" else "postgresql.service") ]; wantedBy = [ "multi-user.target" ]; - environment.HOME = "${pkgs.redmine}/share/redmine"; + environment.HOME = "${cfg.package}/share/redmine"; environment.RAILS_ENV = "production"; environment.RAILS_CACHE = "${cfg.stateDir}/cache"; environment.REDMINE_LANG = "en"; @@ -151,43 +224,80 @@ in subversion ]; preStart = '' - # start with a fresh config directory every time - rm -rf ${cfg.stateDir}/config - cp -r ${pkgs.redmine}/share/redmine/config.dist ${cfg.stateDir}/config + # ensure cache directory exists for db:migrate command + mkdir -p ${cfg.stateDir}/cache - # create the basic state directory layout pkgs.redmine expects - mkdir -p /run/redmine + # create the basic directory layout the redmine package expects + mkdir -p /run/redmine/public for i in config files log plugins tmp; do mkdir -p ${cfg.stateDir}/$i - ln -fs ${cfg.stateDir}/$i /run/redmine/$i + ln -fs ${cfg.stateDir}/$i /run/redmine/ done - # ensure cache directory exists for db:migrate command - mkdir -p ${cfg.stateDir}/cache + for i in plugin_assets themes; do + mkdir -p ${cfg.stateDir}/public/$i + ln -fs ${cfg.stateDir}/public/$i /run/redmine/public/ + done + + + # start with a fresh config directory + # the config directory is copied instead of linked as some mutable data is stored in there + rm -rf ${cfg.stateDir}/config/* + cp -r ${cfg.package}/share/redmine/config.dist/* ${cfg.stateDir}/config/ # link in the application configuration ln -fs ${configurationYml} ${cfg.stateDir}/config/configuration.yml + + # link in all user specified themes + rm -rf ${cfg.stateDir}/public/themes/* + for theme in ${concatStringsSep " " (mapAttrsToList unpackTheme cfg.themes)}; do + ln -fs $theme/* ${cfg.stateDir}/public/themes/ + done + + # link in redmine provided themes + ln -sf ${cfg.package}/share/redmine/public/themes.dist/* ${cfg.stateDir}/public/themes/ + + + # link in all user specified plugins + rm -rf ${cfg.stateDir}/plugins/* + for plugin in ${concatStringsSep " " (mapAttrsToList unpackPlugin cfg.plugins)}; do + ln -fs $plugin/* ${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-} + done + + + # ensure correct permissions for most files chmod -R ug+rwX,o-rwx+x ${cfg.stateDir}/ - # handle database.passwordFile + + # handle database.passwordFile & permissions DBPASS=$(head -n1 ${cfg.database.passwordFile}) cp -f ${databaseYml} ${cfg.stateDir}/config/database.yml sed -e "s,#dbpass#,$DBPASS,g" -i ${cfg.stateDir}/config/database.yml chmod 440 ${cfg.stateDir}/config/database.yml + # generate a secret token if required if ! test -e "${cfg.stateDir}/config/initializers/secret_token.rb"; then ${bundle} exec rake generate_secret_token chmod 440 ${cfg.stateDir}/config/initializers/secret_token.rb fi + # ensure everything is owned by ${cfg.user} chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} - ${bundle} exec rake db:migrate - ${bundle} exec rake redmine:load_default_data + + # execute redmine required commands prior to starting the application + # NOTE: su required in case using mysql socket authentication + /run/wrappers/bin/su -s ${pkgs.bash}/bin/bash -m -l redmine -c '${bundle} exec rake db:migrate' + /run/wrappers/bin/su -s ${pkgs.bash}/bin/bash -m -l redmine -c '${bundle} exec rake redmine:load_default_data' + + + # log files don't exist until after first command has been executed + # correct ownership of files generated by calling exec rake ... + chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}/log ''; serviceConfig = { @@ -196,13 +306,13 @@ in User = cfg.user; Group = cfg.group; TimeoutSec = "300"; - WorkingDirectory = "${pkgs.redmine}/share/redmine"; - ExecStart="${bundle} exec rails server webrick -e production -P ${cfg.stateDir}/redmine.pid"; + WorkingDirectory = "${cfg.package}/share/redmine"; + ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P ${cfg.stateDir}/redmine.pid"; }; }; - users.extraUsers = optionalAttrs (cfg.user == "redmine") (singleton + users.users = optionalAttrs (cfg.user == "redmine") (singleton { name = "redmine"; group = cfg.group; home = cfg.stateDir; @@ -210,7 +320,7 @@ in uid = config.ids.uids.redmine; }); - users.extraGroups = optionalAttrs (cfg.group == "redmine") (singleton + users.groups = optionalAttrs (cfg.group == "redmine") (singleton { name = "redmine"; gid = config.ids.gids.redmine; }); diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix new file mode 100644 index 000000000000..c1cb15f8288f --- /dev/null +++ b/nixos/tests/redmine.nix @@ -0,0 +1,40 @@ +import ./make-test.nix ({ pkgs, lib, ... }: +{ + name = "redmine"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + machine = + { config, pkgs, ... }: + { services.mysql.enable = true; + services.mysql.package = pkgs.mariadb; + services.mysql.ensureDatabases = [ "redmine" ]; + services.mysql.ensureUsers = [ + { name = "redmine"; + ensurePermissions = { "redmine.*" = "ALL PRIVILEGES"; }; + } + ]; + + services.redmine.enable = true; + services.redmine.database.socket = "/run/mysqld/mysqld.sock"; + services.redmine.plugins = { + redmine_env_auth = builtins.fetchurl { + url = https://github.com/Intera/redmine_env_auth/archive/0.6.zip; + sha256 = "0yyr1yjd8gvvh832wdc8m3xfnhhxzk2pk3gm2psg5w9jdvd6skak"; + }; + }; + services.redmine.themes = { + dkuk-redmine_alex_skin = builtins.fetchurl { + url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; + sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; + }; + }; + }; + + testScript = '' + startAll; + + $machine->waitForUnit('redmine.service'); + $machine->waitForOpenPort('3000'); + $machine->succeed("curl --fail http://localhost:3000/"); + ''; +}) \ No newline at end of file diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 744d6bfdd74e..a5c509f81a9a 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -54,60 +54,26 @@ platforms :mri, :mingw, :x64_mingw do end end -# Include database gems for the adapters found in the database -# configuration file -require 'erb' -require 'yaml' - -# NixOS - manually added to ensure mysql and postgres will always be include +# Include database gems for the database adapters NixOS supports gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw] gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] -database_file = File.join(File.dirname(__FILE__), "config/database.yml") -if File.exist?(database_file) - database_config = YAML::load(ERB.new(IO.read(database_file)).result) - adapters = database_config.values.map {|c| c['adapter']}.compact.uniq - if adapters.any? - adapters.each do |adapter| - case adapter - when 'mysql2' - gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw] - when /postgresql/ - gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] - when /sqlite3/ - gem "sqlite3", (RUBY_VERSION < "2.0" && RUBY_PLATFORM =~ /mingw/ ? "1.3.12" : "~>1.3.12"), - :platforms => [:mri, :mingw, :x64_mingw] - when /sqlserver/ - gem "tiny_tds", (RUBY_VERSION >= "2.0" ? "~> 1.0.5" : "~> 0.7.0"), :platforms => [:mri, :mingw, :x64_mingw] - gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw] - else - warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems") - end - end - else - warn("No adapter found in config/database.yml, please configure it first") - end -else - warn("Please configure your config/database.yml first") +group :development do + gem "rdoc", "~> 4.3" + gem "yard" end -# NixOS - manually removed because I couldn't figure out how to get "bundle exec rails server webrick -e production" to ignore these groups -#group :development do -# gem "rdoc", "~> 4.3" -# gem "yard" -#end - -#group :test do -# gem "minitest" -# gem "rails-dom-testing" -# gem "mocha" -# gem "simplecov", "~> 0.9.1", :require => false -# # TODO: remove this after upgrading to Rails 5 -# gem "test_after_commit", "~> 0.4.2" -# # For running UI tests -# gem "capybara" -# gem "selenium-webdriver", "~> 2.53.4" -#end +group :test do + gem "minitest" + gem "rails-dom-testing" + gem "mocha" + gem "simplecov", "~> 0.9.1", :require => false + # TODO: remove this after upgrading to Rails 5 + gem "test_after_commit", "~> 0.4.2" + # For running UI tests + gem "capybara" + gem "selenium-webdriver", "~> 2.53.4" +end local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 589537c2af75..54eed51cd868 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -41,12 +41,23 @@ GEM public_suffix (>= 2.0.2, < 4.0) arel (6.0.4) builder (3.2.3) + capybara (3.9.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) coderay (1.1.2) concurrent-ruby (1.0.5) crass (1.0.4) css_parser (1.6.0) addressable + docile (1.1.5) erubis (2.7.0) + ffi (1.9.25) globalid (0.4.1) activesupport (>= 4.2.0) htmlentities (4.3.4) @@ -59,15 +70,20 @@ GEM nokogiri (>= 1.5.9) mail (2.6.6) mime-types (>= 1.16, < 4) + metaclass (0.0.4) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) mimemagic (0.3.2) + mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) + mocha (1.7.0) + metaclass (~> 0.0.1) + multi_json (1.13.1) mysql2 (0.4.10) net-ldap (0.12.1) - nokogiri (1.8.4) + nokogiri (1.8.5) mini_portile2 (~> 2.3.0) pg (0.18.4) protected_attributes (1.1.4) @@ -104,10 +120,11 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.1) - rbpdf (1.19.5) + rbpdf (1.19.6) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) + rdoc (4.3.0) redcarpet (3.4.0) request_store (1.0.5) rmagick (2.16.0) @@ -118,6 +135,16 @@ GEM railties (>= 3.0, < 5.1) roadie (~> 3.1) ruby-openid (2.3.0) + rubyzip (1.2.2) + selenium-webdriver (2.53.4) + childprocess (~> 0.5) + rubyzip (~> 1.0) + websocket (~> 1.0) + simplecov (0.9.2) + docile (~> 1.1.0) + multi_json (~> 1.0) + simplecov-html (~> 0.9.0) + simplecov-html (0.9.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -125,22 +152,31 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + test_after_commit (0.4.2) + activerecord (>= 3.2) thor (0.20.0) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) + websocket (1.2.8) + xpath (3.1.0) + nokogiri (~> 1.8) + yard (0.9.16) PLATFORMS ruby DEPENDENCIES actionpack-xml_parser + capybara coderay (~> 1.1.1) i18n (~> 0.7.0) jquery-rails (~> 3.1.4) mail (~> 2.6.4) mime-types (~> 3.0) mimemagic + minitest + mocha mysql2 (~> 0.4.6) net-ldap (~> 0.12.0) nokogiri (~> 1.8.1) @@ -148,15 +184,21 @@ DEPENDENCIES protected_attributes rack-openid rails (= 4.2.8) + rails-dom-testing rails-html-sanitizer (>= 1.0.3) rbpdf (~> 1.19.3) + rdoc (~> 4.3) redcarpet (~> 3.4.0) request_store (= 1.0.5) rmagick (>= 2.14.0) roadie (~> 3.2.1) roadie-rails (~> 1.1.1) ruby-openid (~> 2.3.0) + selenium-webdriver (~> 2.53.4) + simplecov (~> 0.9.1) + test_after_commit (~> 0.4.2) tzinfo-data + yard BUNDLED WITH - 1.16.1 + 1.16.3 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 3c3fd4da33d4..d07e0f3e4544 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -7,6 +7,7 @@ let inherit ruby; gemdir = ./.; + groups = [ "ldap" "openid" ]; }; in stdenv.mkDerivation rec { @@ -21,15 +22,15 @@ in buildPhase = '' mv config config.dist + mv public/themes public/themes.dist ''; installPhase = '' mkdir -p $out/share cp -r . $out/share/redmine - - for i in config files log plugins tmp; do + for i in config files log plugins public/plugin_assets public/themes tmp; do rm -rf $out/share/redmine/$i - ln -fs /run/redmine/$i $out/share/redmine/ + ln -fs /run/redmine/$i $out/share/redmine/$i done ''; @@ -39,4 +40,4 @@ in maintainers = [ maintainers.garbas ]; license = licenses.gpl2; }; - } + } \ No newline at end of file diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 7423fcdb9fb9..fe56298056b1 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -96,6 +96,24 @@ }; version = "3.2.3"; }; + capybara = { + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sz6ick0pn7886jh9fd4571wyplshnpb95pr22ds4hd51zcrnfi4"; + type = "gem"; + }; + version = "3.9.0"; + }; + childprocess = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; + type = "gem"; + }; + version = "0.9.0"; + }; coderay = { source = { remotes = ["https://rubygems.org"]; @@ -129,6 +147,14 @@ }; version = "1.6.0"; }; + docile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + type = "gem"; + }; + version = "1.1.5"; + }; erubis = { source = { remotes = ["https://rubygems.org"]; @@ -137,6 +163,14 @@ }; version = "2.7.0"; }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + type = "gem"; + }; + version = "1.9.25"; + }; globalid = { dependencies = ["activesupport"]; source = { @@ -189,6 +223,14 @@ }; version = "2.6.6"; }; + metaclass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; + type = "gem"; + }; + version = "0.0.4"; + }; mime-types = { dependencies = ["mime-types-data"]; source = { @@ -214,6 +256,14 @@ }; version = "0.3.2"; }; + mini_mime = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; + type = "gem"; + }; + version = "1.0.1"; + }; mini_portile2 = { source = { remotes = ["https://rubygems.org"]; @@ -230,6 +280,23 @@ }; version = "5.11.3"; }; + mocha = { + dependencies = ["metaclass"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13whjmrm4n48rwx7h7a2jwa5grar3m0fxspbm2pm4lyp7hi119c1"; + type = "gem"; + }; + version = "1.7.0"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; mysql2 = { source = { remotes = ["https://rubygems.org"]; @@ -250,10 +317,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; + sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; type = "gem"; }; - version = "1.8.4"; + version = "1.8.5"; }; pg = { source = { @@ -363,10 +430,10 @@ dependencies = ["htmlentities" "rbpdf-font"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "021fda3gcz9pyydxnn40vs1nrkycwslb9ip4q0yg3hlip41k1b49"; + sha256 = "159vg56bzy09f6zrh9h3rxm2r0vkvsfn9qczqmv1vi5xkd918s0d"; type = "gem"; }; - version = "1.19.5"; + version = "1.19.6"; }; rbpdf-font = { source = { @@ -376,6 +443,14 @@ }; version = "1.19.1"; }; + rdoc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c"; + type = "gem"; + }; + version = "4.3.0"; + }; redcarpet = { source = { remotes = ["https://rubygems.org"]; @@ -426,6 +501,40 @@ }; version = "2.3.0"; }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + type = "gem"; + }; + version = "1.2.2"; + }; + selenium-webdriver = { + dependencies = ["childprocess" "rubyzip" "websocket"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15qyf7b9fa2nxhhwp551b9fjj82kb3wmy65559yrrcwpdadqvcs4"; + type = "gem"; + }; + version = "2.53.4"; + }; + simplecov = { + dependencies = ["docile" "multi_json" "simplecov-html"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; + type = "gem"; + }; + version = "0.9.2"; + }; + simplecov-html = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; + type = "gem"; + }; + version = "0.9.0"; + }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; source = { @@ -444,6 +553,15 @@ }; version = "3.2.1"; }; + test_after_commit = { + dependencies = ["activerecord"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb"; + type = "gem"; + }; + version = "0.4.2"; + }; thor = { source = { remotes = ["https://rubygems.org"]; @@ -469,4 +587,29 @@ }; version = "1.2.5"; }; + websocket = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f11rcn4qgffb1rq4kjfwi7di79w8840x9l74pkyif5arp0mb08x"; + type = "gem"; + }; + version = "1.2.8"; + }; + xpath = { + dependencies = ["nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y61ijvv04bwga802s8py5xd7fcxci6478wgr9wkd35p45x20jzi"; + type = "gem"; + }; + version = "3.1.0"; + }; + yard = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67"; + type = "gem"; + }; + version = "0.9.16"; + }; } \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ef3780f9e7d..d2138a8271fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4968,7 +4968,7 @@ with pkgs; redir = callPackage ../tools/networking/redir { }; - redmine = callPackage ../applications/version-management/redmine { }; + redmine = callPackage ../applications/version-management/redmine { ruby = pkgs.ruby_2_4; }; redsocks = callPackage ../tools/networking/redsocks { }; From 72635ba35908a3b5a04e796f4aba0778b68da70c Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 10 Oct 2018 21:16:42 -0400 Subject: [PATCH 386/992] added test to nixos/release.nix so it will be run on hydra --- nixos/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release.nix b/nixos/release.nix index 8016dba09152..b0bf94924f3e 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -396,6 +396,7 @@ in rec { tests.quake3 = callTest tests/quake3.nix {}; tests.rabbitmq = callTest tests/rabbitmq.nix {}; tests.radicale = callTest tests/radicale.nix {}; + tests.redmine = callTest tests/redmine.nix {}; tests.rspamd = callSubTests tests/rspamd.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.rxe = callTest tests/rxe.nix {}; From c7ac364278a571b4cdd2056a72dd6b74b04af9eb Mon Sep 17 00:00:00 2001 From: pandaman64 Date: Tue, 3 Jul 2018 14:40:09 +0900 Subject: [PATCH 387/992] qiskit: 0.5.7 -> 0.6.1 --- pkgs/development/python-modules/qiskit/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 0f02560c81f8..1938cb37c75a 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -13,19 +13,21 @@ , requests , requests_ntlm , IBMQuantumExperience +, jsonschema +, psutil , cmake , llvmPackages }: buildPythonPackage rec { pname = "qiskit"; - version = "0.5.7"; + version = "0.6.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a5a2c6c074f8479dc83d1d599dfebf2363402a182835b8fa5742804055148b17"; + sha256 = "601e8db4db470593b94a32495c6e90e2db11a9382817a34584520573a7b8cc38"; }; buildInputs = [ cmake ] @@ -43,6 +45,8 @@ buildPythonPackage rec { requests requests_ntlm IBMQuantumExperience + jsonschema + psutil ]; # Pypi's tarball doesn't contain tests From 355fa854f7416b6ef8e9d7546d3023c0388f8077 Mon Sep 17 00:00:00 2001 From: pandaman64 Date: Wed, 10 Oct 2018 19:53:25 +0900 Subject: [PATCH 388/992] qasm2image: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/qasm2image/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 5f7cded86fda..429159d05d7d 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "qasm2image"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { - owner = "nelimeee"; + owner = "nelimee"; repo = "qasm2image"; - rev = "57a640621bbbc74244f07e2e068a26411b0d9b24"; - sha256 = "1ha5vfl4jfwcwbipsq07xlknkrvx79z5bwbzndybclyk9pa69dlz"; + rev = "2c01756946ba9782973359dbd7bbf6651af6bee5"; + sha256 = "1bnkzv7wrdvrq71dmsqanb3v2hcsxh5zaglfcxm2d9zzpmvb4a2n"; }; propagatedBuildInputs = [ From b823983d106c1978f36eb3e35454ee4cbac4317b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 11 Oct 2018 11:51:09 +0800 Subject: [PATCH 389/992] okteta: 0.25.3 -> 0.25.4 --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index a2337483bf1f..b14065429152 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "okteta-${version}"; - version = "0.25.3"; + version = "0.25.4"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; - sha256 = "0mm6pmk7k9c581b12a3wl0ayhadvyymfzmscy9x32b391qy9inai"; + sha256 = "0liar1xbns6mr6j320nyxqfii82i4ysp62hf3j6jg1112v874amf"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; From 6113d95235e67ca49e2a58688c789ee76dca4e2e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 10 Oct 2018 17:32:46 +0000 Subject: [PATCH 390/992] prooftree: cleaning --- pkgs/applications/science/logic/prooftree/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index a88a84e3b0d1..1f6620a2872d 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: +{ stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "prooftree-${version}"; version = "0.13"; @@ -10,7 +10,8 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; + buildInputs = [ ncurses ] ++ (with ocamlPackages; [ + ocaml findlib camlp5 lablgtk ]); dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; @@ -39,4 +40,4 @@ stdenv.mkDerivation (rec { maintainers = [ maintainers.jwiegley ]; license = licenses.gpl3; }; -}) +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 866adafff53f..5a5ae8c1ba10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21278,7 +21278,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { }; + prooftree = callPackage ../applications/science/logic/prooftree {}; prover9 = callPackage ../applications/science/logic/prover9 { }; From 714c0781c3bd9956b26becccc05d2f997afd4aa3 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 11 Oct 2018 16:17:40 +0900 Subject: [PATCH 391/992] rfc-bibtex: init at 2.2.1 Generate bibtex entries from IETF rfc/drafts, for instance: $ rfcbibtex RFC5246 draft-ietf-tls-tls13-21 @techreport{RFC5246, author = {T. Dierks and E. Rescorla}, title = {{The Transport Layer Security (TLS) Protocol Version 1.2}}, howpublished = {Internet Requests for Comments}, type = {RFC}, number = {5246}, year = {2008}, month = {August}, issn = {2070-1721}, publisher = {RFC Editor}, institution = {RFC Editor}, url = {http://www.rfc-editor.org/rfc/rfc5246.txt}, note = {\url{http://www.rfc-editor.org/rfc/rfc5246.txt}}, } @techreport{I-D.ietf-tls-tls13, author = {Eric Rescorla}, title = {{The Transport Layer Security (TLS) Protocol Version 1.3}}, howpublished = {Working Draft}, type = {Internet-Draft}, number = {draft-ietf-tls-tls13-21}, year = {2017}, month = {July}, institution = {IETF Secretariat}, url = {http://www.ietf.org/internet-drafts/draft-ietf-tls-tls13-21.txt}, note = {\url{http://www.ietf.org/internet-drafts/draft-ietf-tls-tls13-21.txt}}, } --- .../python-modules/rfc-bibtex/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/rfc-bibtex/default.nix diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix new file mode 100644 index 000000000000..a1626d6b65c3 --- /dev/null +++ b/pkgs/development/python-modules/rfc-bibtex/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonApplication, fetchPypi, isPy3k }: + +buildPythonApplication rec { + pname = "rfc-bibtex"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p8xjgq4rig1jgqy5jqh34mbifxgxsyyxh8sizwz2wyixf8by8lq"; + }; + + disabled = !isPy3k; + + meta = with stdenv.lib; { + homepage = ttps://github.com/iluxonchik/rfc-bibtex/; + description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts"; + license = licenses.mit; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e808b70fb41e..a33d1bd0ccaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22033,6 +22033,8 @@ with pkgs; retrofe = callPackage ../misc/emulators/retrofe { }; + rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; + rpl = callPackage ../tools/text/rpl { pythonPackages = python3Packages; }; From 6fca3c5700a80d791c07214c8376db2f65d4d331 Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 6 Oct 2018 21:21:35 +0100 Subject: [PATCH 392/992] cups-googlecloudprint: init at 20160502 --- nixos/modules/services/printing/cupsd.nix | 2 +- .../cups/drivers/googlecloudprint/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/cups/drivers/googlecloudprint/default.nix diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index dbf18ec1d114..1031d6f3d7e2 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -250,7 +250,7 @@ in drivers = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ pkgs.gutenprint pkgs.hplip pkgs.splix ]"; + example = literalExample "with pkgs; [ gutenprint hplip splix cups-googlecloudprint ]"; description = '' CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript and Samba are added unconditionally. If this list contains diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/pkgs/misc/cups/drivers/googlecloudprint/default.nix new file mode 100644 index 000000000000..b3fc87fbf1da --- /dev/null +++ b/pkgs/misc/cups/drivers/googlecloudprint/default.nix @@ -0,0 +1,64 @@ +{ stdenv, lib, fetchFromGitHub, python2, python2Packages, file, makeWrapper, cups }: + +# Setup instructions can be found at https://github.com/simoncadman/CUPS-Cloud-Print#configuration +# So the nix version is something like: +# nix run nixpkgs.cups-googlecloudprint -c sudo setupcloudprint +# nix run nixpkgs.cups-googlecloudprint -c sudo listcloudprinters + +let pythonEnv = python2.buildEnv.override { + extraLibs = with python2Packages; [ + six + httplib2 + pycups + ]; +}; + +in stdenv.mkDerivation rec { + name = "cups-googlecloudprint-${version}"; + version = "20160502"; + + src = fetchFromGitHub { + owner = "simoncadman"; + repo = "CUPS-Cloud-Print"; + rev = version; + sha256 = "0760i12w7jrhq7fsgyz3yqla5cvpjb45n6m2jz96wsy3p3xf6dzz"; + }; + + buildInputs = [ cups makeWrapper ]; + + cupsgroup = "nonexistantgroup"; + NOPERMS = 1; + + postConfigure = '' + substituteInPlace Makefile --replace "${cups}" "$out" + ''; + + postInstall = '' + pushd "$out" + for s in lib/cups/backend/gcp lib/cups/driver/cupscloudprint + do + echo "Wrapping $s..." + wrapProgram "$out/$s" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups" + done + + mkdir bin + + for s in share/cloudprint-cups/*.py + do + if [ -x "$s" ] # Only wrapping those Python scripts marked as executable + then + o="bin/$(echo $s | sed 's,share/cloudprint-cups/\(.*\).py,\1,')" + echo "Wrapping $o -> $s..." + makeWrapper "$out/$s" "$o" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups" + fi + done + popd + ''; + + meta = with stdenv.lib; { + description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print"; + homepage = http://ccp.niftiestsoftware.com; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a3b1fcfb74a..d8fd9e855f7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21682,6 +21682,8 @@ with pkgs; cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { }; + cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { }; + # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; From 3dec3de2d3a89ea212154aaaca4621fb62a16af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 4 Oct 2018 23:26:45 +0100 Subject: [PATCH 393/992] dino: 2018-09-05 -> 2018-09-21 --- .../networking/instant-messengers/dino/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 777057b327b0..7fe68163ab96 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2018-09-05"; + name = "dino-unstable-2018-09-21"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "79e0aee5fdb90830fad748fdfae717cb5fbf91f9"; - sha256 = "1sfh729fg6c5ds3rcma13paqnvv58jln34s93j74jnca19wgn7k5"; + rev = "6b7ef800f54e781a618425236ba8d4ed2f2fef9c"; + sha256 = "1si815b6y06lridj88hws0dgq54w9jfam9sqbrq3cfcvmhc38ysk"; fetchSubmodules = true; }; From a814322eda88c16d72c5963023ec05777fb8d247 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 11 Oct 2018 10:26:33 +0200 Subject: [PATCH 394/992] piper: fix gi dependencies Currently fails with "ValueError: Namespace Gtk not available" --- pkgs/os-specific/linux/piper/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 3e774faaffe2..a3ae0b74f126 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,5 +1,6 @@ { stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3 -, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 }: +, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 +, gobjectIntrospection }: python3.pkgs.buildPythonApplication rec { pname = "piper-${version}"; @@ -14,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1ny0vf8ym9v040cb5h084k5wwn929fnhq9infbdq8f8vvy61magb"; }; - nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib ]; + nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ]; buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; From 4f3c13b84f1b762b27785b9dc68b4382eabc1c73 Mon Sep 17 00:00:00 2001 From: Sebastien Maret Date: Thu, 11 Oct 2018 09:37:38 +0000 Subject: [PATCH 395/992] gildas: 20181001_a -> 20181001_b (#48200) --- pkgs/applications/science/astronomy/gildas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index dcb76320a9b5..802f558731a8 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "oct18a"; - version = "20181001_a"; + srcVersion = "oct18b"; + version = "20181001_b"; name = "gildas-${version}"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ]; - sha256 = "091941a74kaw3xqsmqda7bj972cafi8ppj2c5xq0mca2c075dyfx"; + sha256 = "1q54q7y4zdax9vr28pvmy5g34kyr92jr3v1rkpjw7lxjafyqwy27"; }; enableParallelBuilding = true; From 3bc454fda771ac97cdc71dcc01c26929b11a1f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 11 Oct 2018 10:45:42 +0100 Subject: [PATCH 396/992] alacritty: 0.2.0 -> 0.2.1 --- pkgs/applications/misc/alacritty/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 34e46e9fa0f0..e4dffa98f39a 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, - fetchgit, + fetchFromGitHub, rustPlatform, cmake, makeWrapper, @@ -51,18 +51,16 @@ let ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "0.2.0"; + version = "0.2.1"; - # At the moment we cannot handle git dependencies in buildRustPackage. - # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. - src = fetchgit { - url = https://github.com/Mic92/alacritty.git; - rev = "rev-${version}"; - sha256 = "1c9izflacm693rwkxwakxgnpkvxwc8mqasr5p7x0ys6xg91h9sxn"; - fetchSubmodules = true; + src = fetchFromGitHub { + owner = "jwilm"; + repo = "alacritty"; + rev = "v${version}"; + sha256 = "1402axwjz70gg6ylhhm82f1rl6xvxkr1qy0jx3r4r32vzfap1l67"; }; - cargoSha256 = "1ijgkwv9ij4haig1h6n2b9xbhp5vahy9vp1sx72wxaaj9476msjx"; + cargoSha256 = "0slcyn77svj0686g1vk7kgndzirpkba9jwwybgsdl755r53dswk0"; nativeBuildInputs = [ cmake From 1c0c0cb7c9a2dc2df1a3a47b4a659367dab17b19 Mon Sep 17 00:00:00 2001 From: Edmund Wu <22758444+eadwu@users.noreply.github.com> Date: Thu, 11 Oct 2018 05:53:41 -0400 Subject: [PATCH 397/992] glava: 1.5.1 -> 1.5.5 (#48086) --- pkgs/applications/misc/glava/default.nix | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 1eb0d0048f64..7e32e566234e 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -5,17 +5,6 @@ let inherit (stdenv.lib) optional makeLibraryPath; - # gl.xml - gl = fetchurl { - url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/56312cfe680e4be5ae61bbf1c628e420f8731718/xml/gl.xml; - sha256 = "1c45bcgaxiic5gmb3gkrd9qcvascvij97vz5y6fc3a2y7x3gjc5l"; - }; - # EGL 1.5 - egl = fetchurl { - url = https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h; - sha256 = "0p0vs4siiya05cvbqq7cw3ci2zvvlfh8kycgm9k9cwvmrkj08349"; - }; - wrapperScript = writeScript "glava" '' #!${stdenv.shell} case "$1" in @@ -33,12 +22,12 @@ let in stdenv.mkDerivation rec { name = "glava-${version}"; - version = "1.5.1"; + version = "1.5.5"; src = fetchgit { url = "https://github.com/wacossusca34/glava.git"; rev = "v${version}"; - sha256 = "1k8x0a0g2pm7ficsk4az9s7mjbm85a987apjg5c4y6iyldxgd6sb"; + sha256 = "0mpbgllwz45wkax6pgvnh1pz2q4yvbzq2l8z8kff13wrsdvl8lh0"; }; buildInputs = [ @@ -54,12 +43,8 @@ in python3 ]; - patchPhase = '' - mkdir -p glad/include/KHR - - cp ${gl} glad/gl.xml - cp ${egl} glad/include/KHR/khrplatform.h - patchShebangs . + preConfigure = '' + export CFLAGS="-march=native" ''; makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1"; From 58654866ceab5d3161a4afcd037e425085dab652 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 12:12:54 +0200 Subject: [PATCH 398/992] libssh2: add license --- pkgs/development/libraries/libssh2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index a6802a7f5183..b050dede8c61 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -13,10 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ] ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; - meta = { + meta = with stdenv.lib; { description = "A client-side C library implementing the SSH2 protocol"; homepage = https://www.libssh2.org; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.bsd3; maintainers = [ ]; }; } From d429573ddbded1ff453745ef42ed006ae952a2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 11 Oct 2018 10:45:42 +0100 Subject: [PATCH 399/992] alacritty: 0.2.0 -> 0.2.1 --- pkgs/applications/misc/alacritty/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 34e46e9fa0f0..e4dffa98f39a 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, - fetchgit, + fetchFromGitHub, rustPlatform, cmake, makeWrapper, @@ -51,18 +51,16 @@ let ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "0.2.0"; + version = "0.2.1"; - # At the moment we cannot handle git dependencies in buildRustPackage. - # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. - src = fetchgit { - url = https://github.com/Mic92/alacritty.git; - rev = "rev-${version}"; - sha256 = "1c9izflacm693rwkxwakxgnpkvxwc8mqasr5p7x0ys6xg91h9sxn"; - fetchSubmodules = true; + src = fetchFromGitHub { + owner = "jwilm"; + repo = "alacritty"; + rev = "v${version}"; + sha256 = "1402axwjz70gg6ylhhm82f1rl6xvxkr1qy0jx3r4r32vzfap1l67"; }; - cargoSha256 = "1ijgkwv9ij4haig1h6n2b9xbhp5vahy9vp1sx72wxaaj9476msjx"; + cargoSha256 = "0slcyn77svj0686g1vk7kgndzirpkba9jwwybgsdl755r53dswk0"; nativeBuildInputs = [ cmake From 6327ba8fbd475ad1f21e8d2f7d39dfd0cbff73ea Mon Sep 17 00:00:00 2001 From: Kim Burgess Date: Wed, 10 Oct 2018 00:41:28 +1000 Subject: [PATCH 400/992] teleconsole: init at 0.4.0 --- pkgs/tools/misc/teleconsole/default.nix | 34 +++++++++++++++++++++++++ pkgs/tools/misc/teleconsole/deps.nix | 13 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 49 insertions(+) create mode 100644 pkgs/tools/misc/teleconsole/default.nix create mode 100644 pkgs/tools/misc/teleconsole/deps.nix diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix new file mode 100644 index 000000000000..2d3eb91250a8 --- /dev/null +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "teleconsole-${version}"; + version = "0.4.0"; + + goPackagePath = "github.com/gravitational/teleconsole"; + + src = fetchFromGitHub { + owner = "gravitational"; + repo = "teleconsole"; + rev = version; + sha256 = "01552422n0bj1iaaw6pvg9l1qr66r69sdsngxbcdjn1xh3mj74sm"; + }; + + goDeps = ./deps.nix; + + CGO_ENABLED = 1; + buildFlags = "-ldflags"; + + meta = with stdenv.lib; { + homepage = "https://www.teleconsole.com/"; + description = "Share your terminal session with people you trust"; + license = licenses.asl20; + platforms = platforms.all; + # Builds for Aarch64 not possible in the current release due to + # incompatibilities further up the dependency chain. + # See: + # - https://github.com/gravitational/teleport/issues/679 + # - https://github.com/kr/pty/issues/27 + broken = stdenv.isAarch64; + maintainers = [ maintainers.kimburgess ]; + }; +} diff --git a/pkgs/tools/misc/teleconsole/deps.nix b/pkgs/tools/misc/teleconsole/deps.nix new file mode 100644 index 000000000000..f13529d4b25a --- /dev/null +++ b/pkgs/tools/misc/teleconsole/deps.nix @@ -0,0 +1,13 @@ +[ + # Teleport v2.0.0-alpha.4 required for build. + # See https://github.com/gravitational/teleconsole/blob/09591f227c2a8df4c68af8bc4adfadfc596f4ed2/Makefile#L8 + { + goPackagePath = "github.com/gravitational/teleport"; + fetch = { + type = "git"; + url = "https://github.com/gravitational/teleport"; + rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223"; + sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9978b2969c91..075c22c800be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5550,6 +5550,8 @@ with pkgs; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teleconsole = callPackage ../tools/misc/teleconsole { }; + telegraf = callPackage ../servers/monitoring/telegraf { }; teleport = callPackage ../servers/teleport {}; From bccf6af31084a122bad89592dead265150c67cd3 Mon Sep 17 00:00:00 2001 From: Brendan Hall Date: Thu, 11 Oct 2018 02:24:01 +0100 Subject: [PATCH 401/992] Maintainers: Add Brendan Hall (me) as maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a77df8e8cc27..d5a2874b38e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -520,6 +520,11 @@ github = "bgamari"; name = "Ben Gamari"; }; + bhall = { + email = "brendan.j.hall@bath.edu"; + github = "brendan-hall"; + name = "Brendan Hall"; + }; bhipple = { email = "bhipple@protonmail.com"; github = "bhipple"; From e1c5b4793532f3e85afa44b7816d76c7b9654950 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Oct 2018 04:20:01 -0700 Subject: [PATCH 402/992] pmd: 6.7.0 -> 6.8.0 (#47736) * pmd: 6.7.0 -> 6.8.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pmd/versions * pmd: refresh meta Homepage is now https://pmd.github.io/ Added licenses --- pkgs/development/tools/analysis/pmd/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 187b2d7b03f9..89b0a33c0682 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.7.0"; + version = "6.8.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0bnbr8zq28dgvwka563g5lbya5jhmjrahnbwagcs4afpsrm7zj6c"; + sha256 = "1vfkg2l3sl5ahhs89nvkg0z1ah1k67c44nwpvaymq73rb2bb8ibr"; }; installPhase = '' @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { cp -R * $out ''; - meta = { - description = "Scans Java source code and looks for potential problems"; - homepage = http://pmd.sourceforge.net/; - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "An extensible cross-language static code analyzer."; + homepage = https://pmd.github.io/; + platforms = platforms.unix; + license = with licenses; [ bsdOriginal asl20 ]; }; } From 975f476cd27c6a8a3ea11aac746396573845b091 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 11 Oct 2018 08:04:47 -0400 Subject: [PATCH 403/992] quoting stateDir path in case it includes spaces --- nixos/modules/services/misc/redmine.nix | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index c25901708e01..8d25ac5cb76f 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -225,68 +225,68 @@ in ]; preStart = '' # ensure cache directory exists for db:migrate command - mkdir -p ${cfg.stateDir}/cache + mkdir -p "${cfg.stateDir}/cache" # create the basic directory layout the redmine package expects mkdir -p /run/redmine/public for i in config files log plugins tmp; do - mkdir -p ${cfg.stateDir}/$i - ln -fs ${cfg.stateDir}/$i /run/redmine/ + mkdir -p "${cfg.stateDir}/$i" + ln -fs "${cfg.stateDir}/$i" /run/redmine/ done for i in plugin_assets themes; do - mkdir -p ${cfg.stateDir}/public/$i - ln -fs ${cfg.stateDir}/public/$i /run/redmine/public/ + mkdir -p "${cfg.stateDir}/public/$i" + ln -fs "${cfg.stateDir}/public/$i" /run/redmine/public/ done # start with a fresh config directory # the config directory is copied instead of linked as some mutable data is stored in there - rm -rf ${cfg.stateDir}/config/* - cp -r ${cfg.package}/share/redmine/config.dist/* ${cfg.stateDir}/config/ + rm -rf "${cfg.stateDir}/config/"* + cp -r ${cfg.package}/share/redmine/config.dist/* "${cfg.stateDir}/config/" # link in the application configuration - ln -fs ${configurationYml} ${cfg.stateDir}/config/configuration.yml + ln -fs ${configurationYml} "${cfg.stateDir}/config/configuration.yml" # link in all user specified themes - rm -rf ${cfg.stateDir}/public/themes/* + rm -rf "${cfg.stateDir}/public/themes/"* for theme in ${concatStringsSep " " (mapAttrsToList unpackTheme cfg.themes)}; do - ln -fs $theme/* ${cfg.stateDir}/public/themes/ + ln -fs $theme/* "${cfg.stateDir}/public/themes" done # link in redmine provided themes - ln -sf ${cfg.package}/share/redmine/public/themes.dist/* ${cfg.stateDir}/public/themes/ + ln -sf ${cfg.package}/share/redmine/public/themes.dist/* "${cfg.stateDir}/public/themes/" # link in all user specified plugins - rm -rf ${cfg.stateDir}/plugins/* + rm -rf "${cfg.stateDir}/plugins/"* for plugin in ${concatStringsSep " " (mapAttrsToList unpackPlugin cfg.plugins)}; do - ln -fs $plugin/* ${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-} + ln -fs $plugin/* "${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-}" done # ensure correct permissions for most files - chmod -R ug+rwX,o-rwx+x ${cfg.stateDir}/ + chmod -R ug+rwX,o-rwx+x "${cfg.stateDir}/" # handle database.passwordFile & permissions DBPASS=$(head -n1 ${cfg.database.passwordFile}) - cp -f ${databaseYml} ${cfg.stateDir}/config/database.yml - sed -e "s,#dbpass#,$DBPASS,g" -i ${cfg.stateDir}/config/database.yml - chmod 440 ${cfg.stateDir}/config/database.yml + cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml" + sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml" + chmod 440 "${cfg.stateDir}/config/database.yml" # generate a secret token if required if ! test -e "${cfg.stateDir}/config/initializers/secret_token.rb"; then ${bundle} exec rake generate_secret_token - chmod 440 ${cfg.stateDir}/config/initializers/secret_token.rb + chmod 440 "${cfg.stateDir}/config/initializers/secret_token.rb" fi # ensure everything is owned by ${cfg.user} - chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} + chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}" # execute redmine required commands prior to starting the application @@ -297,7 +297,7 @@ in # log files don't exist until after first command has been executed # correct ownership of files generated by calling exec rake ... - chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}/log + chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}/log" ''; serviceConfig = { @@ -307,7 +307,7 @@ in Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${cfg.package}/share/redmine"; - ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P ${cfg.stateDir}/redmine.pid"; + ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; }; }; From e820c4cdaad03a2b9354f6d55928153b6cd7ea08 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 11 Oct 2018 20:22:25 +0800 Subject: [PATCH 404/992] iio-sensor-proxy: 2.4 -> 2.5 (#48195) --- pkgs/os-specific/linux/iio-sensor-proxy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index 0ccc8acfdca9..dcd5b4763ff1 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -3,19 +3,23 @@ stdenv.mkDerivation rec { name = "iio-sensor-proxy-${version}"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "hadess"; repo = "iio-sensor-proxy"; rev = version; - sha256 = "1c8izq73c00gvv0jc6zby5hcircs4cb16a1d3ivp1i1iflknj46n"; + sha256 = "06x1vvslsa44bgw8s5rr17q9i2ssbw0x04l75zsy3rql9r3y2jzg"; }; configurePhase = '' + runHook preConfigure + ./autogen.sh --prefix=$out \ --with-udevrulesdir=$out/lib/udev/rules.d \ --with-systemdsystemunitdir=$out/lib/systemd/system + + runHook postConfigure ''; buildInputs = [ From cc6e59e5d16d14281f0a9ccb8a9ef9073c71795a Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:24:40 +0200 Subject: [PATCH 405/992] libqalculate: add license meta --- pkgs/development/libraries/libqalculate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 377d9fe50be7..2c25d4181196 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { description = "An advanced calculator library"; homepage = http://qalculate.github.io; maintainers = with maintainers; [ gebner ]; + license = licenses.gpl2Plus; platforms = platforms.all; }; } From e2f10b5a74ec45b20b52928f6197abf3d8c0b0c3 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:26:30 +0200 Subject: [PATCH 406/992] libtiger: add license meta --- pkgs/development/libraries/libtiger/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index bd0084dbaaf7..7a72fa2b7a31 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { homepage = https://code.google.com/archive/p/libtiger/; description = "A rendering library for Kate streams using Pango and Cairo"; platforms = lib.platforms.unix; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ matthewbauer ]; }; } From a174f3ea97bc50bbb103054002e004f74b4007e8 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:27:14 +0200 Subject: [PATCH 407/992] libtxc_dxtn: add license meta --- pkgs/development/libraries/libtxc_dxtn/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 21e3a15449c2..b0be3cb3c12d 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libGLU_combined ]; - meta = { + meta = with stdenv.lib; { homepage = http://dri.freedesktop.org/wiki/S3TC; repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } From 55c736cd78440ec7b8b7810eff3b7e2e0e81531f Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:28:08 +0200 Subject: [PATCH 408/992] libui: add license meta --- pkgs/development/libraries/libui/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index b1e6938a1494..9eb2fe04fe68 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -49,9 +49,10 @@ in install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/andlabs/libui; description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports."; - platforms = stdenv.lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; }; } From 9ea9d86126b8fefbe0930e809313a34317c47ac7 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 11 Oct 2018 08:32:00 -0400 Subject: [PATCH 409/992] switched from builtins.fetchurl to pkgs.fetchurl --- nixos/tests/redmine.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index c1cb15f8288f..330f72854cac 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -17,13 +17,13 @@ import ./make-test.nix ({ pkgs, lib, ... }: services.redmine.enable = true; services.redmine.database.socket = "/run/mysqld/mysqld.sock"; services.redmine.plugins = { - redmine_env_auth = builtins.fetchurl { + redmine_env_auth = pkgs.fetchurl { url = https://github.com/Intera/redmine_env_auth/archive/0.6.zip; sha256 = "0yyr1yjd8gvvh832wdc8m3xfnhhxzk2pk3gm2psg5w9jdvd6skak"; }; }; services.redmine.themes = { - dkuk-redmine_alex_skin = builtins.fetchurl { + dkuk-redmine_alex_skin = pkgs.fetchurl { url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; }; @@ -37,4 +37,4 @@ import ./make-test.nix ({ pkgs, lib, ... }: $machine->waitForOpenPort('3000'); $machine->succeed("curl --fail http://localhost:3000/"); ''; -}) \ No newline at end of file +}) From 0cda784a79ca48fe64f2b90241e32eb737130e39 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:30:10 +0200 Subject: [PATCH 410/992] libusb: add license and other metadata --- pkgs/development/libraries/libusb/default.nix | 12 ++++++++++-- pkgs/development/libraries/libusb1/default.nix | 13 +++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 4704a1e5c331..adf354c45f2e 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -16,7 +16,15 @@ stdenv.mkDerivation { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + homepage = "https://libusb.info/"; + repositories.git = "https://github.com/libusb/libusb-compat-0.1"; + description = "cross-platform user-mode USB device library"; + longDescription = '' + libusb is a cross-platform user-mode library that provides access to USB devices. + The current API is of 1.0 version (libusb-1.0 API), this library is a wrapper exposing the legacy API. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 7ec714f02237..ac5c38a34f11 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -21,10 +21,15 @@ stdenv.mkDerivation rec { sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; - meta = { - homepage = http://www.libusb.info; - description = "User-space USB library"; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + homepage = "https://libusb.info/"; + repositories.git = "https://github.com/libusb/libusb"; + description = "cross-platform user-mode USB device library"; + longDescription = '' + libusb is a cross-platform user-mode library that provides access to USB devices. + ''; + platforms = platforms.all; + license = licenses.lgpl21Plus; maintainers = [ ]; }; } From 8362673d4bcedb4fd1c554282df57e72f24530d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 11 Oct 2018 14:37:49 +0200 Subject: [PATCH 411/992] nload: Include patch to fix screen corruption. (#48017) See added comment for details. --- pkgs/applications/networking/nload/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix index 879461c8acd5..2c16fabc5c41 100644 --- a/pkgs/applications/networking/nload/default.nix +++ b/pkgs/applications/networking/nload/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchurl, fetchpatch, ncurses }: stdenv.mkDerivation rec { version = "0.7.4"; @@ -9,6 +9,19 @@ stdenv.mkDerivation rec { sha256 = "1rb9skch2kgqzigf19x8bzk211jdfjfdkrcvaqyj89jy2pkm3h61"; }; + patches = [ + # Fixes an ugly bug of graphs scrolling to the side, corrupting the view. + # There is an upstream fix, but not a new upstream release that includes it. + # Other distributions like Gentoo also patch this as a result; see: + # https://github.com/rolandriegel/nload/issues/3#issuecomment-427579143 + # TODO Remove when https://github.com/rolandriegel/nload/issues/3 is merged and available + (fetchpatch { + url = "https://github.com/rolandriegel/nload/commit/8a93886e0fb33a81b8fe32e88ee106a581fedd34.patch"; + name = "nload-0.7.4-Eliminate-flicker-on-some-terminals.patch"; + sha256 = "10yppy5l50wzpcvagsqkbyf1rcan6aj30am4rw8hmkgnbidf4zbq"; + }) + ]; + buildInputs = [ ncurses ]; meta = { From 33171befdbbd4370343d2250fdc82309125fb2ac Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 11 Oct 2018 14:33:20 +0200 Subject: [PATCH 412/992] spotify: fix icon --- pkgs/applications/audio/spotify/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 81cda4edaedb..cbcf5220564b 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -126,6 +126,9 @@ stdenv.mkDerivation { --prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix PATH : "${gnome3.zenity}/bin" + # fix Icon line in the desktop file (#48062) + sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop" + # Desktop file mkdir -p "$out/share/applications/" cp "$out/share/spotify/spotify.desktop" "$out/share/applications/" From e3d97997fff1bad6fbef5001619dc5a0910a2364 Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Wed, 3 Oct 2018 13:40:34 +0200 Subject: [PATCH 413/992] brigand: init at 1.3.0 --- .../development/libraries/brigand/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/brigand/default.nix diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix new file mode 100644 index 000000000000..b4a57396cc8b --- /dev/null +++ b/pkgs/development/libraries/brigand/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "brigand-${version}"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "edouarda"; + repo = "brigand"; + rev = "4db9f665b4ece31b51aaf35b499b2c8e5811efa3"; + sha256 = "14b8r3s24zq0l3addy3irzxs5cyqn3763y5s310lmzzswgj1v7r4"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Instant compile time C++ 11 metaprogramming library"; + longDescription = '' + Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library. + Everything you were doing with Boost.MPL can be done with Brigand. And if that's not the case, open an issue!''; + homepage = https://github.com/edouarda/brigand; + license = licenses.boost; + maintainers = with maintainers; [ pmiddend ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8fd9e855f7e..2c8d5a3548dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -963,6 +963,8 @@ with pkgs; brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; + brigand = callPackage ../development/libraries/brigand { }; + brltty = callPackage ../tools/misc/brltty { alsaSupport = (!stdenv.isDarwin); systemdSupport = stdenv.isLinux; From 2dcd512e7431001c7c0b80db60f524e2893c7654 Mon Sep 17 00:00:00 2001 From: Victor SENE Date: Thu, 11 Oct 2018 16:13:23 +0200 Subject: [PATCH 414/992] nixos/nextcloud: add poolConfig option (#48094) --- nixos/modules/services/web-apps/nextcloud.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 44c3df1d057b..db4c8e1a3d85 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -114,6 +114,21 @@ in { ''; }; + poolConfig = mkOption { + type = types.lines; + default = '' + pm = dynamic + pm.max_children = 32 + pm.start_servers = 2 + pm.min_spare_servers = 2 + pm.max_spare_servers = 4 + pm.max_requests = 500 + ''; + description = '' + Options for nextcloud's PHP pool. See the documentation on php-fpm.conf for details on configuration directives. + ''; + }; + config = { dbtype = mkOption { type = types.enum [ "sqlite" "pgsql" "mysql" ]; @@ -339,11 +354,7 @@ in { listen.group = nginx user = nextcloud group = nginx - pm = dynamic - pm.max_children = 32 - pm.start_servers = 2 - pm.min_spare_servers = 2 - pm.max_spare_servers = 4 + ${cfg.poolConfig} env[NEXTCLOUD_CONFIG_DIR] = ${cfg.home}/config env[PATH] = /run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin ${phpAdminValues} From 3e356b55dde193545e89492f50c1364b84f7a526 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 11 Oct 2018 16:17:57 +0200 Subject: [PATCH 415/992] lazygit: init at 0.4 --- pkgs/development/tools/lazygit/default.nix | 27 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/lazygit/default.nix diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix new file mode 100644 index 000000000000..87571f1fcbb7 --- /dev/null +++ b/pkgs/development/tools/lazygit/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "lazygit-${version}"; + version = "0.4"; + + goPackagePath = "github.com/jesseduffield/lazygit"; + + src = fetchFromGitHub { + owner = "jesseduffield"; + repo = "lazygit"; + rev = "v${version}"; + sha256 = "0piljnwv778z7zc1pglkidiys1a3yv4d7z9wsrcj1nszlcn3ifyz"; + }; + + postPatch = '' + rm -rf scripts + ''; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Simple terminal UI for git commands"; + license = licenses.mit; + maintainers = with stdenv.lib.maintainers; [ fpletz ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c8d5a3548dc..8c8696d7f794 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8558,6 +8558,8 @@ with pkgs; kythe = callPackage ../development/tools/kythe { }; + lazygit = callPackage ../development/tools/lazygit { }; + Literate = callPackage ../development/tools/literate-programming/Literate {}; lcov = callPackage ../development/tools/analysis/lcov { }; From fceab3ec621e13b6317af77c7177c7ebd2c1dd64 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 11 Oct 2018 17:23:47 +0200 Subject: [PATCH 416/992] lib: fix wording of the `overrideScope` warning --- lib/customisation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/customisation.nix b/lib/customisation.nix index df9d977e9ec7..68062dd0daf0 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -196,7 +196,7 @@ rec { newScope = scope: newScope (self // scope); callPackage = self.newScope {}; overrideScope = g: lib.warn - "`overrideScope` (from `lib.makeScope`) is deprecated. Do `overrideScope' (self: self: { … })` instead of `overrideScope (super: self: { … })`. All other overrides have the parameters in that order, including other definitions of `overrideScope`. This was the only definition violating the pattern." + "`overrideScope` (from `lib.makeScope`) is deprecated. Do `overrideScope' (self: super: { … })` instead of `overrideScope (super: self: { … })`. All other overrides have the parameters in that order, including other definitions of `overrideScope`. This was the only definition violating the pattern." (makeScope newScope (lib.fixedPoints.extends (lib.flip g) f)); overrideScope' = g: makeScope newScope (lib.fixedPoints.extends g f); packages = f; From dc214ed99b1de1441a052752616ea1a9f1e1bf64 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 11 Oct 2018 12:27:49 -0400 Subject: [PATCH 417/992] __splicedPackages: Don't include xorg For historical reasons, callPackage has the xorg packages in scope. This unstable building block is more versatile without the xorg hack baked in. --- pkgs/top-level/splice.nix | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 41fdc22d1477..82a781083e2c 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -24,15 +24,6 @@ lib: pkgs: actuallySplice: let - defaultBuildBuildScope = pkgs.buildPackages.buildPackages // pkgs.buildPackages.buildPackages.xorg; - defaultBuildHostScope = pkgs.buildPackages // pkgs.buildPackages.xorg; - defaultBuildTargetScope = - if pkgs.stdenv.targetPlatform == pkgs.stdenv.hostPlatform - then defaultBuildHostScope - else assert pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform; defaultHostTargetScope; - defaultHostHostScope = {}; # unimplemented - defaultHostTargetScope = pkgs // pkgs.xorg; - defaultTargetTargetScope = pkgs.targetPackages // pkgs.targetPackages.xorg or {}; spliceReal = { pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , pkgsHostHost, pkgsHostTarget @@ -105,19 +96,24 @@ let } @ args: if actuallySplice then spliceReal args else pkgsHostTarget; - splicedPackages = splicePackages { - pkgsBuildBuild = defaultBuildBuildScope; - pkgsBuildHost = defaultBuildHostScope; - pkgsBuildTarget = defaultBuildTargetScope; - pkgsHostHost = defaultHostHostScope; - pkgsHostTarget = defaultHostTargetScope; - pkgsTargetTarget = defaultTargetTargetScope; + splicedPackages = splicePackages rec { + pkgsBuildBuild = pkgs.buildPackages.buildPackages; + pkgsBuildHost = pkgs.buildPackages; + pkgsBuildTarget = + if pkgs.stdenv.targetPlatform == pkgs.stdenv.hostPlatform + then pkgsBuildHost + else assert pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform; pkgsHostTarget; + pkgsHostHost = {}; # unimplemented + pkgsHostTarget = pkgs; + pkgsTargetTarget = pkgs.targetPackages; } // { # These should never be spliced under any circumstances inherit (pkgs) pkgs buildPackages targetPackages; inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform; }; + splicedPackagesWithXorg = splicedPackages // splicedPackages.xorg; + in { @@ -128,9 +124,9 @@ in # `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below). callPackage = pkgs.newScope {}; - callPackages = lib.callPackagesWith splicedPackages; + callPackages = lib.callPackagesWith splicedPackagesWithXorg; - newScope = extra: lib.callPackageWith (splicedPackages // extra); + newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // extra); # Haskell package sets need this because they reimplement their own # `newScope`. From 08049025a3188b367a1baf6162425be851a91e2f Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 19 Aug 2018 20:46:11 +0900 Subject: [PATCH 418/992] xorg: sync source lists with default.nix --- pkgs/servers/x11/xorg/extra.list | 2 +- pkgs/servers/x11/xorg/old.list | 2 +- pkgs/servers/x11/xorg/tarballs-7.7.list | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 28b698bdc816..17b42e416ab6 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -2,7 +2,7 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 +https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index fd6eae916392..fdd5a837d8be 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -1,7 +1,7 @@ mirror://xorg/individual/app/twm-1.0.8.tar.bz2 mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 -mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 +mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2 mirror://xorg/individual/app/xfs-1.1.4.tar.bz2 mirror://xorg/individual/app/xinit-1.4.0.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 6e67e8eb6e14..fb1dc378b51b 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -106,7 +106,7 @@ mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/xauth-1.0.10.tar.bz2 -mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2 +mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2 @@ -175,10 +175,10 @@ mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 From 9454f71fefcbe413fdfcb61b510256f1301c5f5c Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 19 Aug 2018 19:55:08 +0900 Subject: [PATCH 419/992] xorg: allow overriding via overrideScope --- pkgs/servers/x11/xorg/default.nix | 1231 ++++++++++------- .../x11/xorg/generate-expr-from-tarballs.pl | 32 +- pkgs/servers/x11/xorg/overrides.nix | 429 +++--- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 964 insertions(+), 732 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c9e8dd04c470..eaefb57a982c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,2771 +1,2994 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig -, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol +, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol, lib, newScope , dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook , autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; let - mkDerivation = name: attrs: - let newAttrs = (overrides."${name}" or (x: x)) attrs; - stdenv = newAttrs.stdenv or args.stdenv; - in stdenv.mkDerivation ((removeAttrs newAttrs [ "stdenv" ]) // { - hardeningDisable = [ "bindnow" "relro" ]; - }); + overrides = import ./overrides.nix {inherit args;}; - overrides = import ./overrides.nix {inherit args xorg;}; + xorg = lib.makeScope newScope xorgPackages; - xorg = rec { + xorgPackages = self: with self; { inherit pixman; - applewmproto = (mkDerivation "applewmproto" { + applewmproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "applewmproto-1.4.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2; sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - appres = (mkDerivation "appres" { + appres = callPackage ({ stdenv, libX11, xproto, libXt }: stdenv.mkDerivation { name = "appres-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2; sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto libXt ;}; + }) {}; - bdftopcf = (mkDerivation "bdftopcf" { + bdftopcf = callPackage ({ stdenv }: stdenv.mkDerivation { name = "bdftopcf-1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2; sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - bigreqsproto = (mkDerivation "bigreqsproto" { + bigreqsproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "bigreqsproto-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2; sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - bitmap = (mkDerivation "bitmap" { + bitmap = callPackage ({ stdenv, libX11, libXaw, xbitmaps, libXmu, xproto, libXt }: stdenv.mkDerivation { name = "bitmap-1.0.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/bitmap-1.0.8.tar.gz; sha256 = "1z06a1sn3iq72rmh73f11xgb7n46bdav1fvpgczxjp6al88bsbqs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw xbitmaps libXmu xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXaw xbitmaps libXmu xproto libXt ;}; + }) {}; - compositeproto = (mkDerivation "compositeproto" { + compositeproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "compositeproto-0.4.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2; sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - damageproto = (mkDerivation "damageproto" { + damageproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "damageproto-1.2.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2; sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - dmxproto = (mkDerivation "dmxproto" { + dmxproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "dmxproto-2.3.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2; sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - dri2proto = (mkDerivation "dri2proto" { + dri2proto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "dri2proto-2.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2; sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - dri3proto = (mkDerivation "dri3proto" { + dri3proto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "dri3proto-1.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2; sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - encodings = (mkDerivation "encodings" { + encodings = callPackage ({ stdenv }: stdenv.mkDerivation { name = "encodings-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2; sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - fixesproto = (mkDerivation "fixesproto" { + fixesproto = callPackage ({ stdenv, xextproto }: stdenv.mkDerivation { name = "fixesproto-5.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2; sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xextproto ;}; + }) {}; - fontadobe100dpi = (mkDerivation "fontadobe100dpi" { + fontadobe100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontadobe75dpi = (mkDerivation "fontadobe75dpi" { + fontadobe75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" { + fontadobeutopia100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" { + fontadobeutopia75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" { + fontadobeutopiatype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontalias = (mkDerivation "fontalias" { + fontalias = callPackage ({ stdenv }: stdenv.mkDerivation { name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2; sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - fontarabicmisc = (mkDerivation "fontarabicmisc" { + fontarabicmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontbh100dpi = (mkDerivation "fontbh100dpi" { + fontbh100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontbh75dpi = (mkDerivation "fontbh75dpi" { + fontbh75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontbhlucidatypewriter100dpi = (mkDerivation "fontbhlucidatypewriter100dpi" { + fontbhlucidatypewriter100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontbhlucidatypewriter75dpi = (mkDerivation "fontbhlucidatypewriter75dpi" { + fontbhlucidatypewriter75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontbhttf = (mkDerivation "fontbhttf" { + fontbhttf = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontbhtype1 = (mkDerivation "fontbhtype1" { + fontbhtype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontbitstream100dpi = (mkDerivation "fontbitstream100dpi" { + fontbitstream100dpi = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontbitstream75dpi = (mkDerivation "fontbitstream75dpi" { + fontbitstream75dpi = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontbitstreamtype1 = (mkDerivation "fontbitstreamtype1" { + fontbitstreamtype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontcronyxcyrillic = (mkDerivation "fontcronyxcyrillic" { + fontcronyxcyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontcursormisc = (mkDerivation "fontcursormisc" { + fontcursormisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontdaewoomisc = (mkDerivation "fontdaewoomisc" { + fontdaewoomisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontdecmisc = (mkDerivation "fontdecmisc" { + fontdecmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontibmtype1 = (mkDerivation "fontibmtype1" { + fontibmtype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontisasmisc = (mkDerivation "fontisasmisc" { + fontisasmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontjismisc = (mkDerivation "fontjismisc" { + fontjismisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontmicromisc = (mkDerivation "fontmicromisc" { + fontmicromisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontmisccyrillic = (mkDerivation "fontmisccyrillic" { + fontmisccyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontmiscethiopic = (mkDerivation "fontmiscethiopic" { + fontmiscethiopic = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontmiscmeltho = (mkDerivation "fontmiscmeltho" { + fontmiscmeltho = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - fontmiscmisc = (mkDerivation "fontmiscmisc" { + fontmiscmisc = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontmuttmisc = (mkDerivation "fontmuttmisc" { + fontmuttmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontschumachermisc = (mkDerivation "fontschumachermisc" { + fontschumachermisc = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + }) {}; - fontscreencyrillic = (mkDerivation "fontscreencyrillic" { + fontscreencyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontsonymisc = (mkDerivation "fontsonymisc" { + fontsonymisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontsproto = (mkDerivation "fontsproto" { + fontsproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "fontsproto-2.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2; sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - fontsunmisc = (mkDerivation "fontsunmisc" { + fontsunmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontutil = (mkDerivation "fontutil" { + fontutil = callPackage ({ stdenv }: stdenv.mkDerivation { name = "font-util-1.3.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/font/font-util-1.3.1.tar.bz2; sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - fontwinitzkicyrillic = (mkDerivation "fontwinitzkicyrillic" { + fontwinitzkicyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit bdftopcf mkfontdir ;}; + }) {}; - fontxfree86type1 = (mkDerivation "fontxfree86type1" { + fontxfree86type1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit mkfontdir mkfontscale ;}; + }) {}; - gccmakedep = (mkDerivation "gccmakedep" { + gccmakedep = callPackage ({ stdenv }: stdenv.mkDerivation { name = "gccmakedep-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2; sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - glproto = (mkDerivation "glproto" { + glproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "glproto-1.4.17"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2; sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - iceauth = (mkDerivation "iceauth" { + iceauth = callPackage ({ stdenv, libICE, xproto }: stdenv.mkDerivation { name = "iceauth-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2; sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libICE xproto ;}; + }) {}; - imake = (mkDerivation "imake" { + imake = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { name = "imake-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2; sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - inputproto = (mkDerivation "inputproto" { + inputproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "inputproto-2.3.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2; sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - kbproto = (mkDerivation "kbproto" { + kbproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "kbproto-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2; sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - libAppleWM = (mkDerivation "libAppleWM" { + libAppleWM = callPackage ({ stdenv, applewmproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2; sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ applewmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit applewmproto libX11 libXext xextproto ;}; + }) {}; - libFS = (mkDerivation "libFS" { + libFS = callPackage ({ stdenv, fontsproto, xproto, xtrans }: stdenv.mkDerivation { name = "libFS-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2; sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto xproto xtrans ;}; + }) {}; - libICE = (mkDerivation "libICE" { + libICE = callPackage ({ stdenv, xproto, xtrans }: stdenv.mkDerivation { name = "libICE-1.0.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2; sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto xtrans ;}; + }) {}; - libSM = (mkDerivation "libSM" { + libSM = callPackage ({ stdenv, libICE, libuuid, xproto, xtrans }: stdenv.mkDerivation { name = "libSM-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2; sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libuuid xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libICE libuuid xproto xtrans ;}; + }) {}; - libWindowsWM = (mkDerivation "libWindowsWM" { + libWindowsWM = callPackage ({ stdenv, windowswmproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ windowswmproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit windowswmproto libX11 libXext xextproto ;}; + }) {}; - libX11 = (mkDerivation "libX11" { + libX11 = callPackage ({ stdenv, inputproto, kbproto, libxcb, xextproto, xf86bigfontproto, xproto, xtrans }: stdenv.mkDerivation { name = "libX11-1.6.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2; sha256 = "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; + }) {}; - libXScrnSaver = (mkDerivation "libXScrnSaver" { + libXScrnSaver = callPackage ({ stdenv, scrnsaverproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libXScrnSaver-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2; sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ scrnsaverproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit scrnsaverproto libX11 libXext xextproto ;}; + }) {}; - libXau = (mkDerivation "libXau" { + libXau = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { name = "libXau-1.0.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - libXaw = (mkDerivation "libXaw" { + libXaw = callPackage ({ stdenv, libX11, libXext, xextproto, libXmu, libXpm, xproto, libXt }: stdenv.mkDerivation { name = "libXaw-1.0.13"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2; sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto libXmu libXpm xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; + }) {}; - libXcomposite = (mkDerivation "libXcomposite" { + libXcomposite = callPackage ({ stdenv, compositeproto, libX11, libXfixes, xproto }: stdenv.mkDerivation { name = "libXcomposite-0.4.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2; sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ compositeproto libX11 libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit compositeproto libX11 libXfixes xproto ;}; + }) {}; - libXcursor = (mkDerivation "libXcursor" { + libXcursor = callPackage ({ stdenv, fixesproto, libX11, libXfixes, xproto, libXrender }: stdenv.mkDerivation { name = "libXcursor-1.1.15"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2; sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fixesproto libX11 libXfixes xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; + }) {}; - libXdamage = (mkDerivation "libXdamage" { + libXdamage = callPackage ({ stdenv, damageproto, fixesproto, libX11, xextproto, libXfixes, xproto }: stdenv.mkDerivation { name = "libXdamage-1.1.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2; sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ damageproto fixesproto libX11 xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; + }) {}; - libXdmcp = (mkDerivation "libXdmcp" { + libXdmcp = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { name = "libXdmcp-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2; sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - libXext = (mkDerivation "libXext" { + libXext = callPackage ({ stdenv, libX11, xextproto, xproto }: stdenv.mkDerivation { name = "libXext-1.3.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xextproto xproto ;}; + }) {}; - libXfixes = (mkDerivation "libXfixes" { + libXfixes = callPackage ({ stdenv, fixesproto, libX11, xextproto, xproto }: stdenv.mkDerivation { name = "libXfixes-5.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2; sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fixesproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fixesproto libX11 xextproto xproto ;}; + }) {}; - libXfont = (mkDerivation "libXfont" { + libXfont = callPackage ({ stdenv, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont-1.5.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2; sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; + }) {}; - libXfont2 = (mkDerivation "libXfont2" { + libXfont2 = callPackage ({ stdenv, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont2-2.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2; sha256 = "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; + }) {}; - libXft = (mkDerivation "libXft" { + libXft = callPackage ({ stdenv, fontconfig, freetype, libX11, xproto, libXrender }: stdenv.mkDerivation { name = "libXft-2.3.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2; sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontconfig freetype libX11 xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; + }) {}; - libXi = (mkDerivation "libXi" { + libXi = callPackage ({ stdenv, inputproto, libX11, libXext, xextproto, libXfixes, xproto }: stdenv.mkDerivation { name = "libXi-1.7.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2; sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; + }) {}; - libXinerama = (mkDerivation "libXinerama" { + libXinerama = callPackage ({ stdenv, libX11, libXext, xextproto, xineramaproto }: stdenv.mkDerivation { name = "libXinerama-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2; sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xineramaproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xineramaproto ;}; + }) {}; - libXmu = (mkDerivation "libXmu" { + libXmu = callPackage ({ stdenv, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation { name = "libXmu-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2; sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xproto libXt ;}; + }) {}; - libXp = (mkDerivation "libXp" { + libXp = callPackage ({ stdenv, printproto, libX11, libXau, libXext, xextproto }: stdenv.mkDerivation { name = "libXp-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2; sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ printproto libX11 libXau libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit printproto libX11 libXau libXext xextproto ;}; + }) {}; - libXpm = (mkDerivation "libXpm" { + libXpm = callPackage ({ stdenv, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation { name = "libXpm-3.5.12"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xproto libXt ;}; + }) {}; - libXpresent = (mkDerivation "libXpresent" { + libXpresent = callPackage ({ stdenv, presentproto, libX11, xextproto, xproto }: stdenv.mkDerivation { name = "libXpresent-1.0.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2; sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ presentproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit presentproto libX11 xextproto xproto ;}; + }) {}; - libXrandr = (mkDerivation "libXrandr" { + libXrandr = callPackage ({ stdenv, randrproto, renderproto, libX11, libXext, xextproto, xproto, libXrender }: stdenv.mkDerivation { name = "libXrandr-1.5.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2; sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ randrproto renderproto libX11 libXext xextproto xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; + }) {}; - libXrender = (mkDerivation "libXrender" { + libXrender = callPackage ({ stdenv, renderproto, libX11, xproto }: stdenv.mkDerivation { name = "libXrender-0.9.10"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2; sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ renderproto libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit renderproto libX11 xproto ;}; + }) {}; - libXres = (mkDerivation "libXres" { + libXres = callPackage ({ stdenv, resourceproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation { name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2; sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ resourceproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit resourceproto libX11 libXext xextproto xproto ;}; + }) {}; - libXt = (mkDerivation "libXt" { + libXt = callPackage ({ stdenv, libICE, kbproto, libSM, libX11, xproto }: stdenv.mkDerivation { name = "libXt-1.1.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2; sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE kbproto libSM libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libICE kbproto libSM libX11 xproto ;}; + }) {}; - libXtst = (mkDerivation "libXtst" { + libXtst = callPackage ({ stdenv, inputproto, recordproto, libX11, libXext, xextproto, libXi }: stdenv.mkDerivation { name = "libXtst-1.2.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2; sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto recordproto libX11 libXext xextproto libXi ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; + }) {}; - libXv = (mkDerivation "libXv" { + libXv = callPackage ({ stdenv, videoproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation { name = "libXv-1.0.11"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2; sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ videoproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit videoproto libX11 libXext xextproto xproto ;}; + }) {}; - libXvMC = (mkDerivation "libXvMC" { + libXvMC = callPackage ({ stdenv, videoproto, libX11, libXext, xextproto, xproto, libXv }: stdenv.mkDerivation { name = "libXvMC-1.0.10"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2; sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ videoproto libX11 libXext xextproto xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; + }) {}; - libXxf86dga = (mkDerivation "libXxf86dga" { + libXxf86dga = callPackage ({ stdenv, libX11, libXext, xextproto, xf86dgaproto, xproto }: stdenv.mkDerivation { name = "libXxf86dga-1.1.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2; sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xf86dgaproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; + }) {}; - libXxf86misc = (mkDerivation "libXxf86misc" { + libXxf86misc = callPackage ({ stdenv, libX11, libXext, xextproto, xf86miscproto, xproto }: stdenv.mkDerivation { name = "libXxf86misc-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2; sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xf86miscproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; + }) {}; - libXxf86vm = (mkDerivation "libXxf86vm" { + libXxf86vm = callPackage ({ stdenv, libX11, libXext, xextproto, xf86vidmodeproto, xproto }: stdenv.mkDerivation { name = "libXxf86vm-1.1.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2; sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext xextproto xf86vidmodeproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; + }) {}; - libdmx = (mkDerivation "libdmx" { + libdmx = callPackage ({ stdenv, dmxproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libdmx-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2; sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dmxproto libX11 libXext xextproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dmxproto libX11 libXext xextproto ;}; + }) {}; - libfontenc = (mkDerivation "libfontenc" { + libfontenc = callPackage ({ stdenv, xproto, zlib }: stdenv.mkDerivation { name = "libfontenc-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2; sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto zlib ;}; + }) {}; - libpciaccess = (mkDerivation "libpciaccess" { + libpciaccess = callPackage ({ stdenv, zlib }: stdenv.mkDerivation { name = "libpciaccess-0.14"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2; sha256 = "197jbcpvp4z4x6j705mq2y4fsnnypy6f85y8xalgwhgx5bhl7x9x"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit zlib ;}; + }) {}; - libpthreadstubs = (mkDerivation "libpthreadstubs" { + libpthreadstubs = callPackage ({ stdenv }: stdenv.mkDerivation { name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - libxcb = (mkDerivation "libxcb" { + libxcb = callPackage ({ stdenv, libxslt, libpthreadstubs, python, libXau, xcbproto, libXdmcp }: stdenv.mkDerivation { name = "libxcb-1.12"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2; sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; + }) {}; - libxkbfile = (mkDerivation "libxkbfile" { + libxkbfile = callPackage ({ stdenv, kbproto, libX11 }: stdenv.mkDerivation { name = "libxkbfile-1.0.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2; sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ kbproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit kbproto libX11 ;}; + }) {}; - libxshmfence = (mkDerivation "libxshmfence" { + libxshmfence = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { name = "libxshmfence-1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2; sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - lndir = (mkDerivation "lndir" { + lndir = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { name = "lndir-1.0.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2; sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - luit = (mkDerivation "luit" { + luit = callPackage ({ stdenv, libfontenc }: stdenv.mkDerivation { name = "luit-1.1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2; sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libfontenc ;}; + }) {}; - makedepend = (mkDerivation "makedepend" { + makedepend = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { name = "makedepend-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2; sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - mkfontdir = (mkDerivation "mkfontdir" { + mkfontdir = callPackage ({ stdenv }: stdenv.mkDerivation { name = "mkfontdir-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2; sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - mkfontscale = (mkDerivation "mkfontscale" { + mkfontscale = callPackage ({ stdenv, libfontenc, freetype, xproto, zlib }: stdenv.mkDerivation { name = "mkfontscale-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/mkfontscale-1.1.2.tar.bz2; sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc freetype xproto zlib ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libfontenc freetype xproto zlib ;}; + }) {}; - presentproto = (mkDerivation "presentproto" { + presentproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "presentproto-1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2; sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - printproto = (mkDerivation "printproto" { + printproto = callPackage ({ stdenv, libXau }: stdenv.mkDerivation { name = "printproto-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2; sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXau ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXau ;}; + }) {}; - randrproto = (mkDerivation "randrproto" { + randrproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "randrproto-1.5.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/randrproto-1.5.0.tar.bz2; sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - recordproto = (mkDerivation "recordproto" { + recordproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "recordproto-1.14.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2; sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - renderproto = (mkDerivation "renderproto" { + renderproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "renderproto-0.11.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2; sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - resourceproto = (mkDerivation "resourceproto" { + resourceproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "resourceproto-1.2.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2; sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - scrnsaverproto = (mkDerivation "scrnsaverproto" { + scrnsaverproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "scrnsaverproto-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2; sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - sessreg = (mkDerivation "sessreg" { + sessreg = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { name = "sessreg-1.1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2; sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xproto ;}; + }) {}; - setxkbmap = (mkDerivation "setxkbmap" { + setxkbmap = callPackage ({ stdenv, libX11, libxkbfile }: stdenv.mkDerivation { name = "setxkbmap-1.3.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2; sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libxkbfile ;}; + }) {}; - smproxy = (mkDerivation "smproxy" { + smproxy = callPackage ({ stdenv, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { name = "smproxy-1.0.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2; sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libSM libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libICE libSM libXmu libXt ;}; + }) {}; - twm = (mkDerivation "twm" { + twm = callPackage ({ stdenv, libICE, libSM, libX11, libXext, libXmu, xproto, libXt }: stdenv.mkDerivation { name = "twm-1.0.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/twm-1.0.9.tar.bz2; sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libICE libSM libX11 libXext libXmu xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; + }) {}; - utilmacros = (mkDerivation "utilmacros" { + utilmacros = callPackage ({ stdenv }: stdenv.mkDerivation { name = "util-macros-1.19.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2; sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - videoproto = (mkDerivation "videoproto" { + videoproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "videoproto-2.3.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2; sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - windowswmproto = (mkDerivation "windowswmproto" { + windowswmproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "windowswmproto-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2; sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - x11perf = (mkDerivation "x11perf" { + x11perf = callPackage ({ stdenv, libX11, libXext, libXft, libXmu, xproto, libXrender }: stdenv.mkDerivation { name = "x11perf-1.6.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2; sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXft libXmu xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;}; + }) {}; - xauth = (mkDerivation "xauth" { + xauth = callPackage ({ stdenv, libX11, libXau, libXext, libXmu, xproto }: stdenv.mkDerivation { name = "xauth-1.0.10"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2; sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXext libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXau libXext libXmu xproto ;}; + }) {}; - xbacklight = (mkDerivation "xbacklight" { + xbacklight = callPackage ({ stdenv, libxcb, xcbutil }: stdenv.mkDerivation { name = "xbacklight-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2; sha256 = "0pmzaz4kp38qv2lqiw5rnqhwzmwrq65m1x5j001mmv99wh9isnk1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb xcbutil ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libxcb xcbutil ;}; + }) {}; - xbitmaps = (mkDerivation "xbitmaps" { + xbitmaps = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xbitmaps-1.1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2; sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xcbproto = (mkDerivation "xcbproto" { + xcbproto = callPackage ({ stdenv, python }: stdenv.mkDerivation { name = "xcb-proto-1.12"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2; sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit python ;}; + }) {}; - xcbutil = (mkDerivation "xcbutil" { + xcbutil = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xproto ;}; + }) {}; - xcbutilcursor = (mkDerivation "xcbutilcursor" { + xcbutilcursor = callPackage ({ stdenv, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xproto }: stdenv.mkDerivation { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { url = https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;}; + }) {}; - xcbutilerrors = (mkDerivation "xcbutilerrors" { + xcbutilerrors = callPackage ({ stdenv, gperf, m4, libxcb, xcbproto, xproto }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xcbproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xcbproto xproto ;}; + }) {}; - xcbutilimage = (mkDerivation "xcbutilimage" { + xcbutilimage = callPackage ({ stdenv, gperf, m4, libxcb, xcbutil, xproto }: stdenv.mkDerivation { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xcbutil xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xcbutil xproto ;}; + }) {}; - xcbutilkeysyms = (mkDerivation "xcbutilkeysyms" { + xcbutilkeysyms = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xproto ;}; + }) {}; - xcbutilrenderutil = (mkDerivation "xcbutilrenderutil" { + xcbutilrenderutil = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xproto ;}; + }) {}; - xcbutilwm = (mkDerivation "xcbutilwm" { + xcbutilwm = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gperf m4 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit gperf m4 libxcb xproto ;}; + }) {}; - xclock = (mkDerivation "xclock" { + xclock = callPackage ({ stdenv, libX11, libXaw, libXft, libxkbfile, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation { name = "xclock-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2; sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;}; + }) {}; - xcmiscproto = (mkDerivation "xcmiscproto" { + xcmiscproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xcmiscproto-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2; sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xcmsdb = (mkDerivation "xcmsdb" { + xcmsdb = callPackage ({ stdenv, libX11 }: stdenv.mkDerivation { name = "xcmsdb-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2; sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 ;}; + }) {}; - xcompmgr = (mkDerivation "xcompmgr" { + xcompmgr = callPackage ({ stdenv, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { name = "xcompmgr-1.1.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2; sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;}; + }) {}; - xcursorgen = (mkDerivation "xcursorgen" { + xcursorgen = callPackage ({ stdenv, libpng, libX11, libXcursor }: stdenv.mkDerivation { name = "xcursorgen-1.0.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpng libX11 libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libpng libX11 libXcursor ;}; + }) {}; - xcursorthemes = (mkDerivation "xcursorthemes" { + xcursorthemes = callPackage ({ stdenv, libXcursor }: stdenv.mkDerivation { name = "xcursor-themes-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2; sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXcursor ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXcursor ;}; + }) {}; - xdm = (mkDerivation "xdm" { + xdm = callPackage ({ stdenv, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libXt }: stdenv.mkDerivation { name = "xdm-1.1.11"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2; sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; + }) {}; - xdpyinfo = (mkDerivation "xdpyinfo" { + xdpyinfo = callPackage ({ stdenv, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { name = "xdpyinfo-1.3.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2; sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; + }) {}; - xdriinfo = (mkDerivation "xdriinfo" { + xdriinfo = callPackage ({ stdenv, glproto, libX11 }: stdenv.mkDerivation { name = "xdriinfo-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xdriinfo-1.0.5.tar.bz2; sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glproto libX11 ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit glproto libX11 ;}; + }) {}; - xev = (mkDerivation "xev" { + xev = callPackage ({ stdenv, libX11, xproto, libXrandr }: stdenv.mkDerivation { name = "xev-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xev-1.2.2.tar.bz2; sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto libXrandr ;}; + }) {}; - xextproto = (mkDerivation "xextproto" { + xextproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xextproto-7.3.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2; sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xeyes = (mkDerivation "xeyes" { + xeyes = callPackage ({ stdenv, libX11, libXext, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation { name = "xeyes-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2; sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXext libXmu libXrender libXt ]; + buildInputs = [ libX11 libXext libXmu xproto libXrender libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext libXmu libXrender libXt ;}; + }) {}; - xf86bigfontproto = (mkDerivation "xf86bigfontproto" { + xf86bigfontproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xf86bigfontproto-1.2.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2; sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xf86dgaproto = (mkDerivation "xf86dgaproto" { + xf86dgaproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xf86dgaproto-2.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2; sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xf86driproto = (mkDerivation "xf86driproto" { + xf86driproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xf86driproto-2.1.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2; sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xf86inputevdev = (mkDerivation "xf86inputevdev" { + xf86inputevdev = callPackage ({ stdenv, inputproto, udev, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-evdev-2.10.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2; sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto udev xorgserver xproto ;}; + }) {}; - xf86inputjoystick = (mkDerivation "xf86inputjoystick" { + xf86inputjoystick = callPackage ({ stdenv, inputproto, kbproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto kbproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto kbproto xorgserver xproto ;}; + }) {}; - xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" { + xf86inputkeyboard = callPackage ({ stdenv, inputproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto xorgserver xproto ;}; + }) {}; - xf86inputlibinput = (mkDerivation "xf86inputlibinput" { + xf86inputlibinput = callPackage ({ stdenv, inputproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-libinput-0.26.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-libinput-0.26.0.tar.bz2; sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto xorgserver xproto ;}; + }) {}; - xf86inputmouse = (mkDerivation "xf86inputmouse" { + xf86inputmouse = callPackage ({ stdenv, inputproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-mouse-1.9.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2; sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto xorgserver xproto ;}; + }) {}; - xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" { + xf86inputsynaptics = callPackage ({ stdenv, inputproto, randrproto, recordproto, libX11, libXi, xorgserver, xproto, libXtst }: stdenv.mkDerivation { name = "xf86-input-synaptics-1.9.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2; sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; + }) {}; - xf86inputvmmouse = (mkDerivation "xf86inputvmmouse" { + xf86inputvmmouse = callPackage ({ stdenv, inputproto, udev, randrproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-vmmouse-13.1.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2; sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto udev randrproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto udev randrproto xorgserver xproto ;}; + }) {}; - xf86inputvoid = (mkDerivation "xf86inputvoid" { + xf86inputvoid = callPackage ({ stdenv, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-void-1.4.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2; sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xorgserver xproto ;}; + }) {}; - xf86miscproto = (mkDerivation "xf86miscproto" { + xf86miscproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xf86miscproto-0.9.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2; sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { + xf86videoamdgpu = callPackage ({ stdenv, fontsproto, mesa_noglu, libGL, libdrm, udev, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-amdgpu-1.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2; sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videoark = (mkDerivation "xf86videoark" { + xf86videoark = callPackage ({ stdenv, fontsproto, libpciaccess, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2; sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; + }) {}; - xf86videoast = (mkDerivation "xf86videoast" { + xf86videoast = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-ast-1.1.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2; sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videoati = (mkDerivation "xf86videoati" { + xf86videoati = callPackage ({ stdenv, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-ati-18.0.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2; sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videochips = (mkDerivation "xf86videochips" { + xf86videochips = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-chips-1.2.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2; sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videocirrus = (mkDerivation "xf86videocirrus" { + xf86videocirrus = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-cirrus-1.5.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2; sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videodummy = (mkDerivation "xf86videodummy" { + xf86videodummy = callPackage ({ stdenv, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2; sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videofbdev = (mkDerivation "xf86videofbdev" { + xf86videofbdev = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-fbdev-0.4.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2; sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; + }) {}; - xf86videogeode = (mkDerivation "xf86videogeode" { + xf86videogeode = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-geode-2.11.17"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2; sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videoglide = (mkDerivation "xf86videoglide" { + xf86videoglide = callPackage ({ stdenv, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-glide-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2; sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xextproto xorgserver xproto ;}; + }) {}; - xf86videoglint = (mkDerivation "xf86videoglint" { + xf86videoglint = callPackage ({ stdenv, libpciaccess, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2; sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videoi128 = (mkDerivation "xf86videoi128" { + xf86videoi128 = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-i128-1.3.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2; sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videoi740 = (mkDerivation "xf86videoi740" { + xf86videoi740 = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-i740-1.3.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2; sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videointel = (mkDerivation "xf86videointel" { + xf86videointel = callPackage ({ stdenv, dri2proto, dri3proto, fontsproto, libdrm, libpng, udev, libpciaccess, presentproto, randrproto, renderproto, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, xextproto, xf86driproto, libXfixes, xorgserver, xproto, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2; sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; + }) {}; - xf86videomach64 = (mkDerivation "xf86videomach64" { + xf86videomach64 = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-mach64-6.9.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2; sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videomga = (mkDerivation "xf86videomga" { + xf86videomga = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-mga-1.6.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2; sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videoneomagic = (mkDerivation "xf86videoneomagic" { + xf86videoneomagic = callPackage ({ stdenv, fontsproto, libpciaccess, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-neomagic-1.2.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2; sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess xorgserver xproto ;}; + }) {}; - xf86videonewport = (mkDerivation "xf86videonewport" { + xf86videonewport = callPackage ({ stdenv, fontsproto, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2; sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; + }) {}; - xf86videonouveau = (mkDerivation "xf86videonouveau" { + xf86videonouveau = callPackage ({ stdenv, dri2proto, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-nouveau-1.0.15"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2; sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videonv = (mkDerivation "xf86videonv" { + xf86videonv = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2; sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" { + xf86videoopenchrome = callPackage ({ stdenv, fontsproto, glproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xf86driproto, xorgserver, xproto, libXvMC }: stdenv.mkDerivation { name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; + }) {}; - xf86videoqxl = (mkDerivation "xf86videoqxl" { + xf86videoqxl = callPackage ({ stdenv, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-qxl-0.1.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2; sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videor128 = (mkDerivation "xf86videor128" { + xf86videor128 = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xf86miscproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-r128-6.10.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2; sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; + }) {}; - xf86videorendition = (mkDerivation "xf86videorendition" { + xf86videorendition = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-rendition-4.2.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2; sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; + }) {}; - xf86videos3virge = (mkDerivation "xf86videos3virge" { + xf86videos3virge = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-s3virge-1.10.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videosavage = (mkDerivation "xf86videosavage" { + xf86videosavage = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2; sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" { + xf86videosiliconmotion = callPackage ({ stdenv, fontsproto, libpciaccess, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2; sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; + }) {}; - xf86videosis = (mkDerivation "xf86videosis" { + xf86videosis = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-sis-0.10.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2; sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; + }) {}; - xf86videosisusb = (mkDerivation "xf86videosisusb" { + xf86videosisusb = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-sisusb-0.9.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2; sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; + }) {}; - xf86videosuncg6 = (mkDerivation "xf86videosuncg6" { + xf86videosuncg6 = callPackage ({ stdenv, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2; sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; + }) {}; - xf86videosunffb = (mkDerivation "xf86videosunffb" { + xf86videosunffb = callPackage ({ stdenv, fontsproto, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-sunffb-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2; sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; + }) {}; - xf86videosunleo = (mkDerivation "xf86videosunleo" { + xf86videosunleo = callPackage ({ stdenv, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-sunleo-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2; sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto randrproto renderproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; + }) {}; - xf86videotdfx = (mkDerivation "xf86videotdfx" { + xf86videotdfx = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-tdfx-1.4.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) {}; - xf86videotga = (mkDerivation "xf86videotga" { + xf86videotga = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-tga-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2; sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videotrident = (mkDerivation "xf86videotrident" { + xf86videotrident = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2; sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videov4l = (mkDerivation "xf86videov4l" { + xf86videov4l = callPackage ({ stdenv, randrproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ randrproto videoproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit randrproto videoproto xorgserver xproto ;}; + }) {}; - xf86videovesa = (mkDerivation "xf86videovesa" { + xf86videovesa = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-vesa-2.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2; sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; + }) {}; - xf86videovmware = (mkDerivation "xf86videovmware" { + xf86videovmware = callPackage ({ stdenv, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-vmware-13.2.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2; sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; + }) {}; - xf86videovoodoo = (mkDerivation "xf86videovoodoo" { + xf86videovoodoo = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-voodoo-1.2.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2; sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; + }) {}; - xf86videowsfb = (mkDerivation "xf86videowsfb" { + xf86videowsfb = callPackage ({ stdenv, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2; sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit xorgserver xproto ;}; + }) {}; - xf86videoxgi = (mkDerivation "xf86videoxgi" { + xf86videoxgi = callPackage ({ stdenv, fontsproto, glproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-xgi-1.6.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2; sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; + }) {}; - xf86vidmodeproto = (mkDerivation "xf86vidmodeproto" { + xf86vidmodeproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xf86vidmodeproto-2.3.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2; sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xfs = (mkDerivation "xfs" { + xfs = callPackage ({ stdenv, libXfont, xproto, xtrans }: stdenv.mkDerivation { name = "xfs-1.1.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xfs-1.1.4.tar.bz2; sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXfont xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXfont xproto xtrans ;}; + }) {}; - xgamma = (mkDerivation "xgamma" { + xgamma = callPackage ({ stdenv, libX11, xproto, libXxf86vm }: stdenv.mkDerivation { name = "xgamma-1.0.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2; sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXxf86vm ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto libXxf86vm ;}; + }) {}; - xgc = (mkDerivation "xgc" { + xgc = callPackage ({ stdenv, libXaw, libXt }: stdenv.mkDerivation { name = "xgc-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2; sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXaw libXt ;}; + }) {}; - xhost = (mkDerivation "xhost" { + xhost = callPackage ({ stdenv, libX11, libXau, libXmu, xproto }: stdenv.mkDerivation { name = "xhost-1.0.7"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xhost-1.0.7.tar.bz2; sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXau libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXau libXmu xproto ;}; + }) {}; - xineramaproto = (mkDerivation "xineramaproto" { + xineramaproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xineramaproto-1.2.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2; sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xinit = (mkDerivation "xinit" { + xinit = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { name = "xinit-1.4.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xinit-1.4.0.tar.bz2; sha256 = "1vw2wlg74ig52naw0cha3pgzcwwk25l834j42cg8m5zmybp3a213"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xinput = (mkDerivation "xinput" { + xinput = callPackage ({ stdenv, inputproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { name = "xinput-1.6.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xinput-1.6.2.tar.bz2; sha256 = "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; + }) {}; - xkbcomp = (mkDerivation "xkbcomp" { + xkbcomp = callPackage ({ stdenv, libX11, libxkbfile, xproto }: stdenv.mkDerivation { name = "xkbcomp-1.4.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2; sha256 = "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libxkbfile xproto ;}; + }) {}; - xkbevd = (mkDerivation "xkbevd" { + xkbevd = callPackage ({ stdenv, libX11, libxkbfile }: stdenv.mkDerivation { name = "xkbevd-1.1.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2; sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libxkbfile ;}; + }) {}; - xkbprint = (mkDerivation "xkbprint" { + xkbprint = callPackage ({ stdenv, libX11, libxkbfile, xproto }: stdenv.mkDerivation { name = "xkbprint-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2; sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libxkbfile xproto ;}; + }) {}; - xkbutils = (mkDerivation "xkbutils" { + xkbutils = callPackage ({ stdenv, inputproto, libX11, libXaw, xproto, libXt }: stdenv.mkDerivation { name = "xkbutils-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2; sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto libX11 libXaw xproto libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit inputproto libX11 libXaw xproto libXt ;}; + }) {}; - xkeyboardconfig = (mkDerivation "xkeyboardconfig" { + xkeyboardconfig = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { name = "xkeyboard-config-2.24"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.24.tar.bz2; sha256 = "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; - configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xkill = (mkDerivation "xkill" { + xkill = callPackage ({ stdenv, libX11, libXmu, xproto }: stdenv.mkDerivation { name = "xkill-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2; sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXmu xproto ;}; + }) {}; - xlsatoms = (mkDerivation "xlsatoms" { + xlsatoms = callPackage ({ stdenv, libxcb }: stdenv.mkDerivation { name = "xlsatoms-1.1.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2; sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libxcb ;}; + }) {}; - xlsclients = (mkDerivation "xlsclients" { + xlsclients = callPackage ({ stdenv, libxcb }: stdenv.mkDerivation { name = "xlsclients-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2; sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxcb ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libxcb ;}; + }) {}; - xlsfonts = (mkDerivation "xlsfonts" { + xlsfonts = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { name = "xlsfonts-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2; sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xmag = (mkDerivation "xmag" { + xmag = callPackage ({ stdenv, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "xmag-1.0.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2; sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXaw libXmu libXt ;}; + }) {}; - xmessage = (mkDerivation "xmessage" { + xmessage = callPackage ({ stdenv, libXaw, libXt }: stdenv.mkDerivation { name = "xmessage-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2; sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libXaw libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libXaw libXt ;}; + }) {}; - xmodmap = (mkDerivation "xmodmap" { + xmodmap = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { name = "xmodmap-1.0.9"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2; sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xorgcffiles = (mkDerivation "xorgcffiles" { + xorgcffiles = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xorg-cf-files-1.0.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xorgdocs = (mkDerivation "xorgdocs" { + xorgdocs = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xorg-docs-1.7.1"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2; sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xorgserver = (mkDerivation "xorgserver" { + xorgserver = callPackage ({ stdenv, dri2proto, dri3proto, renderproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { name = "xorg-server-1.19.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2; sha256 = "15y13ihgkggmly5s07vzvpn35gzx1w0hrkbnlcvcy05h3lpm0cm7"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; + }) {}; - xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { + xorgsgmldoctools = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2; sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xpr = (mkDerivation "xpr" { + xpr = callPackage ({ stdenv, libX11, libXmu, xproto }: stdenv.mkDerivation { name = "xpr-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2; sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXmu xproto ;}; + }) {}; - xprop = (mkDerivation "xprop" { + xprop = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { name = "xprop-1.2.2"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xprop-1.2.2.tar.bz2; sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xproto = (mkDerivation "xproto" { + xproto = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xproto-7.0.31"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2; sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xrandr = (mkDerivation "xrandr" { + xrandr = callPackage ({ stdenv, libX11, xproto, libXrandr, libXrender }: stdenv.mkDerivation { name = "xrandr-1.5.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2; sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXrandr libXrender ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto libXrandr libXrender ;}; + }) {}; - xrdb = (mkDerivation "xrdb" { + xrdb = callPackage ({ stdenv, libX11, libXmu, xproto }: stdenv.mkDerivation { name = "xrdb-1.1.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2; sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXmu xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXmu xproto ;}; + }) {}; - xrefresh = (mkDerivation "xrefresh" { + xrefresh = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { name = "xrefresh-1.0.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2; sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xset = (mkDerivation "xset" { + xset = callPackage ({ stdenv, libX11, libXext, libXmu, xproto, libXxf86misc }: stdenv.mkDerivation { name = "xset-1.2.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xset-1.2.3.tar.bz2; sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXmu xproto libXxf86misc ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;}; + }) {}; - xsetroot = (mkDerivation "xsetroot" { + xsetroot = callPackage ({ stdenv, libX11, xbitmaps, libXcursor, libXmu }: stdenv.mkDerivation { name = "xsetroot-1.1.0"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2; sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xbitmaps libXcursor libXmu ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xbitmaps libXcursor libXmu ;}; + }) {}; - xtrans = (mkDerivation "xtrans" { + xtrans = callPackage ({ stdenv }: stdenv.mkDerivation { name = "xtrans-1.3.5"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2; sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit ;}; + }) {}; - xvinfo = (mkDerivation "xvinfo" { + xvinfo = callPackage ({ stdenv, libX11, xproto, libXv }: stdenv.mkDerivation { name = "xvinfo-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xvinfo-1.1.3.tar.bz2; sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto libXv ;}; + }) {}; - xwd = (mkDerivation "xwd" { + xwd = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { name = "xwd-1.0.6"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xwd-1.0.6.tar.bz2; sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; - xwininfo = (mkDerivation "xwininfo" { + xwininfo = callPackage ({ stdenv, libX11, libxcb, xproto }: stdenv.mkDerivation { name = "xwininfo-1.1.3"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2; sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libxcb xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 libxcb xproto ;}; + }) {}; - xwud = (mkDerivation "xwud" { + xwud = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { name = "xwud-1.0.4"; builder = ./builder.sh; src = fetchurl { url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2; sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"; }; + hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit libX11 xproto ;}; + }) {}; -}; in xorg +}; in xorg.overrideScope overrides diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 37daa0dc9bc4..8e8f97546375 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -232,22 +232,17 @@ print OUT ""; print OUT < Date: Mon, 20 Aug 2018 23:11:28 +0900 Subject: [PATCH 420/992] xorg: add caching to generate-expr-from-tarballs.pl --- .../x11/xorg/generate-expr-from-tarballs.pl | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 8e8f97546375..c919a548480a 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -13,6 +13,9 @@ use strict; use warnings; +use File::Basename; +use File::Spec::Functions; + my $tmpDir = "/tmp/xorg-unpack"; @@ -43,7 +46,6 @@ $pcMap{"\$DRI2PROTO"} = "dri2proto"; my $downloadCache = "./download-cache"; -$ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache; mkdir $downloadCache, 0755; @@ -76,7 +78,17 @@ while (<>) { $pkgURLs{$pkg} = $tarball; $pkgNames{$pkg} = $pkgName; - my ($hash, $path) = `PRINT_PATH=1 QUIET=1 nix-prefetch-url '$tarball'`; + my $cachePath = catdir($downloadCache, basename($tarball)); + my $hash; + my $path; + if (-e $cachePath) { + $path = readlink($cachePath); + $hash = `nix-hash --type sha256 --base32 --flat $cachePath`; + } + else { + ($hash, $path) = `PRINT_PATH=1 QUIET=1 nix-prefetch-url '$tarball'`; + `nix-store --realise --add-root $cachePath --indirect $path`; + } chomp $hash; chomp $path; $pkgHashes{$pkg} = $hash; From fb9604c4b7aa3617791f3cab10624a79819c0e5e Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 21 Aug 2018 00:08:34 +0900 Subject: [PATCH 421/992] xorg: simplify argument passing into xorg and overrides --- pkgs/servers/x11/xorg/default.nix | 575 +++++++++--------- .../x11/xorg/generate-expr-from-tarballs.pl | 29 +- pkgs/servers/x11/xorg/overrides.nix | 110 ++-- pkgs/top-level/all-packages.nix | 16 +- 4 files changed, 376 insertions(+), 354 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index eaefb57a982c..1023db4f6c50 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1,20 +1,11 @@ # THIS IS A GENERATED FILE. DO NOT EDIT! -args @ { clangStdenv, fetchurl, fetchgit, fetchpatch, stdenv, pkgconfig, intltool, freetype, fontconfig -, libxslt, expat, libpng, zlib, perl, mesa_noglu, mesa_drivers, spice-protocol, lib, newScope -, dbus, libuuid, openssl, gperf, m4, libevdev, tradcpp, libinput, mcpp, makeWrapper, autoreconfHook -, autoconf, automake, libtool, xmlto, asciidoc, flex, bison, python, mtdev, pixman, ... }: with args; +{ lib, newScope, pixman }: -let - - overrides = import ./overrides.nix {inherit args;}; - - xorg = lib.makeScope newScope xorgPackages; - - xorgPackages = self: with self; { +lib.makeScope newScope (self: with self; { inherit pixman; - applewmproto = callPackage ({ stdenv }: stdenv.mkDerivation { + applewmproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "applewmproto-1.4.2"; builder = ./builder.sh; src = fetchurl { @@ -27,7 +18,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - appres = callPackage ({ stdenv, libX11, xproto, libXt }: stdenv.mkDerivation { + appres = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXt }: stdenv.mkDerivation { name = "appres-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -40,7 +31,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - bdftopcf = callPackage ({ stdenv }: stdenv.mkDerivation { + bdftopcf = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "bdftopcf-1.1"; builder = ./builder.sh; src = fetchurl { @@ -53,7 +44,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - bigreqsproto = callPackage ({ stdenv }: stdenv.mkDerivation { + bigreqsproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "bigreqsproto-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -66,7 +57,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - bitmap = callPackage ({ stdenv, libX11, libXaw, xbitmaps, libXmu, xproto, libXt }: stdenv.mkDerivation { + bitmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, xbitmaps, libXmu, xproto, libXt }: stdenv.mkDerivation { name = "bitmap-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -79,7 +70,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - compositeproto = callPackage ({ stdenv }: stdenv.mkDerivation { + compositeproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "compositeproto-0.4.2"; builder = ./builder.sh; src = fetchurl { @@ -92,7 +83,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - damageproto = callPackage ({ stdenv }: stdenv.mkDerivation { + damageproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "damageproto-1.2.1"; builder = ./builder.sh; src = fetchurl { @@ -105,7 +96,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - dmxproto = callPackage ({ stdenv }: stdenv.mkDerivation { + dmxproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "dmxproto-2.3.1"; builder = ./builder.sh; src = fetchurl { @@ -118,7 +109,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - dri2proto = callPackage ({ stdenv }: stdenv.mkDerivation { + dri2proto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "dri2proto-2.8"; builder = ./builder.sh; src = fetchurl { @@ -131,7 +122,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - dri3proto = callPackage ({ stdenv }: stdenv.mkDerivation { + dri3proto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "dri3proto-1.0"; builder = ./builder.sh; src = fetchurl { @@ -144,7 +135,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - encodings = callPackage ({ stdenv }: stdenv.mkDerivation { + encodings = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "encodings-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -157,7 +148,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - fixesproto = callPackage ({ stdenv, xextproto }: stdenv.mkDerivation { + fixesproto = callPackage ({ stdenv, pkgconfig, fetchurl, xextproto }: stdenv.mkDerivation { name = "fixesproto-5.0"; builder = ./builder.sh; src = fetchurl { @@ -170,7 +161,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobe100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -179,11 +170,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobe75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -192,11 +184,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobeutopia100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -205,11 +198,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobeutopia75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -218,11 +212,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontadobeutopiatype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -231,11 +226,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontalias = callPackage ({ stdenv }: stdenv.mkDerivation { + fontalias = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -248,7 +244,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontarabicmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -257,11 +253,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbh100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -270,11 +267,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbh75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -283,11 +281,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhlucidatypewriter100dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -296,11 +295,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhlucidatypewriter75dpi = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -309,11 +309,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhttf = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -322,11 +323,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbhtype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -335,11 +337,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbitstream100dpi = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -348,11 +351,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbitstream75dpi = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -361,11 +365,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontbitstreamtype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -374,11 +379,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontcronyxcyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -387,11 +393,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontcursormisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -400,11 +407,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontdaewoomisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -413,11 +421,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontdecmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -426,11 +435,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontibmtype1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -439,11 +449,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontisasmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -452,11 +463,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontjismisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -465,11 +477,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmicromisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -478,11 +491,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmisccyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -491,11 +505,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmiscethiopic = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -504,11 +519,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmiscmeltho = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -517,11 +533,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmiscmisc = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -530,11 +547,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontmuttmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -543,11 +561,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontschumachermisc = callPackage ({ stdenv, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -556,11 +575,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontscreencyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -569,11 +589,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontsonymisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -582,11 +603,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontsproto = callPackage ({ stdenv }: stdenv.mkDerivation { + fontsproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "fontsproto-2.1.3"; builder = ./builder.sh; src = fetchurl { @@ -599,7 +621,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontsunmisc = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -608,11 +630,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontutil = callPackage ({ stdenv }: stdenv.mkDerivation { + fontutil = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "font-util-1.3.1"; builder = ./builder.sh; src = fetchurl { @@ -625,7 +648,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontwinitzkicyrillic = callPackage ({ stdenv, bdftopcf, mkfontdir }: stdenv.mkDerivation { + fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -634,11 +657,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bdftopcf mkfontdir ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ bdftopcf mkfontdir ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - fontxfree86type1 = callPackage ({ stdenv, mkfontdir, mkfontscale }: stdenv.mkDerivation { + fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -647,11 +671,12 @@ let }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mkfontdir mkfontscale ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; + buildInputs = [ mkfontdir mkfontscale ]; + configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; - gccmakedep = callPackage ({ stdenv }: stdenv.mkDerivation { + gccmakedep = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "gccmakedep-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -664,7 +689,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - glproto = callPackage ({ stdenv }: stdenv.mkDerivation { + glproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "glproto-1.4.17"; builder = ./builder.sh; src = fetchurl { @@ -677,7 +702,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - iceauth = callPackage ({ stdenv, libICE, xproto }: stdenv.mkDerivation { + iceauth = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xproto }: stdenv.mkDerivation { name = "iceauth-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -690,7 +715,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - imake = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { + imake = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "imake-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -703,7 +728,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - inputproto = callPackage ({ stdenv }: stdenv.mkDerivation { + inputproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "inputproto-2.3.2"; builder = ./builder.sh; src = fetchurl { @@ -716,7 +741,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - kbproto = callPackage ({ stdenv }: stdenv.mkDerivation { + kbproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "kbproto-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -729,7 +754,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libAppleWM = callPackage ({ stdenv, applewmproto, libX11, libXext, xextproto }: stdenv.mkDerivation { + libAppleWM = callPackage ({ stdenv, pkgconfig, fetchurl, applewmproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -742,7 +767,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libFS = callPackage ({ stdenv, fontsproto, xproto, xtrans }: stdenv.mkDerivation { + libFS = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, xproto, xtrans }: stdenv.mkDerivation { name = "libFS-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -755,7 +780,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libICE = callPackage ({ stdenv, xproto, xtrans }: stdenv.mkDerivation { + libICE = callPackage ({ stdenv, pkgconfig, fetchurl, xproto, xtrans }: stdenv.mkDerivation { name = "libICE-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -768,7 +793,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libSM = callPackage ({ stdenv, libICE, libuuid, xproto, xtrans }: stdenv.mkDerivation { + libSM = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libuuid, xproto, xtrans }: stdenv.mkDerivation { name = "libSM-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -781,7 +806,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libWindowsWM = callPackage ({ stdenv, windowswmproto, libX11, libXext, xextproto }: stdenv.mkDerivation { + libWindowsWM = callPackage ({ stdenv, pkgconfig, fetchurl, windowswmproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { @@ -794,7 +819,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libX11 = callPackage ({ stdenv, inputproto, kbproto, libxcb, xextproto, xf86bigfontproto, xproto, xtrans }: stdenv.mkDerivation { + libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, libxcb, xextproto, xf86bigfontproto, xproto, xtrans }: stdenv.mkDerivation { name = "libX11-1.6.6"; builder = ./builder.sh; src = fetchurl { @@ -807,7 +832,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXScrnSaver = callPackage ({ stdenv, scrnsaverproto, libX11, libXext, xextproto }: stdenv.mkDerivation { + libXScrnSaver = callPackage ({ stdenv, pkgconfig, fetchurl, scrnsaverproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libXScrnSaver-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -820,7 +845,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXau = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { + libXau = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "libXau-1.0.8"; builder = ./builder.sh; src = fetchurl { @@ -833,7 +858,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXaw = callPackage ({ stdenv, libX11, libXext, xextproto, libXmu, libXpm, xproto, libXt }: stdenv.mkDerivation { + libXaw = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, libXmu, libXpm, xproto, libXt }: stdenv.mkDerivation { name = "libXaw-1.0.13"; builder = ./builder.sh; src = fetchurl { @@ -846,7 +871,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXcomposite = callPackage ({ stdenv, compositeproto, libX11, libXfixes, xproto }: stdenv.mkDerivation { + libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, compositeproto, libX11, libXfixes, xproto }: stdenv.mkDerivation { name = "libXcomposite-0.4.4"; builder = ./builder.sh; src = fetchurl { @@ -859,7 +884,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXcursor = callPackage ({ stdenv, fixesproto, libX11, libXfixes, xproto, libXrender }: stdenv.mkDerivation { + libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, fixesproto, libX11, libXfixes, xproto, libXrender }: stdenv.mkDerivation { name = "libXcursor-1.1.15"; builder = ./builder.sh; src = fetchurl { @@ -872,7 +897,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXdamage = callPackage ({ stdenv, damageproto, fixesproto, libX11, xextproto, libXfixes, xproto }: stdenv.mkDerivation { + libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, damageproto, fixesproto, libX11, xextproto, libXfixes, xproto }: stdenv.mkDerivation { name = "libXdamage-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -885,7 +910,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXdmcp = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { + libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "libXdmcp-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -898,7 +923,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXext = callPackage ({ stdenv, libX11, xextproto, xproto }: stdenv.mkDerivation { + libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xextproto, xproto }: stdenv.mkDerivation { name = "libXext-1.3.3"; builder = ./builder.sh; src = fetchurl { @@ -911,7 +936,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXfixes = callPackage ({ stdenv, fixesproto, libX11, xextproto, xproto }: stdenv.mkDerivation { + libXfixes = callPackage ({ stdenv, pkgconfig, fetchurl, fixesproto, libX11, xextproto, xproto }: stdenv.mkDerivation { name = "libXfixes-5.0.3"; builder = ./builder.sh; src = fetchurl { @@ -924,7 +949,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXfont = callPackage ({ stdenv, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation { + libXfont = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont-1.5.4"; builder = ./builder.sh; src = fetchurl { @@ -937,7 +962,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXfont2 = callPackage ({ stdenv, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation { + libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, fontsproto, freetype, xproto, xtrans, zlib }: stdenv.mkDerivation { name = "libXfont2-2.0.3"; builder = ./builder.sh; src = fetchurl { @@ -950,7 +975,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXft = callPackage ({ stdenv, fontconfig, freetype, libX11, xproto, libXrender }: stdenv.mkDerivation { + libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xproto, libXrender }: stdenv.mkDerivation { name = "libXft-2.3.2"; builder = ./builder.sh; src = fetchurl { @@ -963,7 +988,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXi = callPackage ({ stdenv, inputproto, libX11, libXext, xextproto, libXfixes, xproto }: stdenv.mkDerivation { + libXi = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXext, xextproto, libXfixes, xproto }: stdenv.mkDerivation { name = "libXi-1.7.9"; builder = ./builder.sh; src = fetchurl { @@ -976,7 +1001,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXinerama = callPackage ({ stdenv, libX11, libXext, xextproto, xineramaproto }: stdenv.mkDerivation { + libXinerama = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xineramaproto }: stdenv.mkDerivation { name = "libXinerama-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -989,7 +1014,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXmu = callPackage ({ stdenv, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation { + libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation { name = "libXmu-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1002,7 +1027,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXp = callPackage ({ stdenv, printproto, libX11, libXau, libXext, xextproto }: stdenv.mkDerivation { + libXp = callPackage ({ stdenv, pkgconfig, fetchurl, printproto, libX11, libXau, libXext, xextproto }: stdenv.mkDerivation { name = "libXp-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -1015,7 +1040,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXpm = callPackage ({ stdenv, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation { + libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xproto, libXt }: stdenv.mkDerivation { name = "libXpm-3.5.12"; builder = ./builder.sh; src = fetchurl { @@ -1028,7 +1053,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXpresent = callPackage ({ stdenv, presentproto, libX11, xextproto, xproto }: stdenv.mkDerivation { + libXpresent = callPackage ({ stdenv, pkgconfig, fetchurl, presentproto, libX11, xextproto, xproto }: stdenv.mkDerivation { name = "libXpresent-1.0.0"; builder = ./builder.sh; src = fetchurl { @@ -1041,7 +1066,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXrandr = callPackage ({ stdenv, randrproto, renderproto, libX11, libXext, xextproto, xproto, libXrender }: stdenv.mkDerivation { + libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, randrproto, renderproto, libX11, libXext, xextproto, xproto, libXrender }: stdenv.mkDerivation { name = "libXrandr-1.5.1"; builder = ./builder.sh; src = fetchurl { @@ -1054,7 +1079,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXrender = callPackage ({ stdenv, renderproto, libX11, xproto }: stdenv.mkDerivation { + libXrender = callPackage ({ stdenv, pkgconfig, fetchurl, renderproto, libX11, xproto }: stdenv.mkDerivation { name = "libXrender-0.9.10"; builder = ./builder.sh; src = fetchurl { @@ -1067,7 +1092,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXres = callPackage ({ stdenv, resourceproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation { + libXres = callPackage ({ stdenv, pkgconfig, fetchurl, resourceproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation { name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -1080,7 +1105,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXt = callPackage ({ stdenv, libICE, kbproto, libSM, libX11, xproto }: stdenv.mkDerivation { + libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, kbproto, libSM, libX11, xproto }: stdenv.mkDerivation { name = "libXt-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -1093,7 +1118,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXtst = callPackage ({ stdenv, inputproto, recordproto, libX11, libXext, xextproto, libXi }: stdenv.mkDerivation { + libXtst = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, recordproto, libX11, libXext, xextproto, libXi }: stdenv.mkDerivation { name = "libXtst-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -1106,7 +1131,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXv = callPackage ({ stdenv, videoproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation { + libXv = callPackage ({ stdenv, pkgconfig, fetchurl, videoproto, libX11, libXext, xextproto, xproto }: stdenv.mkDerivation { name = "libXv-1.0.11"; builder = ./builder.sh; src = fetchurl { @@ -1119,7 +1144,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXvMC = callPackage ({ stdenv, videoproto, libX11, libXext, xextproto, xproto, libXv }: stdenv.mkDerivation { + libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, videoproto, libX11, libXext, xextproto, xproto, libXv }: stdenv.mkDerivation { name = "libXvMC-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -1132,7 +1157,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXxf86dga = callPackage ({ stdenv, libX11, libXext, xextproto, xf86dgaproto, xproto }: stdenv.mkDerivation { + libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86dgaproto, xproto }: stdenv.mkDerivation { name = "libXxf86dga-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1145,7 +1170,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXxf86misc = callPackage ({ stdenv, libX11, libXext, xextproto, xf86miscproto, xproto }: stdenv.mkDerivation { + libXxf86misc = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86miscproto, xproto }: stdenv.mkDerivation { name = "libXxf86misc-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -1158,7 +1183,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libXxf86vm = callPackage ({ stdenv, libX11, libXext, xextproto, xf86vidmodeproto, xproto }: stdenv.mkDerivation { + libXxf86vm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xextproto, xf86vidmodeproto, xproto }: stdenv.mkDerivation { name = "libXxf86vm-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -1171,7 +1196,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libdmx = callPackage ({ stdenv, dmxproto, libX11, libXext, xextproto }: stdenv.mkDerivation { + libdmx = callPackage ({ stdenv, pkgconfig, fetchurl, dmxproto, libX11, libXext, xextproto }: stdenv.mkDerivation { name = "libdmx-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1184,7 +1209,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libfontenc = callPackage ({ stdenv, xproto, zlib }: stdenv.mkDerivation { + libfontenc = callPackage ({ stdenv, pkgconfig, fetchurl, xproto, zlib }: stdenv.mkDerivation { name = "libfontenc-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1197,7 +1222,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libpciaccess = callPackage ({ stdenv, zlib }: stdenv.mkDerivation { + libpciaccess = callPackage ({ stdenv, pkgconfig, fetchurl, zlib }: stdenv.mkDerivation { name = "libpciaccess-0.14"; builder = ./builder.sh; src = fetchurl { @@ -1210,7 +1235,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libpthreadstubs = callPackage ({ stdenv }: stdenv.mkDerivation { + libpthreadstubs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { @@ -1223,7 +1248,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libxcb = callPackage ({ stdenv, libxslt, libpthreadstubs, python, libXau, xcbproto, libXdmcp }: stdenv.mkDerivation { + libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, python, libXau, xcbproto, libXdmcp }: stdenv.mkDerivation { name = "libxcb-1.12"; builder = ./builder.sh; src = fetchurl { @@ -1236,7 +1261,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libxkbfile = callPackage ({ stdenv, kbproto, libX11 }: stdenv.mkDerivation { + libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, kbproto, libX11 }: stdenv.mkDerivation { name = "libxkbfile-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -1249,7 +1274,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - libxshmfence = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { + libxshmfence = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "libxshmfence-1.2"; builder = ./builder.sh; src = fetchurl { @@ -1262,7 +1287,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - lndir = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { + lndir = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "lndir-1.0.3"; builder = ./builder.sh; src = fetchurl { @@ -1275,7 +1300,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - luit = callPackage ({ stdenv, libfontenc }: stdenv.mkDerivation { + luit = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc }: stdenv.mkDerivation { name = "luit-1.1.1"; builder = ./builder.sh; src = fetchurl { @@ -1288,7 +1313,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - makedepend = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { + makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "makedepend-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1301,7 +1326,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - mkfontdir = callPackage ({ stdenv }: stdenv.mkDerivation { + mkfontdir = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "mkfontdir-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -1314,7 +1339,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - mkfontscale = callPackage ({ stdenv, libfontenc, freetype, xproto, zlib }: stdenv.mkDerivation { + mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xproto, zlib }: stdenv.mkDerivation { name = "mkfontscale-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1327,7 +1352,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - presentproto = callPackage ({ stdenv }: stdenv.mkDerivation { + presentproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "presentproto-1.1"; builder = ./builder.sh; src = fetchurl { @@ -1340,7 +1365,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - printproto = callPackage ({ stdenv, libXau }: stdenv.mkDerivation { + printproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXau }: stdenv.mkDerivation { name = "printproto-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1353,7 +1378,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - randrproto = callPackage ({ stdenv }: stdenv.mkDerivation { + randrproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "randrproto-1.5.0"; builder = ./builder.sh; src = fetchurl { @@ -1366,7 +1391,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - recordproto = callPackage ({ stdenv }: stdenv.mkDerivation { + recordproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "recordproto-1.14.2"; builder = ./builder.sh; src = fetchurl { @@ -1379,7 +1404,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - renderproto = callPackage ({ stdenv }: stdenv.mkDerivation { + renderproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "renderproto-0.11.1"; builder = ./builder.sh; src = fetchurl { @@ -1392,7 +1417,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - resourceproto = callPackage ({ stdenv }: stdenv.mkDerivation { + resourceproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "resourceproto-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -1405,7 +1430,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - scrnsaverproto = callPackage ({ stdenv }: stdenv.mkDerivation { + scrnsaverproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "scrnsaverproto-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -1418,7 +1443,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - sessreg = callPackage ({ stdenv, xproto }: stdenv.mkDerivation { + sessreg = callPackage ({ stdenv, pkgconfig, fetchurl, xproto }: stdenv.mkDerivation { name = "sessreg-1.1.1"; builder = ./builder.sh; src = fetchurl { @@ -1431,7 +1456,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - setxkbmap = callPackage ({ stdenv, libX11, libxkbfile }: stdenv.mkDerivation { + setxkbmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { name = "setxkbmap-1.3.1"; builder = ./builder.sh; src = fetchurl { @@ -1444,7 +1469,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - smproxy = callPackage ({ stdenv, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { + smproxy = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libXmu, libXt }: stdenv.mkDerivation { name = "smproxy-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1457,7 +1482,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - twm = callPackage ({ stdenv, libICE, libSM, libX11, libXext, libXmu, xproto, libXt }: stdenv.mkDerivation { + twm = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, libSM, libX11, libXext, libXmu, xproto, libXt }: stdenv.mkDerivation { name = "twm-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -1470,7 +1495,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - utilmacros = callPackage ({ stdenv }: stdenv.mkDerivation { + utilmacros = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "util-macros-1.19.2"; builder = ./builder.sh; src = fetchurl { @@ -1483,7 +1508,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - videoproto = callPackage ({ stdenv }: stdenv.mkDerivation { + videoproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "videoproto-2.3.3"; builder = ./builder.sh; src = fetchurl { @@ -1496,7 +1521,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - windowswmproto = callPackage ({ stdenv }: stdenv.mkDerivation { + windowswmproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "windowswmproto-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1509,7 +1534,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - x11perf = callPackage ({ stdenv, libX11, libXext, libXft, libXmu, xproto, libXrender }: stdenv.mkDerivation { + x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xproto, libXrender }: stdenv.mkDerivation { name = "x11perf-1.6.0"; builder = ./builder.sh; src = fetchurl { @@ -1522,7 +1547,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xauth = callPackage ({ stdenv, libX11, libXau, libXext, libXmu, xproto }: stdenv.mkDerivation { + xauth = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXext, libXmu, xproto }: stdenv.mkDerivation { name = "xauth-1.0.10"; builder = ./builder.sh; src = fetchurl { @@ -1535,7 +1560,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xbacklight = callPackage ({ stdenv, libxcb, xcbutil }: stdenv.mkDerivation { + xbacklight = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb, xcbutil }: stdenv.mkDerivation { name = "xbacklight-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -1548,7 +1573,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xbitmaps = callPackage ({ stdenv }: stdenv.mkDerivation { + xbitmaps = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xbitmaps-1.1.1"; builder = ./builder.sh; src = fetchurl { @@ -1561,7 +1586,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbproto = callPackage ({ stdenv, python }: stdenv.mkDerivation { + xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation { name = "xcb-proto-1.12"; builder = ./builder.sh; src = fetchurl { @@ -1574,7 +1599,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutil = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { + xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1587,7 +1612,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilcursor = callPackage ({ stdenv, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xproto }: stdenv.mkDerivation { + xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xproto }: stdenv.mkDerivation { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { @@ -1600,7 +1625,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilerrors = callPackage ({ stdenv, gperf, m4, libxcb, xcbproto, xproto }: stdenv.mkDerivation { + xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xproto }: stdenv.mkDerivation { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { @@ -1613,7 +1638,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilimage = callPackage ({ stdenv, gperf, m4, libxcb, xcbutil, xproto }: stdenv.mkDerivation { + xcbutilimage = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutil, xproto }: stdenv.mkDerivation { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1626,7 +1651,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilkeysyms = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { + xcbutilkeysyms = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1639,7 +1664,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilrenderutil = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { + xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { @@ -1652,7 +1677,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcbutilwm = callPackage ({ stdenv, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { + xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xproto }: stdenv.mkDerivation { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1665,7 +1690,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xclock = callPackage ({ stdenv, libX11, libXaw, libXft, libxkbfile, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation { + xclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXft, libxkbfile, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation { name = "xclock-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -1678,7 +1703,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcmiscproto = callPackage ({ stdenv }: stdenv.mkDerivation { + xcmiscproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xcmiscproto-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -1691,7 +1716,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcmsdb = callPackage ({ stdenv, libX11 }: stdenv.mkDerivation { + xcmsdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11 }: stdenv.mkDerivation { name = "xcmsdb-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1704,7 +1729,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcompmgr = callPackage ({ stdenv, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { + xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation { name = "xcompmgr-1.1.7"; builder = ./builder.sh; src = fetchurl { @@ -1717,7 +1742,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcursorgen = callPackage ({ stdenv, libpng, libX11, libXcursor }: stdenv.mkDerivation { + xcursorgen = callPackage ({ stdenv, pkgconfig, fetchurl, libpng, libX11, libXcursor }: stdenv.mkDerivation { name = "xcursorgen-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -1730,7 +1755,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xcursorthemes = callPackage ({ stdenv, libXcursor }: stdenv.mkDerivation { + xcursorthemes = callPackage ({ stdenv, pkgconfig, fetchurl, libXcursor }: stdenv.mkDerivation { name = "xcursor-themes-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -1743,7 +1768,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xdm = callPackage ({ stdenv, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libXt }: stdenv.mkDerivation { + xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libXt }: stdenv.mkDerivation { name = "xdm-1.1.11"; builder = ./builder.sh; src = fetchurl { @@ -1756,7 +1781,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xdpyinfo = callPackage ({ stdenv, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { + xdpyinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libdmx, libX11, libxcb, libXcomposite, libXext, libXi, libXinerama, xproto, libXrender, libXtst, libXxf86dga, libXxf86misc, libXxf86vm }: stdenv.mkDerivation { name = "xdpyinfo-1.3.2"; builder = ./builder.sh; src = fetchurl { @@ -1769,7 +1794,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xdriinfo = callPackage ({ stdenv, glproto, libX11 }: stdenv.mkDerivation { + xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, glproto, libX11 }: stdenv.mkDerivation { name = "xdriinfo-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -1782,7 +1807,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xev = callPackage ({ stdenv, libX11, xproto, libXrandr }: stdenv.mkDerivation { + xev = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXrandr }: stdenv.mkDerivation { name = "xev-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -1795,7 +1820,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xextproto = callPackage ({ stdenv }: stdenv.mkDerivation { + xextproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xextproto-7.3.0"; builder = ./builder.sh; src = fetchurl { @@ -1808,7 +1833,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xeyes = callPackage ({ stdenv, libX11, libXext, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation { + xeyes = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xproto, libXrender, libXt }: stdenv.mkDerivation { name = "xeyes-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -1821,7 +1846,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86bigfontproto = callPackage ({ stdenv }: stdenv.mkDerivation { + xf86bigfontproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xf86bigfontproto-1.2.0"; builder = ./builder.sh; src = fetchurl { @@ -1834,7 +1859,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86dgaproto = callPackage ({ stdenv }: stdenv.mkDerivation { + xf86dgaproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xf86dgaproto-2.1"; builder = ./builder.sh; src = fetchurl { @@ -1847,7 +1872,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86driproto = callPackage ({ stdenv }: stdenv.mkDerivation { + xf86driproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xf86driproto-2.1.1"; builder = ./builder.sh; src = fetchurl { @@ -1860,7 +1885,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputevdev = callPackage ({ stdenv, inputproto, udev, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, udev, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-evdev-2.10.5"; builder = ./builder.sh; src = fetchurl { @@ -1873,7 +1898,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputjoystick = callPackage ({ stdenv, inputproto, kbproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputjoystick = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, kbproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { @@ -1886,7 +1911,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputkeyboard = callPackage ({ stdenv, inputproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputkeyboard = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { @@ -1899,7 +1924,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputlibinput = callPackage ({ stdenv, inputproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-libinput-0.26.0"; builder = ./builder.sh; src = fetchurl { @@ -1912,7 +1937,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputmouse = callPackage ({ stdenv, inputproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputmouse = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-mouse-1.9.2"; builder = ./builder.sh; src = fetchurl { @@ -1925,7 +1950,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputsynaptics = callPackage ({ stdenv, inputproto, randrproto, recordproto, libX11, libXi, xorgserver, xproto, libXtst }: stdenv.mkDerivation { + xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, randrproto, recordproto, libX11, libXi, xorgserver, xproto, libXtst }: stdenv.mkDerivation { name = "xf86-input-synaptics-1.9.0"; builder = ./builder.sh; src = fetchurl { @@ -1938,7 +1963,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputvmmouse = callPackage ({ stdenv, inputproto, udev, randrproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputvmmouse = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, udev, randrproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-vmmouse-13.1.0"; builder = ./builder.sh; src = fetchurl { @@ -1951,7 +1976,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86inputvoid = callPackage ({ stdenv, xorgserver, xproto }: stdenv.mkDerivation { + xf86inputvoid = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-input-void-1.4.1"; builder = ./builder.sh; src = fetchurl { @@ -1964,7 +1989,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86miscproto = callPackage ({ stdenv }: stdenv.mkDerivation { + xf86miscproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xf86miscproto-0.9.3"; builder = ./builder.sh; src = fetchurl { @@ -1977,7 +2002,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoamdgpu = callPackage ({ stdenv, fontsproto, mesa_noglu, libGL, libdrm, udev, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, mesa_noglu, libGL, libdrm, udev, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-amdgpu-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -1990,7 +2015,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoark = callPackage ({ stdenv, fontsproto, libpciaccess, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoark = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; src = fetchurl { @@ -2003,7 +2028,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoast = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoast = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-ast-1.1.5"; builder = ./builder.sh; src = fetchurl { @@ -2016,7 +2041,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoati = callPackage ({ stdenv, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-ati-18.0.1"; builder = ./builder.sh; src = fetchurl { @@ -2029,7 +2054,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videochips = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videochips = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-chips-1.2.7"; builder = ./builder.sh; src = fetchurl { @@ -2042,7 +2067,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videocirrus = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videocirrus = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-cirrus-1.5.3"; builder = ./builder.sh; src = fetchurl { @@ -2055,7 +2080,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videodummy = callPackage ({ stdenv, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videodummy = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { @@ -2068,7 +2093,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videofbdev = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videofbdev = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-fbdev-0.4.4"; builder = ./builder.sh; src = fetchurl { @@ -2081,7 +2106,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videogeode = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videogeode = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-geode-2.11.17"; builder = ./builder.sh; src = fetchurl { @@ -2094,7 +2119,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoglide = callPackage ({ stdenv, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoglide = callPackage ({ stdenv, pkgconfig, fetchurl, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-glide-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2107,7 +2132,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoglint = callPackage ({ stdenv, libpciaccess, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoglint = callPackage ({ stdenv, pkgconfig, fetchurl, libpciaccess, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { @@ -2120,7 +2145,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoi128 = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoi128 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-i128-1.3.6"; builder = ./builder.sh; src = fetchurl { @@ -2133,7 +2158,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoi740 = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoi740 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-i740-1.3.6"; builder = ./builder.sh; src = fetchurl { @@ -2146,7 +2171,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videointel = callPackage ({ stdenv, dri2proto, dri3proto, fontsproto, libdrm, libpng, udev, libpciaccess, presentproto, randrproto, renderproto, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, xextproto, xf86driproto, libXfixes, xorgserver, xproto, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, fontsproto, libdrm, libpng, udev, libpciaccess, presentproto, randrproto, renderproto, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, xextproto, xf86driproto, libXfixes, xorgserver, xproto, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { @@ -2159,7 +2184,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videomach64 = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videomach64 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-mach64-6.9.5"; builder = ./builder.sh; src = fetchurl { @@ -2172,7 +2197,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videomga = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videomga = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-mga-1.6.5"; builder = ./builder.sh; src = fetchurl { @@ -2185,7 +2210,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoneomagic = callPackage ({ stdenv, fontsproto, libpciaccess, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoneomagic = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-neomagic-1.2.9"; builder = ./builder.sh; src = fetchurl { @@ -2198,7 +2223,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videonewport = callPackage ({ stdenv, fontsproto, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videonewport = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { @@ -2211,7 +2236,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videonouveau = callPackage ({ stdenv, dri2proto, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videonouveau = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-nouveau-1.0.15"; builder = ./builder.sh; src = fetchurl { @@ -2224,7 +2249,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videonv = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videonv = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { @@ -2237,7 +2262,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoopenchrome = callPackage ({ stdenv, fontsproto, glproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xf86driproto, xorgserver, xproto, libXvMC }: stdenv.mkDerivation { + xf86videoopenchrome = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, glproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xf86driproto, xorgserver, xproto, libXvMC }: stdenv.mkDerivation { name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { @@ -2250,7 +2275,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoqxl = callPackage ({ stdenv, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoqxl = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-qxl-0.1.5"; builder = ./builder.sh; src = fetchurl { @@ -2263,7 +2288,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videor128 = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xf86miscproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videor128 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xf86miscproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-r128-6.10.2"; builder = ./builder.sh; src = fetchurl { @@ -2276,7 +2301,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videorendition = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videorendition = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-rendition-4.2.6"; builder = ./builder.sh; src = fetchurl { @@ -2289,7 +2314,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videos3virge = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videos3virge = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-s3virge-1.10.7"; builder = ./builder.sh; src = fetchurl { @@ -2302,7 +2327,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosavage = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosavage = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { @@ -2315,7 +2340,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosiliconmotion = callPackage ({ stdenv, fontsproto, libpciaccess, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosiliconmotion = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, videoproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { @@ -2328,7 +2353,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosis = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosis = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-sis-0.10.9"; builder = ./builder.sh; src = fetchurl { @@ -2341,7 +2366,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosisusb = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosisusb = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-sisusb-0.9.7"; builder = ./builder.sh; src = fetchurl { @@ -2354,7 +2379,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosuncg6 = callPackage ({ stdenv, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosuncg6 = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -2367,7 +2392,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosunffb = callPackage ({ stdenv, fontsproto, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosunffb = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-sunffb-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2380,7 +2405,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videosunleo = callPackage ({ stdenv, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videosunleo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, randrproto, renderproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-sunleo-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2393,7 +2418,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videotdfx = callPackage ({ stdenv, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videotdfx = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-tdfx-1.4.7"; builder = ./builder.sh; src = fetchurl { @@ -2406,7 +2431,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videotga = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videotga = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-tga-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2419,7 +2444,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videotrident = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videotrident = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { @@ -2432,7 +2457,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videov4l = callPackage ({ stdenv, randrproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videov4l = callPackage ({ stdenv, pkgconfig, fetchurl, randrproto, videoproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; src = fetchurl { @@ -2445,7 +2470,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videovesa = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videovesa = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-vesa-2.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2458,7 +2483,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videovmware = callPackage ({ stdenv, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videovmware = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libdrm, udev, libpciaccess, randrproto, renderproto, videoproto, libX11, libXext, xextproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-vmware-13.2.1"; builder = ./builder.sh; src = fetchurl { @@ -2471,7 +2496,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videovoodoo = callPackage ({ stdenv, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videovoodoo = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, libpciaccess, randrproto, renderproto, xextproto, xf86dgaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-voodoo-1.2.5"; builder = ./builder.sh; src = fetchurl { @@ -2484,7 +2509,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videowsfb = callPackage ({ stdenv, xorgserver, xproto }: stdenv.mkDerivation { + xf86videowsfb = callPackage ({ stdenv, pkgconfig, fetchurl, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2497,7 +2522,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoxgi = callPackage ({ stdenv, fontsproto, glproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { + xf86videoxgi = callPackage ({ stdenv, pkgconfig, fetchurl, fontsproto, glproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, xextproto, xf86driproto, xineramaproto, xorgserver, xproto }: stdenv.mkDerivation { name = "xf86-video-xgi-1.6.1"; builder = ./builder.sh; src = fetchurl { @@ -2510,7 +2535,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86vidmodeproto = callPackage ({ stdenv }: stdenv.mkDerivation { + xf86vidmodeproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xf86vidmodeproto-2.3.1"; builder = ./builder.sh; src = fetchurl { @@ -2523,7 +2548,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xfs = callPackage ({ stdenv, libXfont, xproto, xtrans }: stdenv.mkDerivation { + xfs = callPackage ({ stdenv, pkgconfig, fetchurl, libXfont, xproto, xtrans }: stdenv.mkDerivation { name = "xfs-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2536,7 +2561,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xgamma = callPackage ({ stdenv, libX11, xproto, libXxf86vm }: stdenv.mkDerivation { + xgamma = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXxf86vm }: stdenv.mkDerivation { name = "xgamma-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2549,7 +2574,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xgc = callPackage ({ stdenv, libXaw, libXt }: stdenv.mkDerivation { + xgc = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xgc-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2562,7 +2587,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xhost = callPackage ({ stdenv, libX11, libXau, libXmu, xproto }: stdenv.mkDerivation { + xhost = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXmu, xproto }: stdenv.mkDerivation { name = "xhost-1.0.7"; builder = ./builder.sh; src = fetchurl { @@ -2575,7 +2600,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xineramaproto = callPackage ({ stdenv }: stdenv.mkDerivation { + xineramaproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xineramaproto-1.2.1"; builder = ./builder.sh; src = fetchurl { @@ -2588,7 +2613,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xinit = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { + xinit = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xinit-1.4.0"; builder = ./builder.sh; src = fetchurl { @@ -2601,7 +2626,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xinput = callPackage ({ stdenv, inputproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { + xinput = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXext, libXi, libXinerama, libXrandr }: stdenv.mkDerivation { name = "xinput-1.6.2"; builder = ./builder.sh; src = fetchurl { @@ -2614,7 +2639,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkbcomp = callPackage ({ stdenv, libX11, libxkbfile, xproto }: stdenv.mkDerivation { + xkbcomp = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xproto }: stdenv.mkDerivation { name = "xkbcomp-1.4.2"; builder = ./builder.sh; src = fetchurl { @@ -2627,7 +2652,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkbevd = callPackage ({ stdenv, libX11, libxkbfile }: stdenv.mkDerivation { + xkbevd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile }: stdenv.mkDerivation { name = "xkbevd-1.1.4"; builder = ./builder.sh; src = fetchurl { @@ -2640,7 +2665,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkbprint = callPackage ({ stdenv, libX11, libxkbfile, xproto }: stdenv.mkDerivation { + xkbprint = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxkbfile, xproto }: stdenv.mkDerivation { name = "xkbprint-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2653,7 +2678,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkbutils = callPackage ({ stdenv, inputproto, libX11, libXaw, xproto, libXt }: stdenv.mkDerivation { + xkbutils = callPackage ({ stdenv, pkgconfig, fetchurl, inputproto, libX11, libXaw, xproto, libXt }: stdenv.mkDerivation { name = "xkbutils-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2666,7 +2691,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkeyboardconfig = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { + xkeyboardconfig = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xkeyboard-config-2.24"; builder = ./builder.sh; src = fetchurl { @@ -2679,7 +2704,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xkill = callPackage ({ stdenv, libX11, libXmu, xproto }: stdenv.mkDerivation { + xkill = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation { name = "xkill-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2692,7 +2717,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xlsatoms = callPackage ({ stdenv, libxcb }: stdenv.mkDerivation { + xlsatoms = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsatoms-1.1.2"; builder = ./builder.sh; src = fetchurl { @@ -2705,7 +2730,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xlsclients = callPackage ({ stdenv, libxcb }: stdenv.mkDerivation { + xlsclients = callPackage ({ stdenv, pkgconfig, fetchurl, libxcb }: stdenv.mkDerivation { name = "xlsclients-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2718,7 +2743,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xlsfonts = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { + xlsfonts = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xlsfonts-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2731,7 +2756,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xmag = callPackage ({ stdenv, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { + xmag = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation { name = "xmag-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2744,7 +2769,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xmessage = callPackage ({ stdenv, libXaw, libXt }: stdenv.mkDerivation { + xmessage = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation { name = "xmessage-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2757,7 +2782,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xmodmap = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { + xmodmap = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xmodmap-1.0.9"; builder = ./builder.sh; src = fetchurl { @@ -2770,7 +2795,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xorgcffiles = callPackage ({ stdenv }: stdenv.mkDerivation { + xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xorg-cf-files-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2783,7 +2808,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xorgdocs = callPackage ({ stdenv }: stdenv.mkDerivation { + xorgdocs = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xorg-docs-1.7.1"; builder = ./builder.sh; src = fetchurl { @@ -2796,7 +2821,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xorgserver = callPackage ({ stdenv, dri2proto, dri3proto, renderproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { + xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, dri2proto, dri3proto, renderproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { name = "xorg-server-1.19.6"; builder = ./builder.sh; src = fetchurl { @@ -2809,7 +2834,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xorgsgmldoctools = callPackage ({ stdenv }: stdenv.mkDerivation { + xorgsgmldoctools = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; src = fetchurl { @@ -2822,7 +2847,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xpr = callPackage ({ stdenv, libX11, libXmu, xproto }: stdenv.mkDerivation { + xpr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation { name = "xpr-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2835,7 +2860,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xprop = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { + xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xprop-1.2.2"; builder = ./builder.sh; src = fetchurl { @@ -2848,7 +2873,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xproto = callPackage ({ stdenv }: stdenv.mkDerivation { + xproto = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xproto-7.0.31"; builder = ./builder.sh; src = fetchurl { @@ -2861,7 +2886,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xrandr = callPackage ({ stdenv, libX11, xproto, libXrandr, libXrender }: stdenv.mkDerivation { + xrandr = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXrandr, libXrender }: stdenv.mkDerivation { name = "xrandr-1.5.0"; builder = ./builder.sh; src = fetchurl { @@ -2874,7 +2899,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xrdb = callPackage ({ stdenv, libX11, libXmu, xproto }: stdenv.mkDerivation { + xrdb = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXmu, xproto }: stdenv.mkDerivation { name = "xrdb-1.1.0"; builder = ./builder.sh; src = fetchurl { @@ -2887,7 +2912,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xrefresh = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { + xrefresh = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xrefresh-1.0.5"; builder = ./builder.sh; src = fetchurl { @@ -2900,7 +2925,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xset = callPackage ({ stdenv, libX11, libXext, libXmu, xproto, libXxf86misc }: stdenv.mkDerivation { + xset = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, xproto, libXxf86misc }: stdenv.mkDerivation { name = "xset-1.2.3"; builder = ./builder.sh; src = fetchurl { @@ -2913,7 +2938,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xsetroot = callPackage ({ stdenv, libX11, xbitmaps, libXcursor, libXmu }: stdenv.mkDerivation { + xsetroot = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xbitmaps, libXcursor, libXmu }: stdenv.mkDerivation { name = "xsetroot-1.1.0"; builder = ./builder.sh; src = fetchurl { @@ -2926,7 +2951,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xtrans = callPackage ({ stdenv }: stdenv.mkDerivation { + xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation { name = "xtrans-1.3.5"; builder = ./builder.sh; src = fetchurl { @@ -2939,7 +2964,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xvinfo = callPackage ({ stdenv, libX11, xproto, libXv }: stdenv.mkDerivation { + xvinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto, libXv }: stdenv.mkDerivation { name = "xvinfo-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2952,7 +2977,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xwd = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { + xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xwd-1.0.6"; builder = ./builder.sh; src = fetchurl { @@ -2965,7 +2990,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xwininfo = callPackage ({ stdenv, libX11, libxcb, xproto }: stdenv.mkDerivation { + xwininfo = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libxcb, xproto }: stdenv.mkDerivation { name = "xwininfo-1.1.3"; builder = ./builder.sh; src = fetchurl { @@ -2978,7 +3003,7 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; - xwud = callPackage ({ stdenv, libX11, xproto }: stdenv.mkDerivation { + xwud = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xproto }: stdenv.mkDerivation { name = "xwud-1.0.4"; builder = ./builder.sh; src = fetchurl { @@ -2991,4 +3016,4 @@ let meta.platforms = stdenv.lib.platforms.unix; }) {}; -}; in xorg.overrideScope overrides +}) diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index c919a548480a..701a8984ada1 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -169,7 +169,7 @@ while (<>) { if ($file =~ /AC_PATH_PROG\(FCCACHE/) { # Don't run fc-cache. die if defined $extraAttrs{$pkg}; - $extraAttrs{$pkg} = " preInstall = \"installFlags=(FCCACHE=true)\"; "; + push @{$extraAttrs{$pkg}}, "preInstall = \"installFlags=(FCCACHE=true)\";"; } my $isFont; @@ -190,7 +190,7 @@ while (<>) { } if ($isFont) { - $extraAttrs{$pkg} = " configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ]; "; + push @{$extraAttrs{$pkg}}, "configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ];"; } sub process { @@ -243,18 +243,9 @@ open OUT, ">default.nix"; print OUT ""; print OUT <' -i include/os.h"; meta.platforms = stdenv.lib.platforms.unix; - } else throw "unsupported xorg abiCompat ${args.abiCompat} for ${attrs_passed.name}"; + } else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; in attrs // (let version = (builtins.parseDrvName attrs.name).version; commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonPropagatedBuildInputs = [ - args.zlib args.libGL args.libGLU args.dbus + zlib libGL libGLU dbus xf86bigfontproto glproto xf86driproto compositeproto scrnsaverproto resourceproto xf86dgaproto dmxproto /*libdmx not used*/ xf86vidmodeproto - recordproto libXext pixman libXfont libxshmfence args.libunwind + recordproto libXext pixman libXfont libxshmfence libunwind damageproto xcmiscproto bigreqsproto inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto @@ -497,9 +503,9 @@ super: self: if (!isDarwin) then { outputs = [ "out" "dev" ]; - buildInputs = commonBuildInputs ++ [ args.libdrm args.mesa_noglu ]; - propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ - args.udev + buildInputs = commonBuildInputs ++ [ libdrm mesa_noglu ]; + propagatedBuildInputs = [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ + udev ]; prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" @@ -529,12 +535,12 @@ super: self: ''; passthru.version = version; # needed by virtualbox guest additions } else { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.autoreconfHook self.utilmacros self.fontutil ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook self.utilmacros self.fontutil ]; buildInputs = commonBuildInputs ++ [ - args.bootstrap_cmds args.automake args.autoconf - args.apple_sdk.libs.Xplugin - args.apple_sdk.frameworks.Carbon - args.apple_sdk.frameworks.Cocoa + bootstrap_cmds automake autoconf + apple_sdk.libs.Xplugin + apple_sdk.frameworks.Carbon + apple_sdk.frameworks.Cocoa ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ libAppleWM applewmproto @@ -542,22 +548,22 @@ super: self: # XQuartz patchset patches = [ - (args.fetchpatch { + (fetchpatch { url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch"; sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k"; name = "use-cppflags-not-cflags.patch"; }) - (args.fetchpatch { + (fetchpatch { url = "https://github.com/XQuartz/xorg-server/commit/75ee9649bcfe937ac08e03e82fd45d9e18110ef4.patch"; sha256 = "1vlfylm011y00j8mig9zy6gk9bw2b4ilw2qlsc6la49zi3k0i9fg"; name = "use-old-mitrapezoids-and-mitriangles-routines.patch"; }) - (args.fetchpatch { + (fetchpatch { url = "https://github.com/XQuartz/xorg-server/commit/c58f47415be79a6564a9b1b2a62c2bf866141e73.patch"; sha256 = "19sisqzw8x2ml4lfrwfvavc2jfyq2bj5xcf83z89jdxg8g1gdd1i"; name = "revert-fb-changes-1.patch"; }) - (args.fetchpatch { + (fetchpatch { url = "https://github.com/XQuartz/xorg-server/commit/56e6f1f099d2821e5002b9b05b715e7b251c0c97.patch"; sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396"; name = "revert-fb-changes-2.patch"; @@ -576,7 +582,7 @@ super: self: preConfigure = '' mkdir -p $out/Applications export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" - substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices} + substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${apple_sdk.frameworks.ApplicationServices} ''; postInstall = '' rm -fr $out/share/X11/xkb/compiled @@ -598,7 +604,7 @@ super: self: }); twm = super.twm.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [bison flex]; }); xauth = super.xauth.overrideAttrs (attrs: { @@ -611,9 +617,9 @@ super: self: }); xinit = (super.xinit.override { - stdenv = if isDarwin then args.clangStdenv else stdenv; + stdenv = if isDarwin then clangStdenv else stdenv; }).overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ lib.optional isDarwin args.bootstrap_cmds; + buildInputs = attrs.buildInputs ++ lib.optional isDarwin bootstrap_cmds; configureFlags = [ "--with-xserver=${self.xorgserver.out}/bin/X" ] ++ lib.optionals isDarwin [ @@ -631,13 +637,13 @@ super: self: xf86videointel = super.xf86videointel.overrideAttrs (attrs: { # the update script only works with released tarballs :-/ name = "xf86-video-intel-2017-10-19"; - src = args.fetchurl { + src = fetchurl { url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/" + "4798e18b2b2c8b0a05dc967e6140fd9962bc1a73.tar.gz"; sha256 = "1zpgbibfpdassswfj68zwhhfpvd2p80rpxw92bis6lv81ssknwby"; }; buildInputs = attrs.buildInputs ++ [self.libXfixes self.libXScrnSaver self.pixman]; - nativeBuildInputs = attrs.nativeBuildInputs ++ [args.autoreconfHook self.utilmacros]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros]; configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; meta = attrs.meta // { @@ -649,11 +655,11 @@ super: self: patches = [ # fixes invalid open mode # https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/commit/?id=bd94c475035739b42294477cff108e0c5f15ef67 - (args.fetchpatch { + (fetchpatch { url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=bd94c475035739b42294477cff108e0c5f15ef67"; sha256 = "0myfry07655adhrpypa9rqigd6rfx57pqagcwibxw7ab3wjay9f6"; }) - (args.fetchpatch { + (fetchpatch { url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=78d1138dd6e214a200ca66fa9e439ee3c9270ec8"; sha256 = "0z3643afgrync280zrp531ija0hqxc5mrwjif9nh9lcnzgnz2d6d"; }) @@ -683,7 +689,7 @@ super: self: }); xrdb = super.xrdb.overrideAttrs (attrs: { - configureFlags = [ "--with-cpp=${args.mcpp}/bin/mcpp" ]; + configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ]; }); sessreg = super.sessreg.overrideAttrs (attrs: { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bc8985c9d20..164d1c0ac071 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13572,21 +13572,19 @@ with pkgs; inherit (darwin.apple_sdk.libs) Xplugin; }; - xorg = recurseIntoAttrs (builtins.removeAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg { - inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig - libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind - dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook - autoconf automake libtool mtdev pixman libGL libGLU - cairo epoxy; - inherit (buildPackages) pkgconfig xmlto asciidoc flex bison; - inherit (darwin) apple_sdk cf-private libobjc; + # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` + # so as not to have the newly bound xorg items already in scope, which would + # have created a cycle. + xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { + }).overrideScope (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { + inherit (darwin) apple_sdk; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; python = python2; # Incompatible with Python 3x udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override` or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin - } // { inherit xlibsWrapper; } ) [ "packages" ]); + }) // { inherit xlibsWrapper; } ); xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; From 47bf3f3d3fac32432b182d83dbc59acc6fe54211 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 21 Aug 2018 00:08:52 +0900 Subject: [PATCH 422/992] xorg: don't splice scope attributes into main package set --- pkgs/top-level/splice.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 82a781083e2c..ec6ed357c688 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -112,7 +112,9 @@ let inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform; }; - splicedPackagesWithXorg = splicedPackages // splicedPackages.xorg; + splicedPackagesWithXorg = splicedPackages // builtins.removeAttrs splicedPackages.xorg [ + "callPackage" "newScope" "overrideScope" "packages" + ]; in From da3529718d7cb6dffc780ece0c638c4d20bbe6c9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 11 Oct 2018 21:04:29 +0200 Subject: [PATCH 423/992] gem-config: add sassc (#48212) --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index eb9be9ed18c9..8640d43775dc 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -319,6 +319,10 @@ in dontUseCmakeConfigure = true; }; + sassc = attrs: { + nativeBuildInputs = [ rake ]; + }; + scrypt = attrs: if stdenv.isDarwin then { dontBuild = false; From 544051b0b0c0b7a78680f65a44e1e75ca0cfdffb Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 11 Oct 2018 19:09:22 +0000 Subject: [PATCH 424/992] coreutils-full: fix cross build --- pkgs/tools/misc/coreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 582f8d8f05f9..de971cc51ac4 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) '' rm $out/share/man/man1/* - cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1 + cp ${if minimal then buildPackages.coreutils else buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1 '' # du: 8.7 M locale + 0.4 M man pages + optionalString minimal '' From edff37b83aa8b78fd66ca02a8fd4499b2ed2b949 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2018 17:00:01 +0200 Subject: [PATCH 425/992] ti-rpc: Add dev output --- pkgs/development/libraries/ti-rpc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 77c0b4a1a460..c139b5be1027 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c"; }; + outputs = [ "out" "dev" ]; + postPatch = '' sed '1i#include ' -i src/xdr_sizeof.c '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' From 8beb1e26e05eb40c2ebf1a7907f41d612c2350b3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2018 17:40:20 +0200 Subject: [PATCH 426/992] nfs-utils: Get rid of runtime dependency on kerberos.dev --- pkgs/os-specific/linux/nfs-utils/default.nix | 22 +++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 86e9e0d3d4d0..7235d8415f55 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -5,14 +5,9 @@ let statdPath = lib.makeBinPath [ systemd utillinux coreutils ]; +in - # Not nice; feel free to find a nicer solution. - kerberosEnv = buildEnv { - name = "kerberos-env-${kerberos.version}"; - paths = with lib; [ (getDev kerberos) (getLib kerberos) ]; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "nfs-utils-${version}"; version = "2.3.3"; @@ -34,10 +29,19 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + preConfigure = + '' + substituteInPlace configure \ + --replace '$dir/include/gssapi' ${lib.getDev kerberos}/include/gssapi \ + --replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config + ''; + + #configureScript = "bash -x configure"; + configureFlags = [ "--enable-gss" "--with-statedir=/var/lib/nfs" - "--with-krb5=${kerberosEnv}" + "--with-krb5=${lib.getLib kerberos}" "--with-systemd=${placeholder "out"}/etc/systemd/system" "--enable-libmount-mount" "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap @@ -97,6 +101,8 @@ in stdenv.mkDerivation rec { # One test fails on mips. doCheck = !stdenv.isMips; + disallowedReferences = [ (lib.getDev kerberos) ]; + meta = with stdenv.lib; { description = "Linux user-space NFS utilities"; From 6d74e1cb5be952e767d56a396cb0d644da588dac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2018 17:57:50 +0200 Subject: [PATCH 427/992] udisks2: Fix broken dependency on xfsprogs --- pkgs/os-specific/linux/udisks/2-default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index a816a2139395..4f59828098c3 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -2,7 +2,7 @@ , gnome3, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash , expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted , gobjectIntrospection, docbook_xml_dtd_412, docbook_xml_dtd_43 -, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g +, xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g }: let @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { }) (substituteAll { src = ./force-path.patch; - path = stdenv.lib.makeBinPath [ btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils libxfs ntfs3g parted utillinux ]; + path = stdenv.lib.makeBinPath [ btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils xfsprogs ntfs3g parted utillinux ]; }) ]; From 2004343f56287dda5ab8cb1a78c47ac2ff9d3835 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2018 17:47:20 +0200 Subject: [PATCH 428/992] libotf: Add dev output --- pkgs/tools/inputmethods/m17n-lib/otf.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index 6e13b4a949c4..95eea7641875 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, libXaw, freetype }: + stdenv.mkDerivation rec { name = "libotf-0.9.16"; @@ -7,8 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ libXaw freetype ]; + postInstall = + '' + mkdir -p $dev/bin + mv $out/bin/libotf-config $dev/bin/ + ''; + meta = { homepage = http://www.nongnu.org/m17n/; description = "Multilingual text processing library (libotf)"; From 9fc4f0681070ea486562f6b96be8639e57f8c86e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 21:44:16 -0400 Subject: [PATCH 429/992] pythonPackages.filterpy: init at 1.4.5 --- .../python-modules/filterpy/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/filterpy/default.nix diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix new file mode 100644 index 000000000000..47f2c083d8a3 --- /dev/null +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, matplotlib +, pytest +}: + +buildPythonPackage rec { + version = "1.4.5"; + pname = "filterpy"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "4f2a4d39e4ea601b9ab42b2db08b5918a9538c168cff1c6895ae26646f3d73b1"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy scipy matplotlib ]; + + # single test fails (even on master branch of repository) + # project does not use CI + checkPhase = '' + pytest --ignore=filterpy/common/tests/test_discretization.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/rlabbe/filterpy; + description = "Kalman filtering and optimal estimation library"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7445c6d8bb..7c5c61431a8b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -302,6 +302,8 @@ in { fido2 = callPackage ../development/python-modules/fido2 { }; + filterpy = callPackage ../development/python-modules/filterpy { }; + fire = callPackage ../development/python-modules/fire { }; fuse = callPackage ../development/python-modules/fuse-python { fuse = pkgs.fuse; }; From bd4301a2ae264f88acf99296183c8295660e6a24 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Thu, 11 Oct 2018 21:42:28 +0200 Subject: [PATCH 430/992] nix-index: 0.1.1 -> 0.1.2 --- pkgs/tools/package-management/nix-index/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index b5d66bec5cca..0b336d47fe4c 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -4,15 +4,15 @@ with rustPlatform; buildRustPackage rec { name = "nix-index-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-index"; rev = "v${version}"; - sha256 = "17pms3cq3i3jan1irxgqfr3nrjy6zb21y07pwqp9v08hyrjpfqin"; + sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8"; }; - cargoSha256 = "0b7xwcgjds80g08sx91lqip8syb52n458si4q4xycvvsand5fa10"; + cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl curl]; From e4f8d5c254d8cb94fa4b2da1ae785e9f3fdf7976 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 11 Oct 2018 21:53:30 +0200 Subject: [PATCH 431/992] terraform-providers.gandi: init at 1.0.0 (#48223) --- .../cluster/terraform-providers/default.nix | 1 + .../terraform-providers/gandi/default.nix | 26 +++++++++++++++++++ .../terraform-providers/gandi/deps.nix | 21 +++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix create mode 100644 pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index b3b13539ff50..702a7cb7eb1e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -22,6 +22,7 @@ let }; in { + gandi = callPackage ./gandi {}; ibm = callPackage ./ibm {}; libvirt = callPackage ./libvirt {}; } // lib.mapAttrs (n: v: toDrv v) list diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix new file mode 100644 index 000000000000..291698f3065f --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: +buildGoPackage rec { + name = "terraform-provider-gandi-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/tiramiseb/terraform-provider-gandi"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "tiramiseb"; + repo = "terraform-provider-gandi"; + rev = "v${version}"; + sha256 = "0byydpqsimvnk11bh9iz8zlxbsmsk65w55pvkp18vjzqrhf4kyfv"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-gandi{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform provider for the Gandi LiveDNS service."; + homepage = "https://github.com/tiramiseb/terraform-provider-gandi"; + license = licenses.mpl20; + maintainers = with maintainers; [ manveru ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix new file mode 100644 index 000000000000..3d4a3547502d --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix @@ -0,0 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/hashicorp/terraform"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/terraform"; + rev = "27b720113ed5143a870ec151b3b7c9d955a09bc0"; + sha256 = "1f0hwdf2z68p0ll3pgrx949h09q52gcfaxap0zz52m7px98sfab4"; + }; + } + { + goPackagePath = "github.com/tiramiseb/go-gandi-livedns"; + fetch = { + type = "git"; + url = "https://github.com/tiramiseb/go-gandi-livedns"; + rev = "4773a84f8ee7365ed21edc6cd0602aaf93e94e59"; + sha256 = "1i8s7yclrkhf974vs2splh5symzk0ym54px0bc216bq4ifzkwkqc"; + }; + } +] From 264cb7407c9274e6b3fe9e5d6f112f399ae91090 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 11 Oct 2018 15:52:11 -0400 Subject: [PATCH 432/992] nixos: initrd/luks: make script indentation consistent --- nixos/modules/system/boot/luksroot.nix | 66 +++++++++++++------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 1079089bc5a8..1b153f2132bb 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -7,19 +7,19 @@ let commonFunctions = '' die() { - echo "$@" >&2 - exit 1 + echo "$@" >&2 + exit 1 } dev_exist() { - local target="$1" - if [ -e $target ]; then - return 0 - else - local uuid=$(echo -n $target | sed -e 's,UUID=\(.*\),\1,g') - local dev=$(blkid --uuid $uuid) - return $? - fi + local target="$1" + if [ -e $target ]; then + return 0 + else + local uuid=$(echo -n $target | sed -e 's,UUID=\(.*\),\1,g') + local dev=$(blkid --uuid $uuid) + return $? + fi } wait_target() { @@ -51,30 +51,30 @@ let } wait_yubikey() { - local secs="''${1:-10}" + local secs="''${1:-10}" - ykinfo -v 1>/dev/null 2>&1 - if [ $? != 0 ]; then - echo -n "Waiting $secs seconds for Yubikey to appear..." - local success=false - for try in $(seq $secs); do - echo -n . - sleep 1 - ykinfo -v 1>/dev/null 2>&1 - if [ $? == 0 ]; then - success=true - break - fi - done - if [ $success == true ]; then - echo " - success"; - return 0 - else - echo " - failure"; - return 1 - fi - fi - return 0 + ykinfo -v 1>/dev/null 2>&1 + if [ $? != 0 ]; then + echo -n "Waiting $secs seconds for Yubikey to appear..." + local success=false + for try in $(seq $secs); do + echo -n . + sleep 1 + ykinfo -v 1>/dev/null 2>&1 + if [ $? == 0 ]; then + success=true + break + fi + done + if [ $success == true ]; then + echo " - success"; + return 0 + else + echo " - failure"; + return 1 + fi + fi + return 0 } ''; From 76977590faed8e57c8e7d43769e20a4cde3daa14 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 11 Oct 2018 15:52:46 -0400 Subject: [PATCH 433/992] nixos: initrd/luks: fix detection of devices by UUID --- nixos/modules/system/boot/luksroot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 1b153f2132bb..018e7b2e7f89 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -17,7 +17,7 @@ let return 0 else local uuid=$(echo -n $target | sed -e 's,UUID=\(.*\),\1,g') - local dev=$(blkid --uuid $uuid) + blkid --uuid $uuid >/dev/null return $? fi } From 63ed3c8c5ebbad8f22e49d799bc88fddd74ff41c Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Thu, 11 Oct 2018 12:19:42 -0800 Subject: [PATCH 434/992] fastlane: disable update check --- pkgs/tools/admin/fastlane/default.nix | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index b9008c919bf3..8aba7524008b 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -1,11 +1,27 @@ -{ lib, bundlerEnv, ruby }: +{ stdenv, bundlerEnv, ruby, makeWrapper }: -bundlerEnv rec { - inherit ruby; +stdenv.mkDerivation rec { + name = "${pname}-${version}"; pname = "fastlane"; - gemdir = ./.; + version = (import ./gemset.nix).fastlane.version; - meta = with lib; { + nativeBuildInputs = [ makeWrapper ]; + + env = bundlerEnv { + name = "${name}-gems"; + inherit pname ruby; + gemdir = ./.; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/fastlane $out/bin/fastlane \ + --set FASTLANE_SKIP_UPDATE_CHECK 1 + ''; + + meta = with stdenv.lib; { description = "A tool to automate building and releasing iOS and Android apps"; longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application."; homepage = https://github.com/fastlane/fastlane; From 0e0577e2e29320570be4cbceb1cd31f881de02b8 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 7 Oct 2018 18:04:59 -0400 Subject: [PATCH 435/992] networkmanager: Fix patches with fetchpatch and updated hashes --- pkgs/tools/networking/network-manager/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 01b979c3c5bf..66d9434a470a 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus-glib, gnome3 -, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables +{ stdenv, fetchurl, fetchpatch, substituteAll, intltool, pkgconfig, dbus-glib +, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt @@ -67,13 +67,13 @@ in stdenv.mkDerivation rec { patches = [ # https://bugzilla.gnome.org/show_bug.cgi?id=796751 - (fetchurl { + (fetchpatch { url = https://bugzilla.gnome.org/attachment.cgi?id=372953; - sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a"; + sha256 = "0xg7bzs6dvkbv2qp67i7mi1c5yrmfd471xgmlkn15b33pqkzy3mc"; }) - (fetchurl { + (fetchpatch { url = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c1799d3a4dc1875d4c59c7c568a64c8456.patch; - sha256 = "af1717f7c6fdd6dadb4082dd847f4bbc42cf1574833299f3e47024e785533f2e"; + sha256 = "0r7338q3za7mf419a244vi65b1q497rg84avijybmv6w4x6p1ksd"; }) (substituteAll { src = ./fix-paths.patch; From 36e3fdd9b6d78ba720ddc7c3ba8a73358fd485f7 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 11 Oct 2018 22:01:59 +0200 Subject: [PATCH 436/992] php71: 7.1.22 -> 7.1.23 Changelog: https://secure.php.net/ChangeLog-7.php#7.1.23 --- pkgs/development/interpreters/php/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 67c38a354b43..42767f3c70c2 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -227,7 +227,7 @@ in { # We can't update the darwin versions because they simply don't compile at # all due to a bug in the intl extensions. # - # The bug so far is present in 7.1.21, 7.1.22, 7.2.9, 7.2.10. + # The bug so far is present in 7.1.21, 7.1.22, 7.1.23, 7.2.9, 7.2.10. php71 = generic ( if stdenv.isDarwin then @@ -237,8 +237,8 @@ in { } else { - version = "7.1.22"; - sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8"; + version = "7.1.23"; + sha256 = "0jyc5q666xh808sgy78cfylkhy5ma2zdg88jlxhagyphv23aly9d"; } ); From b9773bd12ed0e29aa4ea39adc8d2446e493994da Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 11 Oct 2018 22:03:50 +0200 Subject: [PATCH 437/992] php72: 7.2.10 -> 7.2.11 Changelog: https://secure.php.net/ChangeLog-7.php#7.2.11 --- pkgs/development/interpreters/php/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 42767f3c70c2..f9938de6f59d 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -227,7 +227,7 @@ in { # We can't update the darwin versions because they simply don't compile at # all due to a bug in the intl extensions. # - # The bug so far is present in 7.1.21, 7.1.22, 7.1.23, 7.2.9, 7.2.10. + # The bug so far is present in 7.1.21, 7.1.22, 7.1.23, 7.2.9, 7.2.10, 7.2.11. php71 = generic ( if stdenv.isDarwin then @@ -250,8 +250,8 @@ in { } else { - version = "7.2.10"; - sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1"; + version = "7.2.11"; + sha256 = "1idlv04j1l2d0bn5nvfrapcpjh6ayj1n4y80lqvnp5h75m07y3aa"; } ); } From 468d41db465bd5a825a7419bc6047402f88a5032 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Thu, 11 Oct 2018 16:44:43 -0400 Subject: [PATCH 438/992] keybase: 2.5.0 -> 2.7.3 --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index beea202a9562..555244bc38cd 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "2.5.0"; + version = "2.7.3"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "0fa55nizld8q0szhlpsf75ifb53js3crh98xmf8mn4bvms7d0x09"; + sha256 = "1sw6v3vf544vp8grw8p287cx078mr9v0v1wffcj6f9p9shlwj7ic"; }; buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; From 254c5a0100ca745cbdbd88157def1f690d0562f2 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Thu, 11 Oct 2018 16:45:43 -0400 Subject: [PATCH 439/992] kbfs: 2.5.0 -> 2.6.0 --- pkgs/tools/security/kbfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index ff153fddf4d3..f5b2ba3803c8 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "2.5.0"; + version = "2.6.0"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "kbfs"; rev = "v${version}"; - sha256 = "196w7vvi49xpmzn9d75qr5a1b8w23931544kx9bkc9bbwbjfc4la"; + sha256 = "0i4f1bc0gcnax572s749m7zcpy53a0f9yzi4lwc312zzxi7krz2f"; }; buildFlags = [ "-tags production" ]; From 68ad1f8774a217a9fe963a7f126a41689c259f75 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Thu, 11 Oct 2018 16:46:12 -0400 Subject: [PATCH 440/992] keybase-gui: 2.5.0 -> 2.7.0 --- pkgs/tools/security/keybase/gui.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index c8bbe42c9d6a..8831f26a42d5 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -38,10 +38,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "2.5.0-20180807164805.0fda758997"; + version = "2.7.0-20180926133747.0d62c866fc"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "135sm3h5i2h9j06py827psjbhhiqy1mb133s92p7jp6q1mhr8j1x"; + sha256 = "0a0ax3skfw398vcjl7822qp7160lbll1snwdqsa13dy8qrjl1byp"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' From b4b5862be94a1fbaf627d1504e614b593cd585ff Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Thu, 11 Oct 2018 23:57:02 +0300 Subject: [PATCH 441/992] rust-bindgen: 0.40.0 -> 0.42.2 --- pkgs/development/tools/rust/bindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 0463ab3ba0af..836003eeb736 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.40.0"; + version = "0.42.2"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "0d7jqgi3aadwqcxiaz7axsq9h6n2i42yd3q0p1hc5l0kcdwwbj5k"; + sha256 = "10h0h7x8yf4dsyw2p2nas2jg5p3i29np0y3rfzrdq898d70gvq4j"; }; - cargoSha256 = "1rjyazhnk9xihqw1qzkkcrab627lqbj789g5d5nb8bn2hkbdx5d6"; + cargoSha256 = "01jvi86xgz0r7ia9agnfpms6b6x68lzwj6f085m0w659i94acgpi"; libclang = llvmPackages.libclang.lib; #for substituteAll From 8b6248a8231b22a60db27f06953da63416826f85 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 11 Oct 2018 15:34:28 -0500 Subject: [PATCH 442/992] pcsctools: 1.4.25 -> 1.5.3 --- pkgs/tools/security/pcsctools/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 5b67a6d89ceb..42f1df8b3842 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -6,17 +6,15 @@ let deps = lib.makeBinPath [ wget coreutils ]; in stdenv.mkDerivation rec { - name = "pcsc-tools-1.4.25"; + name = "pcsc-tools-1.5.3"; src = fetchurl { - url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.gz"; - sha256 = "0iqcy28pb963ds4pjrpi37577vm6nkgf3i0b3rr978jy9qi1bix9"; + url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.bz2"; + sha256 = "050x3yqd5ywl385zai3k1zhbm2lz1f5ksalfpm9hd86s50f03ans"; }; buildInputs = [ udev dbus perl pcsclite ]; - makeFlags = [ "DESTDIR=$(out)" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; postInstall = '' From a33dec8cd58421ed8b03b3254b5a80b42eba6d1f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 10 Oct 2018 23:17:53 +0200 Subject: [PATCH 443/992] retdec: 3.0 -> 3.2 --- .../tools/analysis/retdec/default.nix | 249 ++++++++++++------ .../tools/analysis/retdec/yaracpp.nix | 49 ++++ 2 files changed, 222 insertions(+), 76 deletions(-) create mode 100644 pkgs/development/tools/analysis/retdec/yaracpp.nix diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index a4c62e6fc32c..428ca259f496 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -1,121 +1,218 @@ -{ stdenv, fetchFromGitHub, fetchurl, fetchzip, -# Native build inputs -cmake, -autoconf, automake, libtool, -pkgconfig, -bison, flex, -groff, -perl, -python, -# Runtime tools -time, -upx, -# Build inputs -ncurses, -libffi, -libxml2, -zlib, -# PE (Windows) data, huge space savings if not needed -withPEPatterns ? false, +{ stdenv +, fetchFromGitHub +, fetchzip +, lib +, callPackage +, openssl +, cmake +, autoconf +, automake +, libtool +, pkgconfig +, bison +, flex +, groff +, perl +, python3 +, time +, upx +, ncurses +, libffi +, libxml2 +, zlib +, withPEPatterns ? false }: let - release = "3.0"; - + capstone = fetchFromGitHub { + owner = "avast-tl"; + repo = "capstone"; + rev = "27c713fe4f6eaf9721785932d850b6291a6073fe"; + sha256 = "105z1g9q7s6n15qpln9vzhlij7vj6cyc5dqdr05n7wzjvlagwgxc"; + }; + elfio = fetchFromGitHub { + owner = "avast-tl"; + repo = "elfio"; + rev = "998374baace397ea98f3b1d768e81c978b4fba41"; + sha256 = "09n34rdp0wpm8zy30zx40wkkc4gbv2k3cv181y6c1260rllwk5d1"; + }; + keystone = fetchFromGitHub { # only for tests + owner = "keystone-engine"; + repo = "keystone"; + rev = "d7ba8e378e5284e6384fc9ecd660ed5f6532e922"; + sha256 = "1yzw3v8xvxh1rysh97y0i8y9svzbglx2zbsqjhrfx18vngh0x58f"; + }; + libdwarf = fetchFromGitHub { + owner = "avast-tl"; + repo = "libdwarf"; + rev = "85465d5e235cc2d2f90d04016d6aca1a452d0e73"; + sha256 = "11y62r65py8yp57i57a4cymxispimn62by9z4j2g19hngrpsgbki"; + }; + llvm = fetchFromGitHub { + owner = "avast-tl"; + repo = "llvm"; + rev = "725d0cee133c6ab9b95c493f05de3b08016f5c3c"; + sha256 = "0dzvafmn4qs62w1y9vh0a11clpj6q3hb41aym4izpcyybjndf9bq"; + }; + pelib = fetchFromGitHub { + owner = "avast-tl"; + repo = "pelib"; + rev = "a7004b2e80e4f6dc984f78b821e7b585a586050d"; + sha256 = "0nyrb3g749lxgcymz1j584xbb1x6rvy1mc700lyn0brznvqsm81n"; + }; rapidjson = fetchFromGitHub { owner = "Tencent"; repo = "rapidjson"; rev = "v1.1.0"; sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; }; + yaracpp = callPackage ./yaracpp.nix {}; # is its own package because it needs a patch + yaramod = fetchFromGitHub { + owner = "avast-tl"; + repo = "yaramod"; + rev = "v2.1.2"; + sha256 = "1rpyqzkrqvk721hf75wb7aasw5mzp9wz4j89p0x1l9p5x1b3maz3"; + }; jsoncpp = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; - rev = "1.8.3"; - sha256 = "05gkmg6r94q8a0qdymarcjlnlvmy9s365m9jhz3ysvi71cr31lkz"; + rev = "1.8.4"; + sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm"; }; - googletest = fetchFromGitHub { + googletest = fetchFromGitHub { # only for tests owner = "google"; repo = "googletest"; - rev = "release-1.8.0"; - sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399"; + rev = "83fa0cb17dad47a1d905526dcdddb5b96ed189d2"; + sha256 = "1c2r0p9v7vz2vasy8bknfb448l6wsvzw35s8hmc5z013z5502mpk"; }; tinyxml2 = fetchFromGitHub { owner = "leethomason"; repo = "tinyxml2"; - rev = "5.0.1"; + rev = "cc1745b552dd12bb1297a99f82044f83b06729e0"; sha256 = "015g8520a0c55gwmv7pfdsgfz2rpdmh3d1nq5n9bd65n35492s3q"; }; - yara = fetchurl { - url = "https://github.com/avast-tl/yara/archive/v1.0-retdec.zip"; - sha256 = "1bjrkgp1sgld2y7gvwrlrz5fs16521ink6xyq72v7yxj3vfa9gps"; - }; - openssl = fetchurl { - url = "https://www.openssl.org/source/openssl-1.1.0f.tar.gz"; - sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj"; + + retdec-support = let + version = "2018-02-08"; # make sure to adjust both hashes (once with withPEPatterns=true and once withPEPatterns=false) + in fetchzip { + url = "https://github.com/avast-tl/retdec-support/releases/download/${version}/retdec-support_${version}.tar.xz"; + sha256 = if withPEPatterns then "148i8flbyj1y4kfdyzsz7jsj38k4h97npjxj18h6v4wksd4m4jm7" + else "0ixv9qyqq40pzyqy6v9jf5rxrvivjb0z0zn260nbmb9gk765bacy"; + stripRoot = false; + # Removing PE signatures reduces this from 3.8GB -> 642MB (uncompressed) + extraPostFetch = lib.optionalString (!withPEPatterns) '' + rm -r "$out/generic/yara_patterns/static-code/pe" + ''; + } // { + inherit version; # necessary to check the version against the expected version }; - retdec-support = fetchzip { - url = "https://github.com/avast-tl/retdec-support/releases/download/2017-12-12/retdec-support_2017-12-12.tar.xz"; - sha256 = if withPEPatterns then "0pchl7hb42dm0sdbmpr8d3c6xc0lm6cs4p6g6kdb2cr9c99gjzn3" - else "1hcyq6bf4wk739kb53ic2bs71gsbx6zd07pc07lzfnxf8k497mhv"; - # Removing PE signatures reduces this from 3.8GB -> 642MB (uncompressed) - extraPostFetch = stdenv.lib.optionalString (!withPEPatterns) '' - rm -rf $out/generic/yara_patterns/static-code/pe - ''; - }; + # patch CMakeLists.txt for a dependency and compare the versions to the ones expected by upstream + # this has to be applied for every dependency (which it is in postPatch) + patchDep = dep: '' + # check if our version of dep is the same version that upstream expects + echo "Checking version of ${dep.dep_name}" + expected_rev="$( sed -n -e 's|.*URL https://github.com/.*/archive/\(.*\)\.zip.*|\1|p' "deps/${dep.dep_name}/CMakeLists.txt" )" + if [ "$expected_rev" != '${dep.rev}' ]; then + echo "The ${dep.dep_name} dependency has the wrong version: ${dep.rev} while $expected_rev is expected." + exit 1 + fi + + # patch the CMakeLists.txt file to use our local copy of the dependency instead of fetching it at build time + sed -i -e 's|URL .*|URL ${dep}|' "deps/${dep.dep_name}/CMakeLists.txt" + ''; + in stdenv.mkDerivation rec { name = "retdec-${version}"; - version = "${release}.0"; + + # If you update this you will also need to adjust the versions of the updated dependencies. You can do this by first just updating retdec + # itself and trying to build it. The build should fail and tell you which dependencies you have to upgrade to which versions. + # I've notified upstream about this problem here: + # https://github.com/avast-tl/retdec/issues/412 + version = "3.2"; src = fetchFromGitHub { owner = "avast-tl"; repo = "retdec"; - name = "retdec-${release}"; - rev = "refs/tags/v${release}"; - sha256 = "0cpc5lxg8qphdzl3gg9dx992ar35r8ik8wyysr91l2qvfhx93wks"; - fetchSubmodules = true; + name = "retdec-${version}"; + rev = "refs/tags/v${version}"; + sha256 = "0chky656lsddn20bnm3pmz6ix20y4a0y8swwr42hrhi01vkhmzrp"; }; - nativeBuildInputs = [ cmake autoconf automake libtool pkgconfig bison flex groff perl python ]; + nativeBuildInputs = [ + cmake + autoconf + automake + libtool + pkgconfig + bison + flex + groff + perl + python3 + ]; - buildInputs = [ ncurses libffi libxml2 zlib ]; + buildInputs = [ + openssl + ncurses + libffi + libxml2 + zlib + ]; - prePatch = '' - find . -wholename "*/deps/rapidjson/CMakeLists.txt" -print0 | \ - xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${rapidjson}|' - find . -wholename "*/deps/jsoncpp/CMakeLists.txt" -print0 | \ - xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${jsoncpp}|' - find . -wholename "*/deps/googletest/CMakeLists.txt" -print0 | \ - xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${googletest}|' - find . -wholename "*/deps/tinyxml2/CMakeLists.txt" -print0 | \ - xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${tinyxml2}|' + cmakeFlags = [ + "-DRETDEC_TESTS=ON" # build tests + ]; - find . -wholename "*/yaracpp/deps/CMakeLists.txt" -print0 | \ - xargs -0 sed -i -e 's|URL .*|URL ${yara}|' + # all dependencies that are normally fetched during build time (the subdirectories of `deps`) + # all of these need to be fetched through nix and the CMakeLists files need to be patched not to fetch them themselves + external_deps = [ + (capstone // { dep_name = "capstone"; }) + (elfio // { dep_name = "elfio"; }) + (googletest // { dep_name = "googletest"; }) + (jsoncpp // { dep_name = "jsoncpp"; }) + (keystone // { dep_name = "keystone"; }) + (libdwarf // { dep_name = "libdwarf"; }) + (llvm // { dep_name = "llvm"; }) + (pelib // { dep_name = "pelib"; }) + (rapidjson // { dep_name = "rapidjson"; }) + (tinyxml2 // { dep_name = "tinyxml2"; }) + (yaracpp // { dep_name = "yaracpp"; }) + (yaramod // { dep_name = "yaramod"; }) + ]; - find . -wholename "*/deps/openssl/CMakeLists.txt" -print0 | \ - xargs -0 sed -i -e 's|OPENSSL_URL .*)|OPENSSL_URL ${openssl})|' + postPatch = (lib.concatMapStrings patchDep external_deps) + '' + # install retdec-support + echo "Checking version of retdec-support" + expected_version="$( sed -n -e "s|^version = '\(.*\)'$|\1|p" 'cmake/install-share.py' )" + if [ "$expected_version" != '${retdec-support.version}' ]; then + echo "The retdec-support dependency has the wrong version: ${retdec-support.version} while $expected_version is expected." + exit 1 + fi + mkdir -p "$out/share/retdec" + cp -r ${retdec-support} "$out/share/retdec/support" # write permission needed during install + chmod -R u+w "$out/share/retdec/support" + # python file originally responsible for fetching the retdec-support archive to $out/share/retdec + # that is not necessary anymore, so empty the file + echo > cmake/install-share.py - cat > cmake/install-share.sh < Date: Thu, 11 Oct 2018 21:53:52 +0000 Subject: [PATCH 444/992] perl-cross: 1.2 -> gitmaster --- pkgs/development/interpreters/perl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index f2b900412081..b46bd20697eb 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -155,11 +155,11 @@ let platforms = platforms.all; }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.2"; + crossVersion = "ab8d05c9e695d3db4f7dc15c70f23623349c2f49"; # Oct 03, 2018 perl-cross-src = fetchurlBoot { - url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz"; - sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r"; + url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; + sha256 = "1g7p7mqmx8x3diqvbh881gr72d106cn6yvm4gx7f0ars3n3b3wj0"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; From 628fa1d50f242f231bd39c954bbf02b30a2b2a72 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 25 Sep 2018 22:52:05 +0900 Subject: [PATCH 445/992] oraclejdk: deprecate oraclejdk 10 --- pkgs/development/compilers/oraclejdk/jdk10-linux.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index de063500b709..23f44331dd89 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -150,6 +150,7 @@ let result = stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.unfree; platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms + knownVulnerabilities = [ "Support ended in September 2018. Use OpenJDK or JDK 8." ]; }; }; in result From 9d293db6afe5260eedc714102c103d928c644145 Mon Sep 17 00:00:00 2001 From: paddygord Date: Thu, 11 Oct 2018 15:13:07 -0700 Subject: [PATCH 446/992] yojimbo: init at 1.1 (#48214) --- maintainers/maintainer-list.nix | 5 +++ .../development/libraries/yojimbo/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/yojimbo/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 061703dce75d..9d93bbed9cfb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3135,6 +3135,11 @@ github = "pacien"; name = "Pacien Tran-Girard"; }; + paddygord = { + email = "pgpatrickgordon@gmail.com"; + github = "paddygord"; + name = "Patrick Gordon"; + }; paholg = { email = "paho@paholg.com"; github = "paholg"; diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix new file mode 100644 index 000000000000..9a3416a368bb --- /dev/null +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: + +stdenv.mkDerivation rec { + name = "yojimbo"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "networkprotocol"; + repo = "yojimbo"; + rev = "e02219c102d9b440290539036992d77608eab3b0"; + sha256 = "0jn25ddv73hwjals883a910m66kwj6glxxhnmn96bpzsvsaimnkr"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ premake5 doxygen ]; + propagatedBuildInputs = [ libsodium mbedtls ]; + + buildPhase = '' + premake5 gmake + make all + premake5 docs + ''; + + installPhase = '' + install -Dm555 -t $out/lib bin/libyojimbo.a + install -Dm444 -t $out/include yojimbo.h + mkdir -p $out/share/doc/yojimbo + cp -r docs/html $out/share/doc/yojimbo + ''; + + meta = with stdenv.lib; { + description = "A network library for client/server games with dedicated servers"; + longDescription = '' + yojimbo is a network library for client/server games with dedicated servers. + It's designed around the networking requirements of competitive multiplayer games like first person shooters. + As such it provides a time critical networking layer on top of UDP, with a client/server architecture supporting up to 64 players per-dedicated server instance. + ''; + homepage = https://github.com/networkprotocol/yojimbo; + license = licenses.bsd3; + platforms = platforms.x86_64; + maintainers = with maintainers; [ paddygord ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d911181ae372..e0c7db35e4a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12706,6 +12706,8 @@ with pkgs; yajl = callPackage ../development/libraries/yajl { }; + yojimbo = callPackage ../development/libraries/yojimbo { }; + yubioath-desktop = callPackage ../applications/misc/yubioath-desktop { }; yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; From 225b8de73dd0d61a87c5c50e4d4199a56beb863b Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 16 Dec 2017 21:12:34 -0500 Subject: [PATCH 447/992] pythonPackages.sphinx-jinja: 0.2.1 -> 1.1.0, Python 3 support --- .../python-modules/sphinx-jinja/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +-------------- 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/sphinx-jinja/default.nix diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix new file mode 100644 index 000000000000..375f59ec3f91 --- /dev/null +++ b/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, pbr, sphinx, sphinx-testing, nose, glibcLocales }: + +buildPythonPackage rec { + pname = "sphinx-jinja"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "02pgp9pbn0zrs0lggrc74mv6cvlnlq8wib84ga6yjvq30gda9v8q"; + }; + + buildInputs = [ pbr ]; + propagatedBuildInputs = [ sphinx ]; + + checkInputs = [ sphinx-testing nose glibcLocales ]; + + checkPhase = '' + # Zip (epub) does not support files with epoch timestamp + LC_ALL="en_US.UTF-8" nosetests -e test_build_epub + ''; + + meta = with lib; { + description = "Sphinx extension to include jinja templates in documentation"; + maintainers = with maintainers; [ nand0p ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8677cf5eeae..0df3f855c3ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12977,26 +12977,7 @@ in { }; }); - sphinx-jinja = buildPythonPackage (rec { - name = "${pname}-${version}"; - pname = "sphinx-jinja"; - version = "0.2.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/${pname}/${name}.tar.gz"; - sha256 = "1zsnhc573rvaww9qqyzs4f5h4hhvxklvppv14450vi5dk8rij81z"; - }; - buildInputs = with self; [ sphinx-testing pytest pbr]; - propagatedBuildInputs = with self; [ sphinx blockdiag ]; - checkPhase = '' - py.test -k "not test_build_epub" - ''; - disabled = isPy3k; - meta = { - description = "includes jinja templates in a documentation"; - maintainers = with maintainers; [ nand0p ]; - license = licenses.mit; - }; - }); + sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; sphinx_pypi_upload = buildPythonPackage (rec { name = "Sphinx-PyPI-upload-0.2.1"; From 511d651e583c37df146d5fe8af3477334c3e174f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 17 Dec 2017 17:02:18 -0500 Subject: [PATCH 448/992] pythonPackages.tempita: 0.5.2 -> 0.5.3-2016-09-28 --- .../python-modules/tempita/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +---------------- 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/tempita/default.nix diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix new file mode 100644 index 000000000000..318c47d21608 --- /dev/null +++ b/pkgs/development/python-modules/tempita/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchFromGitHub, nose }: + +buildPythonPackage rec { + version = "0.5.3-2016-09-28"; + name = "tempita-${version}"; + + src = fetchFromGitHub { + owner = "gjhiggins"; + repo = "tempita"; + rev = "47414a7c6e46a9a9afe78f0bce2ea299fa84d10"; + sha256 = "0f33jjjs5rvp7ar2j6ggyfykcrsrn04jaqcq71qfvycf6b7nw3rn"; + }; + + buildInputs = [ nose ]; + + meta = { + homepage = https://github.com/gjhiggins/tempita; + description = "A very small text templating language"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0df3f855c3ae..28ba36f1ccba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13310,24 +13310,7 @@ in { }; }; - tempita = buildPythonPackage rec { - version = "0.5.2"; - name = "tempita-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/T/Tempita/Tempita-${version}.tar.gz"; - sha256 = "cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c"; - }; - - disabled = isPy3k; - - buildInputs = with self; [ nose ]; - - meta = { - homepage = http://pythonpaste.org/tempita/; - description = "A very small text templating language"; - }; - }; + tempita = callPackage ../development/python-modules/tempita { }; terminado = callPackage ../development/python-modules/terminado { }; From 4f09e0584906a6792128330a9b44bfe6e729b94c Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 30 Aug 2018 18:28:38 -0400 Subject: [PATCH 449/992] python2Packages.astroid: init at 1.6.5 --- .../python-modules/astroid/1.6.nix | 39 +++++++++++++++++++ .../python-modules/astroid/default.nix | 4 +- pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/astroid/1.6.nix diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix new file mode 100644 index 000000000000..ca26da5a3737 --- /dev/null +++ b/pkgs/development/python-modules/astroid/1.6.nix @@ -0,0 +1,39 @@ +{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy +, lazy-object-proxy, six, wrapt, enum34, singledispatch, backports_functools_lru_cache +, pytest +}: + +buildPythonPackage rec { + pname = "astroid"; + version = "1.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fir4b67sm7shcacah9n61pvq313m523jb4q80sycrh3p8nmi6zw"; + }; + + # From astroid/__pkginfo__.py + propagatedBuildInputs = [ + lazy-object-proxy + six + wrapt + enum34 + singledispatch + backports_functools_lru_cache + ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + # test_builtin_help is broken + pytest -k "not test_builtin_help" astroid + ''; + + meta = with lib; { + description = "An abstract syntax tree for Python with inference support"; + homepage = https://github.com/PyCQA/astroid; + license = licenses.lgpl2; + platforms = platforms.all; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index ccf6f4055269..d773c08e189a 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { checkInputs = [ pytestrunner pytest ]; meta = with lib; { - description = "A abstract syntax tree for Python with inference support"; - homepage = https://bitbucket.org/logilab/astroid; + description = "An abstract syntax tree for Python with inference support"; + homepage = https://github.com/PyCQA/astroid; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28ba36f1ccba..11aa73a04bf8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -736,7 +736,8 @@ in { # argparse is part of stdlib in 2.7 and 3.2+ argparse = null; - astroid = callPackage ../development/python-modules/astroid { }; + astroid = if isPy3k then callPackage ../development/python-modules/astroid { } + else callPackage ../development/python-modules/astroid/1.6.nix { }; attrdict = callPackage ../development/python-modules/attrdict { }; From 67ea56717a54096f499b195a4f44d11fdbbcda2b Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 30 Aug 2018 21:14:41 -0400 Subject: [PATCH 450/992] python2Packages.pylint: init at 1.9.2 --- .../development/python-modules/pylint/1.9.nix | 49 +++++++++++++++++++ .../python-modules/pylint/default.nix | 26 +++++----- pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/pylint/1.9.nix diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix new file mode 100644 index 000000000000..ad3140cf1572 --- /dev/null +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, python, astroid, six, isort, + mccabe, configparser, backports_functools_lru_cache, singledispatch, + pytest, pytestrunner, pyenchant }: + +buildPythonPackage rec { + pname = "pylint"; + version = "1.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cxr1j037hsm4spmvl64v2j2rdq72pc2z0gnn3iggd4np6y21wpz"; + }; + + checkInputs = [ pytest pytestrunner pyenchant ]; + + propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + # Remove broken darwin test + rm -vf pylint/test/test_functional.py + ''; + + checkPhase = '' + pytest pylint/test -k "not ${lib.concatStringsSep " and not " ( + [ # Broken test + "test_good_comprehension_checks" + # See PyCQA/pylint#2535 + "test_libmodule" ] ++ + # Disable broken darwin tests + lib.optionals stdenv.isDarwin [ + "test_parallel_execution" + "test_py3k_jobs_option" + ] + )}" + ''; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + cp "elisp/"*.el $out/share/emacs/site-lisp/ + ''; + + meta = with lib; { + homepage = https://github.com/PyCQA/pylint; + description = "A bug and style checker for Python"; + platforms = platforms.all; + license = licenses.gpl1Plus; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index c9a44548c142..4f4eb3cfc731 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, isort, - pytest, pytestrunner, mccabe, pytest_xdist, pyenchant }: +{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, + isort, mccabe, pytest, pytestrunner, pyenchant }: buildPythonPackage rec { pname = "pylint"; @@ -12,21 +12,25 @@ buildPythonPackage rec { sha256 = "31142f764d2a7cd41df5196f9933b12b7ee55e73ef12204b648ad7e556c119fb"; }; - checkInputs = [ pytest pytestrunner pytest_xdist pyenchant ]; + checkInputs = [ pytest pytestrunner pyenchant ]; propagatedBuildInputs = [ astroid isort mccabe ]; - postPatch = '' + postPatch = lib.optionalString stdenv.isDarwin '' # Remove broken darwin test rm -vf pylint/test/test_functional.py ''; checkPhase = '' - cat pylint/test/test_self.py - # Disable broken darwin tests - pytest pylint/test -k "not test_parallel_execution \ - and not test_py3k_jobs_option \ - and not test_good_comprehension_checks" + pytest pylint/test -k "not ${lib.concatStringsSep " and not " ( + # Broken test + [ "test_good_comprehension_checks" ] ++ + # Disable broken darwin tests + lib.optionals stdenv.isDarwin [ + "test_parallel_execution" + "test_py3k_jobs_option" + ] + )}" ''; postInstall = '' @@ -34,8 +38,8 @@ buildPythonPackage rec { cp "elisp/"*.el $out/share/emacs/site-lisp/ ''; - meta = with stdenv.lib; { - homepage = https://www.logilab.org/project/pylint; + meta = with lib; { + homepage = https://github.com/PyCQA/pylint; description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11aa73a04bf8..73d2cf6d2ac6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10227,7 +10227,8 @@ in { pygpgme = callPackage ../development/python-modules/pygpgme { }; - pylint = callPackage ../development/python-modules/pylint { }; + pylint = if isPy3k then callPackage ../development/python-modules/pylint { } + else callPackage ../development/python-modules/pylint/1.9.nix { }; pyopencl = callPackage ../development/python-modules/pyopencl { }; From fcaae4fc356adf6ca8c9708fa7939a0a97cffd92 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 31 Aug 2018 13:09:39 -0400 Subject: [PATCH 451/992] pythonPackages.hyperlink: don't create .pytest_cache --- pkgs/development/python-modules/hyperlink/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index 53a245c45dcf..2e2e4e1cb774 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -11,12 +11,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ idna ]; - checkInputs = [ pytest ]; - - checkPhase = '' - py.test $out - ''; - meta = with stdenv.lib; { description = "A featureful, correct URL for Python"; license = licenses.mit; From 820feccb18ba0948b7d077bccb13b2912b168873 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 2 Sep 2018 23:40:36 -0400 Subject: [PATCH 452/992] pythonPackages.trollius: 1.0.4 -> 2.2 --- .../python-modules/trollius/default.nix | 56 ++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index 6d43aa8da869..01ad57e55d7d 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -1,45 +1,49 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, isPyPy, mock, futures }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock, unittest2, six, futures }: + buildPythonPackage rec { pname = "trollius"; - version = "1.0.4"; + version = "2.2"; src = fetchPypi { inherit pname version; - sha256 = "0xny8y12x3wrflmyn6xi8a7n3m3ac80fgmgzphx5jbbaxkjcm148"; + sha256 = "093978388qvw5hyscbbj062dbdc2761xs9yzrq26mh63g689lnxk"; }; - checkInputs = [ mock ]; + checkInputs = [ mock ] ++ lib.optional (!isPy3k) unittest2; - propagatedBuildInputs = lib.optionals (isPy27 || isPyPy) [ futures ]; + propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) futures; patches = [ ./tests.patch ]; - # Some of the tests fail on darwin with `error: AF_UNIX path too long' - # because of the *long* path names for sockets - patchPhase = lib.optionalString stdenv.isDarwin '' - sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|g" tests/test_events.py - sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|g" tests/test_events.py - sed -i -e "s|test_create_unix_server_existing_path_nonsock|skip_test_create_unix_server_existing_path_nonsock|g" tests/test_unix_events.py - sed -i -e "s|test_create_unix_server_existing_path_sock|skip_test_create_unix_server_existing_path_sock|g" tests/test_unix_events.py - sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|g" tests/test_events.py - sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|g" tests/test_events.py - sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|g" tests/test_events.py - sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|g" tests/test_events.py - sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|g" tests/test_streams.py - sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|g" tests/test_streams.py - sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|g" tests/test_streams.py - sed -i -e "s|test_pause_reading|skip_test_pause_reading|g" tests/test_subprocess.py - sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|g" tests/test_events.py - sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|g" tests/test_streams.py - sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|g" tests/test_events.py - sed -i -e "s|test_write_pty|skip_test_write_pty|g" tests/test_events.py + postPatch = '' + # Overrides PYTHONPATH causing dependencies not to be found + sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|g" tests/test_tasks.py + '' + lib.optionalString stdenv.isDarwin '' + # Some of the tests fail on darwin with `error: AF_UNIX path too long' + # because of the *long* path names for sockets + sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|g" tests/test_events.py + sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|g" tests/test_events.py + sed -i -e "s|test_create_unix_server_existing_path_nonsock|skip_test_create_unix_server_existing_path_nonsock|g" tests/test_unix_events.py + sed -i -e "s|test_create_unix_server_existing_path_sock|skip_test_create_unix_server_existing_path_sock|g" tests/test_unix_events.py + sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|g" tests/test_events.py + sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|g" tests/test_events.py + sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|g" tests/test_events.py + sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|g" tests/test_events.py + sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|g" tests/test_streams.py + sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|g" tests/test_streams.py + sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|g" tests/test_streams.py + sed -i -e "s|test_pause_reading|skip_test_pause_reading|g" tests/test_subprocess.py + sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|g" tests/test_events.py + sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|g" tests/test_streams.py + sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|g" tests/test_events.py + sed -i -e "s|test_write_pty|skip_test_write_pty|g" tests/test_events.py ''; meta = with stdenv.lib; { - description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2"; - homepage = "https://bitbucket.org/enovance/trollius"; + description = "Port of the asyncio project to Python 2.7"; + homepage = https://github.com/vstinner/trollius; license = licenses.asl20; maintainers = with maintainers; [ garbas ]; }; From 1c3f7302faa5da6e42f5a1c471b934124106d71a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 31 Aug 2018 13:11:24 -0400 Subject: [PATCH 453/992] pythonPackages.autobahn: use checkInputs --- .../python-modules/autobahn/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 04aa9411247e..f618b05373a7 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,7 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy33, - unittest2, mock, pytest, trollius, asyncio, - pytest-asyncio, futures, cffi, - six, twisted, txaio, zope_interface +{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy33, + six, txaio, twisted, zope_interface, cffi, asyncio, trollius, futures, + mock, pytest }: buildPythonPackage rec { pname = "autobahn"; @@ -12,21 +11,18 @@ buildPythonPackage rec { sha256 = "b69858e0be4bff8437b0bd82a0db1cbef7405e16bd9354ba587c043d6d5e1ad9"; }; - # Upstream claim python2 support, but tests require pytest-asyncio which - # is pythn3 only. Therefore, tests are skipped for python2. - doCheck = isPy3k; - checkInputs = stdenv.lib.optionals isPy3k [ unittest2 mock pytest pytest-asyncio ]; - propagatedBuildInputs = [ cffi six twisted zope_interface txaio ] ++ - (stdenv.lib.optional isPy33 asyncio) ++ - (stdenv.lib.optionals (!isPy3k) [ trollius futures ]); + propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++ + (lib.optional isPy33 asyncio) ++ + (lib.optionals (!isPy3k) [ trollius futures ]); + checkInputs = [ mock pytest ]; checkPhase = '' runHook preCheck USE_TWISTED=true py.test $out runHook postCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "WebSocket and WAMP in Python for Twisted and asyncio."; homepage = "https://crossbar.io/autobahn"; license = licenses.mit; From 5b2a1db2e334542bb590d19950a5b136c6a0d40a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 2 Sep 2018 21:56:53 -0400 Subject: [PATCH 454/992] pythonPackages.sqlalchemy_migrate: patch backslash escapes --- .../python-modules/sqlalchemy-migrate/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index 8a5609c1cd9f..41269aa6567f 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python , unittest2, scripttest, pytz, pylint, mock , testtools, pbr, tempita, decorator, sqlalchemy , six, sqlparse, testrepository @@ -12,6 +12,12 @@ buildPythonPackage rec { sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6"; }; + # See: https://review.openstack.org/#/c/608382/ + patches = [ (fetchpatch { + url = https://github.com/openstack/sqlalchemy-migrate/pull/18.patch; + sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; + }) ]; + checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; @@ -32,10 +38,8 @@ buildPythonPackage rec { ${python.interpreter} setup.py test ''; - doCheck = true; - meta = with stdenv.lib; { - homepage = http://code.google.com/p/sqlalchemy-migrate/; + homepage = https://github.com/openstack/sqlalchemy-migrate; description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; maintainers = with maintainers; [ makefu ]; From 71c42462ab71811bfacb65e89541846fe8c97e0a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 30 Aug 2018 22:06:48 -0400 Subject: [PATCH 455/992] buildbot: 1.2.0 -> 1.4.0 --- .../tools/build-managers/buildbot/default.nix | 5 ++--- .../tools/build-managers/buildbot/pkg.nix | 7 ++----- .../tools/build-managers/buildbot/plugins.nix | 15 +++++---------- .../tools/build-managers/buildbot/worker.nix | 1 - 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index adb279cdea68..7e89fdc348eb 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -12,13 +12,12 @@ let ''; package = pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "buildbot"; - version = "1.2.0"; + version = "1.4.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "02gwmls8kgm6scy36hdy0bg645zs1pxlrgwkcn79wrl7cfmabcbv"; + sha256 = "0dfa926nh642i3bnpzlz0q347zicyx6wswjfqbniri59ya64fncx"; }; buildInputs = with pythonPackages; [ diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix index 11f5be4e98e9..452c2ffea04a 100644 --- a/pkgs/development/tools/build-managers/buildbot/pkg.nix +++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix @@ -1,17 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "1.2.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "70f429311c5812ffd334f023f4f50b904be5c672c8674ee6d28a11a7c096f18a"; + sha256 = "06f4jvczbg9km0gfmcd1ljplf5w8za27i9ap9jnyqgh3j77smd7a"; }; - propagatedBuildInputs = [ setuptools ]; - postPatch = '' # Their listdir function filters out `node_modules` folders. # Do we have to care about that with Nix...? diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 430cdee3ca8c..91499b6e755c 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -2,7 +2,6 @@ { www = pythonPackages.buildPythonPackage rec { - name = "${pname}-${version}"; pname = "buildbot_www"; version = buildbot-pkg.version; @@ -11,7 +10,7 @@ src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "001kxjcyn5sxiq7m1izy4djj7alw6qpgaid4f518s9xgm4a8hwcb"; + sha256 = "1m5dsp1gn9m5vfh5hnqp8g6hmhw1f1ydnassd33nhk521f2akz0v"; }; meta = with stdenv.lib; { @@ -23,13 +22,12 @@ }; console-view = pythonPackages.buildPythonPackage rec { - name = "${pname}-${version}"; pname = "buildbot-console-view"; version = buildbot-pkg.version; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "11p9l9r9rh8cq0ihzjcdxfbi55n7inbsz45zqq67rkvqn5nhj5b6"; + sha256 = "0vblaxmihgb4w9aa5q0wcgvxs7qzajql8s22w0pl9qs494g05s9r"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -43,13 +41,12 @@ }; waterfall-view = pythonPackages.buildPythonPackage rec { - name = "${pname}-${version}"; pname = "buildbot-waterfall-view"; version = buildbot-pkg.version; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1yx63frfpbvwy4hfib1psyq5ad0wysyzfrla8d7lgbdaip021wzw"; + sha256 = "18v1a6dapwjc2s9hi0cv3ry3s048w84md908zwaa3033gz3zwzy7"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -63,13 +60,12 @@ }; grid-view = pythonPackages.buildPythonPackage rec { - name = "${pname}-${version}"; pname = "buildbot-grid-view"; version = buildbot-pkg.version; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "06my75hli3w1skdkx1qz6zqw2wckanhrcvlqm4inylj9v9pcrgv6"; + sha256 = "0iawsy892v6rn88hsgiiwaf689jqzhnb2wbxh6zkz3c0hvq4g0qd"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -83,13 +79,12 @@ }; wsgi-dashboards = pythonPackages.buildPythonPackage rec { - name = "${pname}-${version}"; pname = "buildbot-wsgi-dashboards"; version = buildbot-pkg.version; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "073gz44fa5k1p8k46k0ld9gg16j8zdj6sc297qfyqpiw28ybhc5s"; + sha256 = "00cpjna3bffh1qbq6a3sqffd1g7qhbrmn9gpzxf9k38jam6jgfpz"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 4fabad9d3701..02beb686399d 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -1,7 +1,6 @@ { stdenv, pythonPackages }: pythonPackages.buildPythonApplication (rec { - name = "${pname}-${version}"; pname = "buildbot-worker"; version = "1.4.0"; From 60ae563293ec956d683e3b9a62dbdef46f71437e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 11 Oct 2018 15:04:37 -0500 Subject: [PATCH 456/992] yubikey-manager: 0.7.0 -> 1.0.0 --- pkgs/tools/misc/yubikey-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index c8c0ba706c36..140e322c862b 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -2,11 +2,11 @@ yubikey-personalization, libu2f-host, libusb1 }: pythonPackages.buildPythonPackage rec { - name = "yubikey-manager-0.7.0"; + name = "yubikey-manager-1.0.0"; srcs = fetchurl { url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz"; - sha256 = "13vvl3jc5wg6d4h5cpaf969apsbf72dxad560d02ly061ss856zr"; + sha256 = "1qdb2b3mv4wafghnmv3sxw4fh7cjc06hnkdimfnwmqcjafzvbawd"; }; propagatedBuildInputs = From 74e6e0547999dca07c5bfe4d3f244b2647950384 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 11 Oct 2018 20:37:55 -0400 Subject: [PATCH 457/992] apacheHttpd: add lynx binary path to apachectl --- pkgs/servers/http/apache-httpd/2.4.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index c7bb6cfb6cdc..b4b4cf49592d 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv +{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx , proxySupport ? true , sslSupport ? true, openssl , http2Support ? true, nghttp2 @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { prePatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" + sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|' ''; # Required for ‘pthread_cancel’. From 9dd5dc57a77b1b592708a6d27fef081be0b06fa8 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 00:45:59 +0000 Subject: [PATCH 458/992] bootStage1: fix cross build --- nixos/modules/system/boot/stage-1.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index f58b68cb3353..8688b5ad9bfb 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -251,7 +251,8 @@ let postInstall = '' echo checking syntax # check both with bash - ${pkgs.bash}/bin/sh -n $target + ${pkgs.buildPackages.bash}/bin/sh -n $target + '' + optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' # and with ash shell, just in case ${extraUtils}/bin/ash -n $target ''; From dbb445736f74482780490c7ce4be07dbf2ac8e9c Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 01:16:50 +0000 Subject: [PATCH 459/992] use buildPackages in environment.extraSetup --- nixos/modules/config/system-path.nix | 2 +- nixos/modules/config/xdg/mime.nix | 4 ++-- nixos/modules/misc/documentation.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 3c24dab85e4d..c07e19bd03c4 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -140,7 +140,7 @@ in if [ -x $out/bin/glib-compile-schemas -a -w $out/share/glib-2.0/schemas ]; then $out/bin/glib-compile-schemas $out/share/glib-2.0/schemas fi - + ${config.environment.extraSetup} ''; }; diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index 4323a49ea1dd..cd1064630fbc 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -24,11 +24,11 @@ with lib; environment.extraSetup = '' if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then - XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null + XDG_DATA_DIRS=$out/share ${pkgs.buildPackages.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null fi if [ -w $out/share/applications ]; then - ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications + ${pkgs.buildPackages.desktop-file-utils}/bin/update-desktop-database $out/share/applications fi ''; }; diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 6a7105e9cdaa..09d53c322fb3 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -166,7 +166,7 @@ in if [ -w $out/share/info ]; then shopt -s nullglob for i in $out/share/info/*.info $out/share/info/*.info.gz; do - ${pkgs.texinfo}/bin/install-info $i $out/share/info/dir + ${pkgs.buildPackages.texinfo}/bin/install-info $i $out/share/info/dir done fi ''; From 73c523a605d455eacee45d7cb811dfba45103e8b Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 16 Dec 2017 23:06:43 -0500 Subject: [PATCH 460/992] buildbot: add Python 3 support --- nixos/doc/manual/release-notes/rl-1903.xml | 9 + .../buildbot/master.nix | 67 ++++-- .../buildbot/worker.nix | 77 ++++++- nixos/release.nix | 2 +- nixos/tests/buildbot.nix | 210 +++++++++--------- .../buildbot/default.nix | 96 ++++---- .../buildbot/pkg.nix | 4 +- .../buildbot/plugins.nix | 55 ++--- .../buildbot/skip_test_linux_distro.patch | 0 .../buildbot/worker.nix | 13 +- pkgs/top-level/aliases.nix | 5 + pkgs/top-level/all-packages.nix | 15 -- pkgs/top-level/python-packages.nix | 7 + 13 files changed, 331 insertions(+), 229 deletions(-) rename pkgs/development/{tools/build-managers => python-modules}/buildbot/default.nix (52%) rename pkgs/development/{tools/build-managers => python-modules}/buildbot/pkg.nix (87%) rename pkgs/development/{tools/build-managers => python-modules}/buildbot/plugins.nix (61%) rename pkgs/development/{tools/build-managers => python-modules}/buildbot/skip_test_linux_distro.patch (100%) rename pkgs/development/{tools/build-managers => python-modules}/buildbot/worker.nix (63%) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 9cb5b93f27cb..c4847b60e274 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -113,6 +113,15 @@ (i.e. users.users.yourusername.extraGroups = ["video"];). + + + Buildbot now supports Python 3 and its packages have been moved to + pythonPackages. The options + and + can be used to select + the Python 2 or 3 version of the package. + + diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 8d767de37f00..0f07e6133bb5 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -6,8 +6,12 @@ with lib; let cfg = config.services.buildbot-master; + + python = cfg.package.pythonModule; + escapeStr = s: escape ["'"] s; - masterCfg = if cfg.masterCfg == null then pkgs.writeText "master.cfg" '' + + defaultMasterCfg = pkgs.writeText "master.cfg" '' from buildbot.plugins import * factory = util.BuildFactory() c = BuildmasterConfig = dict( @@ -27,8 +31,28 @@ let factory.addStep(step) ${cfg.extraConfig} - '' - else cfg.masterCfg; + ''; + + tacFile = pkgs.writeText "buildbot-master.tac" '' + import os + + from twisted.application import service + from buildbot.master import BuildMaster + + basedir = '${cfg.buildbotDir}' + + configfile = '${cfg.masterCfg}' + + # Default umask for server + umask = None + + # note: this line is matched against to check that this is a buildmaster + # directory; do not edit it. + application = service.Application('buildmaster') + + m = BuildMaster(basedir, configfile, umask) + m.setServiceParent(application) + ''; in { options = { @@ -66,9 +90,9 @@ in { }; masterCfg = mkOption { - type = types.nullOr types.path; + type = types.path; description = "Optionally pass master.cfg path. Other options in this configuration will be ignored."; - default = null; + default = defaultMasterCfg; example = "/etc/nixos/buildbot/master.cfg"; }; @@ -175,18 +199,25 @@ in { package = mkOption { type = types.package; - default = pkgs.buildbot-full; - defaultText = "pkgs.buildbot-full"; + default = pkgs.pythonPackages.buildbot-full; + defaultText = "pkgs.pythonPackages.buildbot-full"; description = "Package to use for buildbot."; - example = literalExample "pkgs.buildbot-full"; + example = literalExample "pkgs.python3Packages.buildbot-full"; }; packages = mkOption { - default = with pkgs; [ python27Packages.twisted git ]; + default = [ pkgs.git ]; example = literalExample "[ pkgs.git ]"; type = types.listOf types.package; description = "Packages to add to PATH for the buildbot process."; }; + + pythonPackages = mkOption { + default = pythonPackages: with pythonPackages; [ ]; + defaultText = "pythonPackages: with pythonPackages; [ ]"; + description = "Packages to add the to the PYTHONPATH of the buildbot process."; + example = literalExample "pythonPackages: with pythonPackages; [ requests ]"; + }; }; }; @@ -210,14 +241,15 @@ in { description = "Buildbot Continuous Integration Server."; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - path = cfg.packages; + path = cfg.packages ++ cfg.pythonPackages python.pkgs; + environment.PYTHONPATH = "${python.withPackages (self: cfg.pythonPackages self ++ [ cfg.package ])}/${python.sitePackages}"; preStart = '' - env > envvars - mkdir -vp ${cfg.buildbotDir} - ln -sfv ${masterCfg} ${cfg.buildbotDir}/master.cfg - rm -fv $cfg.buildbotDir}/buildbot.tac - ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir} + mkdir -vp "${cfg.buildbotDir}" + # Link the tac file so buildbot command line tools recognize the directory + ln -sf "${tacFile}" "${cfg.buildbotDir}/buildbot.tac" + ${cfg.package}/bin/buildbot create-master --db "${cfg.dbUrl}" "${cfg.buildbotDir}" + rm -f buildbot.tac.new master.cfg.sample ''; serviceConfig = { @@ -225,12 +257,11 @@ in { User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.home; - ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}"; + # NOTE: call twistd directly with stdout logging for systemd + ExecStart = "${python.pkgs.twisted}/bin/twistd -o --nodaemon --pidfile= --logfile - --python ${tacFile}"; }; - }; }; meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; - } diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index 67c541570b97..4130ec918a70 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -7,6 +7,40 @@ with lib; let cfg = config.services.buildbot-worker; + python = cfg.package.pythonModule; + + tacFile = pkgs.writeText "aur-buildbot-worker.tac" '' + import os + from io import open + + from buildbot_worker.bot import Worker + from twisted.application import service + + basedir = '${cfg.buildbotDir}' + + # note: this line is matched against to check that this is a worker + # directory; do not edit it. + application = service.Application('buildbot-worker') + + master_url_split = '${cfg.masterUrl}'.split(':') + buildmaster_host = master_url_split[0] + port = int(master_url_split[1]) + workername = '${cfg.workerUser}' + + with open('${cfg.workerPassFile}', 'r', encoding='utf-8') as passwd_file: + passwd = passwd_file.read().strip('\r\n') + keepalive = 600 + umask = None + maxdelay = 300 + numcpus = None + allow_shutdown = None + + s = Worker(buildmaster_host, port, workername, passwd, basedir, + keepalive, umask=umask, maxdelay=maxdelay, + numcpus=numcpus, allow_shutdown=allow_shutdown) + s.setServiceParent(application) + ''; + in { options = { services.buildbot-worker = { @@ -59,6 +93,23 @@ in { description = "Specifies the Buildbot Worker password."; }; + workerPassFile = mkOption { + type = types.path; + description = "File used to store the Buildbot Worker password"; + }; + + hostMessage = mkOption { + default = null; + type = types.nullOr types.str; + description = "Description of this worker"; + }; + + adminMessage = mkOption { + default = null; + type = types.nullOr types.str; + description = "Name of the administrator of this worker"; + }; + masterUrl = mkOption { default = "localhost:9989"; type = types.str; @@ -67,23 +118,24 @@ in { package = mkOption { type = types.package; - default = pkgs.buildbot-worker; - defaultText = "pkgs.buildbot-worker"; + default = pkgs.pythonPackages.buildbot-worker; + defaultText = "pkgs.pythonPackages.buildbot-worker"; description = "Package to use for buildbot worker."; - example = literalExample "pkgs.buildbot-worker"; + example = literalExample "pkgs.python3Packages.buildbot-worker"; }; packages = mkOption { - default = with pkgs; [ python27Packages.twisted git ]; + default = with pkgs; [ git ]; example = literalExample "[ pkgs.git ]"; type = types.listOf types.package; description = "Packages to add to PATH for the buildbot process."; }; - }; }; config = mkIf cfg.enable { + services.buildbot-worker.workerPassFile = mkDefault (pkgs.writeText "buildbot-worker-password" cfg.workerPass); + users.groups = optional (cfg.group == "bbworker") { name = "bbworker"; }; @@ -104,11 +156,16 @@ in { after = [ "network.target" "buildbot-master.service" ]; wantedBy = [ "multi-user.target" ]; path = cfg.packages; + environment.PYTHONPATH = "${python.withPackages (p: [ cfg.package ])}/${python.sitePackages}"; preStart = '' - mkdir -vp ${cfg.buildbotDir} - rm -fv $cfg.buildbotDir}/buildbot.tac - ${cfg.package}/bin/buildbot-worker create-worker ${cfg.buildbotDir} ${cfg.masterUrl} ${cfg.workerUser} ${cfg.workerPass} + mkdir -vp "${cfg.buildbotDir}/info" + ${optionalString (cfg.hostMessage != null) '' + ln -sf "${pkgs.writeText "buildbot-worker-host" cfg.hostMessage}" "${cfg.buildbotDir}/info/host" + ''} + ${optionalString (cfg.adminMessage != null) '' + ln -sf "${pkgs.writeText "buildbot-worker-admin" cfg.adminMessage}" "${cfg.buildbotDir}/info/admin" + ''} ''; serviceConfig = { @@ -116,11 +173,9 @@ in { User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.home; - Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages"; # NOTE: call twistd directly with stdout logging for systemd - #ExecStart = "${cfg.package}/bin/buildbot-worker start --nodaemon ${cfg.buildbotDir}"; - ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac"; + ExecStart = "${python.pkgs.twisted}/bin/twistd --nodaemon --pidfile= --logfile - --python ${tacFile}"; }; }; diff --git a/nixos/release.nix b/nixos/release.nix index 86383f502a72..5412080cca18 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -257,7 +257,7 @@ in rec { tests.boot = callSubTests tests/boot.nix {}; tests.boot-stage1 = callTest tests/boot-stage1.nix {}; tests.borgbackup = callTest tests/borgbackup.nix {}; - tests.buildbot = callTest tests/buildbot.nix {}; + tests.buildbot = callSubTests tests/buildbot.nix {}; tests.cadvisor = callTestOnMatchingSystems ["x86_64-linux"] tests/cadvisor.nix {}; tests.ceph = callTestOnMatchingSystems ["x86_64-linux"] tests/ceph.nix {}; tests.certmgr = callSubTests tests/certmgr.nix {}; diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index cf408dc7fec9..399fd39005e2 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -1,111 +1,117 @@ -# Test ensures buildbot master comes up correctly and workers can connect +{ system ? builtins.currentSystem }: -import ./make-test.nix ({ pkgs, ... } : { - name = "buildbot"; +with import ../lib/testing.nix { inherit system; }; - nodes = { - bbmaster = { pkgs, ... }: { - services.buildbot-master = { - enable = true; - package = pkgs.buildbot-full; +let + # Test ensures buildbot master comes up correctly and workers can connect + mkBuildbotTest = python: makeTest { + name = "buildbot"; - # NOTE: use fake repo due to no internet in hydra ci - factorySteps = [ - "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')" - "steps.ShellCommand(command=['bash', 'fakerepo.sh'])" - ]; - changeSource = [ - "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" - ]; + nodes = { + bbmaster = { pkgs, ... }: { + services.buildbot-master = { + enable = true; + package = python.pkgs.buildbot-full; + + # NOTE: use fake repo due to no internet in hydra ci + factorySteps = [ + "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')" + "steps.ShellCommand(command=['bash', 'fakerepo.sh'])" + ]; + changeSource = [ + "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" + ]; + }; + networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ]; + environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-full ]; }; - networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ]; - environment.systemPackages = with pkgs; [ git buildbot-full ]; - }; - bbworker = { pkgs, ... }: { - services.buildbot-worker = { - enable = true; - masterUrl = "bbmaster:9989"; + bbworker = { pkgs, ... }: { + services.buildbot-worker = { + enable = true; + masterUrl = "bbmaster:9989"; + }; + environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-worker ]; + }; + + gitrepo = { pkgs, ... }: { + services.openssh.enable = true; + networking.firewall.allowedTCPPorts = [ 22 9418 ]; + environment.systemPackages = with pkgs; [ git ]; }; - environment.systemPackages = with pkgs; [ git buildbot-worker ]; }; - gitrepo = { pkgs, ... }: { - services.openssh.enable = true; - networking.firewall.allowedTCPPorts = [ 22 9418 ]; - environment.systemPackages = with pkgs; [ git ]; - }; + testScript = '' + #Start up and populate fake repo + $gitrepo->waitForUnit("multi-user.target"); + print($gitrepo->execute(" \ + git config --global user.name 'Nobody Fakeuser' && \ + git config --global user.email 'nobody\@fakerepo.com' && \ + rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \ + mkdir -pv /srv/repos/fakerepo ~/.ssh && \ + ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \ + cat ~/.ssh/known_hosts && \ + cd /srv/repos/fakerepo && \ + git init && \ + echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \ + cat fakerepo.sh && \ + touch .git/git-daemon-export-ok && \ + git add fakerepo.sh .git/git-daemon-export-ok && \ + git commit -m fakerepo && \ + git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \ + ")); + + # Test gitrepo + $bbmaster->waitForUnit("network-online.target"); + #$bbmaster->execute("nc -z gitrepo 9418"); + print($bbmaster->execute(" \ + rm -rfv /tmp/fakerepo && \ + git clone git://gitrepo/fakerepo /tmp/fakerepo && \ + pwd && \ + ls -la && \ + ls -la /tmp/fakerepo \ + ")); + + # Test start master and connect worker + $bbmaster->waitForUnit("buildbot-master.service"); + $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/; + $bbworker->waitForUnit("network-online.target"); + $bbworker->execute("nc -z bbmaster 8010"); + $bbworker->execute("nc -z bbmaster 9989"); + $bbworker->waitForUnit("buildbot-worker.service"); + print($bbworker->execute("ls -la /home/bbworker/worker")); + + + # Test stop buildbot master and worker + print($bbmaster->execute(" \ + systemctl -l --no-pager status buildbot-master && \ + systemctl stop buildbot-master \ + ")); + $bbworker->fail("nc -z bbmaster 8010"); + $bbworker->fail("nc -z bbmaster 9989"); + print($bbworker->execute(" \ + systemctl -l --no-pager status buildbot-worker && \ + systemctl stop buildbot-worker && \ + ls -la /home/bbworker/worker \ + ")); + + + # Test buildbot daemon mode + $bbmaster->execute("buildbot create-master /tmp"); + $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg"); + $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg"); + $bbmaster->execute("buildbot start /tmp"); + $bbworker->execute("nc -z bbmaster 8011"); + $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/; + $bbmaster->execute("buildbot stop /tmp"); + $bbworker->fail("nc -z bbmaster 8011"); + + ''; + + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ]; + }; - - testScript = '' - #Start up and populate fake repo - $gitrepo->waitForUnit("multi-user.target"); - print($gitrepo->execute(" \ - git config --global user.name 'Nobody Fakeuser' && \ - git config --global user.email 'nobody\@fakerepo.com' && \ - rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \ - mkdir -pv /srv/repos/fakerepo ~/.ssh && \ - ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \ - cat ~/.ssh/known_hosts && \ - cd /srv/repos/fakerepo && \ - git init && \ - echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \ - cat fakerepo.sh && \ - touch .git/git-daemon-export-ok && \ - git add fakerepo.sh .git/git-daemon-export-ok && \ - git commit -m fakerepo && \ - git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \ - ")); - - # Test gitrepo - $bbmaster->waitForUnit("network-online.target"); - #$bbmaster->execute("nc -z gitrepo 9418"); - print($bbmaster->execute(" \ - rm -rfv /tmp/fakerepo && \ - git clone git://gitrepo/fakerepo /tmp/fakerepo && \ - pwd && \ - ls -la && \ - ls -la /tmp/fakerepo \ - ")); - - # Test start master and connect worker - $bbmaster->waitForUnit("buildbot-master.service"); - $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/; - $bbworker->waitForUnit("network-online.target"); - $bbworker->execute("nc -z bbmaster 8010"); - $bbworker->execute("nc -z bbmaster 9989"); - $bbworker->waitForUnit("buildbot-worker.service"); - print($bbworker->execute("ls -la /home/bbworker/worker")); - - - # Test stop buildbot master and worker - print($bbmaster->execute(" \ - systemctl -l --no-pager status buildbot-master && \ - systemctl stop buildbot-master \ - ")); - $bbworker->fail("nc -z bbmaster 8010"); - $bbworker->fail("nc -z bbmaster 9989"); - print($bbworker->execute(" \ - systemctl -l --no-pager status buildbot-worker && \ - systemctl stop buildbot-worker && \ - ls -la /home/bbworker/worker \ - ")); - - - # Test buildbot daemon mode - # NOTE: daemon mode tests disabled due to broken PYTHONPATH child inheritence - # - #$bbmaster->execute("buildbot create-master /tmp"); - #$bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg"); - #$bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg"); - #$bbmaster->execute("buildbot start /tmp"); - #$bbworker->execute("nc -z bbmaster 8011"); - #$bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/; - #$bbmaster->execute("buildbot stop /tmp"); - #$bbworker->fail("nc -z bbmaster 8011"); - - ''; - - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ]; - -}) +in { + python2 = mkBuildbotTest pkgs.python2; + python3 = mkBuildbotTest pkgs.python3; +} diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix similarity index 52% rename from pkgs/development/tools/build-managers/buildbot/default.nix rename to pkgs/development/python-modules/buildbot/default.nix index 7e89fdc348eb..0110aa92c061 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,72 +1,68 @@ -{ stdenv, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }: +{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, + python, twisted, jinja2, zope_interface, future, sqlalchemy, + sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests, + txgithub, pyjade, boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint, + flake8, buildbot-worker, buildbot-pkg, glibcLocales }: let - withPlugins = plugins: runCommand "wrapped-${package.name}" { - buildInputs = [ makeWrapper ] ++ plugins; - propagatedBuildInputs = package.propagatedBuildInputs; - passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins); - } '' - makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ - --prefix PYTHONPATH : "${package}/lib/python2.7/site-packages:$PYTHONPATH" - ln -sfv ${package}/lib $out/lib - ''; + withPlugins = plugins: buildPythonPackage { + name = "${package.name}-with-plugins"; + phases = [ "installPhase" "fixupPhase" ]; + buildInputs = [ makeWrapper ]; + propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; - package = pythonPackages.buildPythonApplication rec { + installPhase = '' + makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ + --prefix PYTHONPATH : "${package}/${python.sitePackages}:$PYTHONPATH" + ln -sfv ${package}/lib $out/lib + ''; + + passthru = package.passthru // { + withPlugins = morePlugins: withPlugins (morePlugins ++ plugins); + }; + }; + + package = buildPythonPackage rec { pname = "buildbot"; version = "1.4.0"; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0dfa926nh642i3bnpzlz0q347zicyx6wswjfqbniri59ya64fncx"; }; - buildInputs = with pythonPackages; [ - lz4 - txrequests - pyjade - boto3 - moto - txgithub - mock - setuptoolsTrial - isort - pylint - astroid - pyflakes - openssh - buildbot-worker - buildbot-pkg - treq - ]; - - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = [ # core twisted jinja2 zope_interface + future sqlalchemy sqlalchemy_migrate - future dateutil txaio autobahn pyjwt - distro # tls - pyopenssl - service-identity - idna - - # docs - sphinx - sphinxcontrib-blockdiag - sphinxcontrib-spelling - pyenchant - docutils - ramlfications - sphinx-jinja + twisted.extras.tls + ]; + checkInputs = [ + treq + txrequests + pyjade + boto3 + moto + mock + lz4 + setuptoolsTrial + isort + pylint + flake8 + buildbot-worker + buildbot-pkg + glibcLocales ]; patches = [ @@ -75,6 +71,8 @@ let ./skip_test_linux_distro.patch ]; + LC_ALL = "en_US.UTF-8"; + # TimeoutErrors on slow machines -> aarch64 doCheck = !stdenv.isAarch64; @@ -82,9 +80,11 @@ let substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; - passthru = { inherit withPlugins; }; + passthru = { + inherit withPlugins; + }; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes"; maintainers = with maintainers; [ nand0p ryansydnor ]; diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix similarity index 87% rename from pkgs/development/tools/build-managers/buildbot/pkg.nix rename to pkgs/development/python-modules/buildbot/pkg.nix index 452c2ffea04a..b9358b1c420b 100644 --- a/pkgs/development/tools/build-managers/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "buildbot-pkg"; @@ -15,7 +15,7 @@ buildPythonPackage rec { substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" "" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Packaging Helper"; maintainers = with maintainers; [ nand0p ryansydnor ]; diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix similarity index 61% rename from pkgs/development/tools/build-managers/buildbot/plugins.nix rename to pkgs/development/python-modules/buildbot/plugins.nix index 91499b6e755c..bdc67d178d44 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -1,19 +1,19 @@ -{ stdenv, pythonPackages, buildbot-pkg }: +{ lib, buildPythonPackage, fetchPypi, buildbot, buildbot-pkg }: { - www = pythonPackages.buildPythonPackage rec { + www = buildPythonPackage rec { pname = "buildbot_www"; - version = buildbot-pkg.version; + inherit (buildbot-pkg) version; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit pname version format; sha256 = "1m5dsp1gn9m5vfh5hnqp8g6hmhw1f1ydnassd33nhk521f2akz0v"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot UI"; maintainers = with maintainers; [ nand0p ryansydnor ]; @@ -21,18 +21,19 @@ }; }; - console-view = pythonPackages.buildPythonPackage rec { + console-view = buildPythonPackage rec { pname = "buildbot-console-view"; - version = buildbot-pkg.version; + inherit (buildbot-pkg) version; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0vblaxmihgb4w9aa5q0wcgvxs7qzajql8s22w0pl9qs494g05s9r"; }; - propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; + propagatedBuildInputs = [ buildbot-pkg ]; + checkInputs = [ buildbot ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Console View Plugin"; maintainers = with maintainers; [ nand0p ryansydnor ]; @@ -40,18 +41,19 @@ }; }; - waterfall-view = pythonPackages.buildPythonPackage rec { + waterfall-view = buildPythonPackage rec { pname = "buildbot-waterfall-view"; - version = buildbot-pkg.version; + inherit (buildbot-pkg) version; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "18v1a6dapwjc2s9hi0cv3ry3s048w84md908zwaa3033gz3zwzy7"; }; - propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; + propagatedBuildInputs = [ buildbot-pkg ]; + checkInputs = [ buildbot ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Waterfall View Plugin"; maintainers = with maintainers; [ nand0p ryansydnor ]; @@ -59,18 +61,19 @@ }; }; - grid-view = pythonPackages.buildPythonPackage rec { + grid-view = buildPythonPackage rec { pname = "buildbot-grid-view"; - version = buildbot-pkg.version; + inherit (buildbot-pkg) version; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0iawsy892v6rn88hsgiiwaf689jqzhnb2wbxh6zkz3c0hvq4g0qd"; }; - propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; + propagatedBuildInputs = [ buildbot-pkg ]; + checkInputs = [ buildbot ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Grid View Plugin"; maintainers = with maintainers; [ nand0p ]; @@ -78,23 +81,23 @@ }; }; - wsgi-dashboards = pythonPackages.buildPythonPackage rec { + wsgi-dashboards = buildPythonPackage rec { pname = "buildbot-wsgi-dashboards"; - version = buildbot-pkg.version; + inherit (buildbot-pkg) version; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "00cpjna3bffh1qbq6a3sqffd1g7qhbrmn9gpzxf9k38jam6jgfpz"; }; - propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; + propagatedBuildInputs = [ buildbot-pkg ]; + checkInputs = [ buildbot ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot WSGI dashboards Plugin"; maintainers = with maintainers; [ ]; license = licenses.gpl2; }; }; - } diff --git a/pkgs/development/tools/build-managers/buildbot/skip_test_linux_distro.patch b/pkgs/development/python-modules/buildbot/skip_test_linux_distro.patch similarity index 100% rename from pkgs/development/tools/build-managers/buildbot/skip_test_linux_distro.patch rename to pkgs/development/python-modules/buildbot/skip_test_linux_distro.patch diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix similarity index 63% rename from pkgs/development/tools/build-managers/buildbot/worker.nix rename to pkgs/development/python-modules/buildbot/worker.nix index 02beb686399d..4e54276f8aed 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -1,22 +1,23 @@ -{ stdenv, pythonPackages }: +{ lib, buildPythonPackage, fetchPypi, python, setuptoolsTrial, mock, twisted, future }: -pythonPackages.buildPythonApplication (rec { +buildPythonPackage (rec { pname = "buildbot-worker"; version = "1.4.0"; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "12zvf4c39b6s4g1f2w407q8kkw602m88rc1ggi4w9pkw3bwbxrgy"; }; - buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; - propagatedBuildInputs = with pythonPackages; [ twisted future ]; + propagatedBuildInputs = [ twisted future ]; + + checkInputs = [ setuptoolsTrial mock ]; postPatch = '' substituteInPlace buildbot_worker/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://buildbot.net/; description = "Buildbot Worker Daemon"; maintainers = with maintainers; [ nand0p ryansydnor ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fe0d3816413e..0abf0e608466 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -49,6 +49,11 @@ mapAliases ({ bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 + buildbot = pythonPackages.buildbot; # added 2018-10-11 + buildbot-full = pythonPackages.buildbot-full; # added 2018-10-11 + buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11 + buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11 + buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 checkbashism = checkbashisms; # added 2016-08-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d911181ae372..b34501a8f69f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8135,21 +8135,6 @@ with pkgs; buck = callPackage ../development/tools/build-managers/buck { }; - buildbot = callPackage ../development/tools/build-managers/buildbot { - pythonPackages = python2Packages; - }; - buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix { - pythonPackages = python2Packages; - }; - buildbot-pkg = callPackage ../development/tools/build-managers/buildbot/pkg.nix { - inherit (python2Packages) buildPythonPackage fetchPypi setuptools; - }; - buildbot-plugins = callPackages ../development/tools/build-managers/buildbot/plugins.nix { - pythonPackages = python2Packages; - }; - buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); - buildkite-agent = buildkite-agent2; buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { }; buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73d2cf6d2ac6..3822f08bad7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1421,6 +1421,13 @@ in { bugzilla = callPackage ../development/python-modules/bugzilla { }; + buildbot = callPackage ../development/python-modules/buildbot { }; + buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { }); + buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); + buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); + buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { }; + buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; + check-manifest = callPackage ../development/python-modules/check-manifest { }; devpi-common = callPackage ../development/python-modules/devpi-common { }; From 559d0ee2844b507f5ad938f0750725020cbe0d08 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Fri, 12 Oct 2018 06:54:56 +0300 Subject: [PATCH 461/992] nano-wallet: 16.1 -> 16.2 --- pkgs/applications/altcoins/nano-wallet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix index 3426d8d07a08..22da11cdd63b 100644 --- a/pkgs/applications/altcoins/nano-wallet/default.nix +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "nano-wallet-${version}"; - version = "16.1"; + version = "16.2"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "raiblocks"; rev = "V${version}"; - sha256 = "0sk9g4fv494a5w75vs5a3s5c139lxzz1svz0cn1hkhxqlmz8w081"; + sha256 = "18zp4xl5iwwrnzrqzsygdrym5565v8dpfz0jxczw21896kw1i9i7"; fetchSubmodules = true; }; From 0fc9fdf7f2e6bc36224275cebebb4992c7d31ea4 Mon Sep 17 00:00:00 2001 From: Sophia Donataccio Date: Thu, 11 Oct 2018 23:58:25 -0400 Subject: [PATCH 462/992] mlton: use stdenv.cc.bintools.dynamicLinker --- pkgs/development/compilers/mlton/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index 0b991e22fa98..63fa3445b44c 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -5,9 +5,7 @@ let usr_prefix = if stdenv.isDarwin then "usr/local" else "usr"; - dynamic_linker = - if stdenv.isx86_64 then "${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2" - else "${stdenv.glibc.out}/lib/ld-linux.so.2"; + dynamic_linker = stdenv.cc.bintools.dynamicLinker; in stdenv.mkDerivation rec { From 4845d9324f96a0b879030e87b99cf1b841a833a0 Mon Sep 17 00:00:00 2001 From: Sophia Donataccio Date: Fri, 12 Oct 2018 00:04:16 -0400 Subject: [PATCH 463/992] mlton: prepare old version for refactoring 20130715.nix is exactly the same as the old default.nix other than pulling the meta data out into its own file. --- pkgs/development/compilers/mlton/20130715.nix | 118 +++++++++++++++ pkgs/development/compilers/mlton/default.nix | 134 +----------------- pkgs/development/compilers/mlton/meta.nix | 15 ++ pkgs/top-level/all-packages.nix | 5 +- 4 files changed, 141 insertions(+), 131 deletions(-) create mode 100644 pkgs/development/compilers/mlton/20130715.nix create mode 100644 pkgs/development/compilers/mlton/meta.nix diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix new file mode 100644 index 000000000000..f495be8a93e4 --- /dev/null +++ b/pkgs/development/compilers/mlton/20130715.nix @@ -0,0 +1,118 @@ +{ stdenv, fetchurl, patchelf, gmp }: + +let + version = "20130715"; + + usr_prefix = if stdenv.isDarwin then "usr/local" else "usr"; + + dynamic_linker = stdenv.cc.bintools.dynamicLinker; +in + +stdenv.mkDerivation rec { + name = "mlton-${version}"; + + binSrc = + if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz"; + sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j"; + }) + else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz"; + sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn"; + }) + else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; + sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9"; + }) + else throw "Architecture not supported"; + + codeSrc = + fetchurl { + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz"; + sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11"; + }; + + srcs = [ binSrc codeSrc ]; + + sourceRoot = name; + + buildInputs = [ gmp ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf; + + makeFlags = [ "all-no-docs" ]; + + configurePhase = '' + # Fix paths in the source. + find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@" + + substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp) + substituteInPlace bin/mlton-script --replace gcc cc + substituteInPlace bin/regression --replace gcc cc + substituteInPlace lib/mlnlffi-lib/Makefile --replace gcc cc + substituteInPlace mlnlffigen/gen-cppcmd --replace gcc cc + substituteInPlace runtime/Makefile --replace gcc cc + substituteInPlace ../${usr_prefix}/bin/mlton --replace gcc cc + + # Fix paths in the binary distribution. + BIN_DIST_DIR="$(pwd)/../${usr_prefix}" + for f in "bin/mlton" "lib/mlton/platform" "lib/mlton/static-library" ; do + substituteInPlace "$BIN_DIST_DIR/$f" --replace '/${usr_prefix}/bin/env bash' $(type -p bash) + done + + substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton + '' + stdenv.lib.optionalString stdenv.cc.isClang '' + sed -i "s_ patch -s -p0 Date: Fri, 12 Oct 2018 00:21:49 -0400 Subject: [PATCH 464/992] mlton: adds binary release package for mlton version 20180207 This works the same as the binary package in the old derivation, by patching the release binary. The difference is that this derivation is also exposed at the top level. --- .../compilers/mlton/20180207-binary.nix | 57 +++++++++++++++++++ pkgs/development/compilers/mlton/default.nix | 4 ++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/mlton/20180207-binary.nix diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix new file mode 100644 index 000000000000..0589733cb3c6 --- /dev/null +++ b/pkgs/development/compilers/mlton/20180207-binary.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, patchelf, gmp }: +let + dynamic-linker = stdenv.cc.bintools.dynamicLinker; +in +stdenv.mkDerivation rec { + name = "mlton-${version}"; + version = "20180207"; + + src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-linux.tgz"; + sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf"; + }) + else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl { + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-darwin.gmp-static.tgz"; + sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv"; + }) + else + throw "Architecture not supported"; + + buildInputs = [ gmp ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf; + + buildPhase = '' + make update \ + CC="$(type -p cc)" \ + WITH_GMP_INC_DIR="${gmp.dev}/include" \ + WITH_GMP_LIB_DIR="${gmp}/lib" + ''; + + installPhase = '' + make install PREFIX=$out + ''; + + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile + patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile + + for e in mllex mlnlffigen mlprof mlyacc; do + patchelf --set-interpreter ${dynamic-linker} $out/bin/$e + patchelf --set-rpath ${gmp}/lib $out/bin/$e + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change \ + /opt/local/lib/libgmp.10.dylib \ + ${gmp}/lib/libgmp.10.dylib \ + $out/lib/mlton/mlton-compile + + for e in mllex mlnlffigen mlprof mlyacc; do + install_name_tool -change \ + /opt/local/lib/libgmp.10.dylib \ + ${gmp}/lib/libgmp.10.dylib \ + $out/bin/$e + done + ''; + + meta = import ./meta.nix; +} diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index 7139a8a073de..a0662cd18a31 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -3,4 +3,8 @@ rec { mlton20130715 = import ./20130715.nix { inherit stdenv fetchurl patchelf gmp; }; + + mlton20180207Binary = import ./20180207-binary.nix { + inherit stdenv fetchurl patchelf gmp; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b998cbedec77..539b84abd4e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7163,7 +7163,8 @@ with pkgs; mkcl = callPackage ../development/compilers/mkcl {}; inherit (callPackage ../development/compilers/mlton {}) - mlton20130715; + mlton20130715 + mlton20180207Binary; mlton = mlton20130715; From a130228fe87c06a75f2f19343caea6905f611388 Mon Sep 17 00:00:00 2001 From: Sophia Donataccio Date: Fri, 12 Oct 2018 00:30:48 -0400 Subject: [PATCH 465/992] mlton: adds mlton version 20180207 --- pkgs/development/compilers/mlton/default.nix | 10 +++++- .../compilers/mlton/from-git-source.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/mlton/from-git-source.nix diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index a0662cd18a31..b32a817e20ac 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, patchelf, gmp }: +{ stdenv, fetchurl, fetchgit, patchelf, gmp }: rec { mlton20130715 = import ./20130715.nix { inherit stdenv fetchurl patchelf gmp; @@ -7,4 +7,12 @@ rec { mlton20180207Binary = import ./20180207-binary.nix { inherit stdenv fetchurl patchelf gmp; }; + + mlton20180207 = import ./from-git-source.nix { + mltonBootstrap = mlton20180207Binary; + version = "20180207"; + rev = "on-20180207-release"; + sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a"; + inherit stdenv fetchgit gmp; + }; } diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix new file mode 100644 index 000000000000..6678335b4b9c --- /dev/null +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -0,0 +1,33 @@ +{ fetchgit +, gmp +, mltonBootstrap +, url ? "https://github.com/mlton/mlton" +, rev +, sha256 +, stdenv +, version +}: + +stdenv.mkDerivation { + name = "mlton-${version}"; + + src = fetchgit { + inherit url rev sha256; + }; + + buildInputs = [mltonBootstrap gmp]; + + preBuild = '' + makeFlagsArray=( + MLTON_VERSION="${version} ${rev}" + CC="$(type -p cc)" + PREFIX="$out" + WITH_GMP_INC_DIR="${gmp.dev}/include" + WITH_GMP_LIB_DIR="${gmp}/lib" + ) + ''; + + doCheck = true; + + meta = import ./meta.nix; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 539b84abd4e0..a221c194a246 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7164,7 +7164,8 @@ with pkgs; inherit (callPackage ../development/compilers/mlton {}) mlton20130715 - mlton20180207Binary; + mlton20180207Binary + mlton20180207; mlton = mlton20130715; From fd9a07c7d4dc1679805e2699bdea8ade3c0ed1d9 Mon Sep 17 00:00:00 2001 From: Sophia Donataccio Date: Fri, 12 Oct 2018 00:36:07 -0400 Subject: [PATCH 466/992] mlton: add one-liner from old derivation to fix source files Updates from-git-source.nix to use the one-liner to fix up the bash shebang lines. --- pkgs/development/compilers/mlton/from-git-source.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix index 6678335b4b9c..3a3538a7ea42 100644 --- a/pkgs/development/compilers/mlton/from-git-source.nix +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { buildInputs = [mltonBootstrap gmp]; preBuild = '' + find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@" + makeFlagsArray=( MLTON_VERSION="${version} ${rev}" CC="$(type -p cc)" From bb7ed2cd8119583a8ed2f5ef0b8b71f26bd436ce Mon Sep 17 00:00:00 2001 From: Sophia Donataccio Date: Fri, 12 Oct 2018 00:47:54 -0400 Subject: [PATCH 467/992] mlton: refactor and adds mlton20180207Binary mlton20180207 mltonHEAD This commit adds mltonHEAD. Summary of all the changes in this branch: * mlton20130715 - for this one I just copy and pasted the old default.nix - I have tested some projects that compile with this version and don't compile with the newer version, so I think it makes sense to keep the old version * mlton20180207Binary - This is used to build the source derivations * mlton20180207 - latest release * mltonHEAD - latest commit to the master branch of the github repo at the time of creating this derivation --- pkgs/development/compilers/mlton/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index b32a817e20ac..aaf588851402 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -15,4 +15,12 @@ rec { sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a"; inherit stdenv fetchgit gmp; }; + + mltonHEAD = import ./from-git-source.nix { + mltonBootstrap = mlton20180207Binary; + version = "HEAD"; + rev = "e149c9917cfbfe6aba5c986a958ed76d5cc6cfde"; + sha256 = "0a0j1i0f0fxw2my1309srq5j3vz0kawrrln01gxms2m5hy5dl50d"; + inherit stdenv fetchgit gmp; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a221c194a246..011a42c32552 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7165,9 +7165,10 @@ with pkgs; inherit (callPackage ../development/compilers/mlton {}) mlton20130715 mlton20180207Binary - mlton20180207; + mlton20180207 + mltonHEAD; - mlton = mlton20130715; + mlton = mlton20180207; mono = mono5; mono5 = mono58; From 6ab21f44861f65404f18beea039cf24acc79585f Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Fri, 12 Oct 2018 14:16:58 +0800 Subject: [PATCH 468/992] cfssl: allow building on all platforms (#48093) --- pkgs/tools/security/cfssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 2391ea1b859b..750539b3ace8 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -27,8 +27,8 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = https://cfssl.org/; description = "Cloudflare's PKI and TLS toolkit"; - platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ mbrgm ]; + platforms = platforms.all; }; } From c0af13f1c87fad7cd99f4f27903c73fb5a7b32e2 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 9 Oct 2018 20:42:29 -0400 Subject: [PATCH 469/992] python: update documentation This touches up a handful of places in the python documentation to try to make the current best-practices more obvious. In particular, I often find the function signatures (what to pass, what not to pass) confusing and have added them to the docs. Also updated the metas to be more consistent with the most frequently used modern style. --- doc/languages-frameworks/python.section.md | 48 ++++++++++--------- .../python-modules/toolz/default.nix | 8 ++-- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 5eabb866654e..dda9e1077da7 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -186,7 +186,7 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th `toolz` package. ```nix -{ # ... +{ lib, buildPythonPackage, fetchPypi }: toolz = buildPythonPackage rec { pname = "toolz"; @@ -199,8 +199,8 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th doCheck = false; - meta = { - homepage = "https://github.com/pytoolz/toolz/"; + meta = with lib; { + homepage = https://github.com/pytoolz/toolz; description = "List processing tools and functional utilities"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; @@ -267,12 +267,13 @@ that we introduced with the `let` expression. #### Handling dependencies -Our example, `toolz`, does not have any dependencies on other Python -packages or system libraries. According to the manual, `buildPythonPackage` -uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is -exclusively a build-time dependency, then the dependency should be included as a -`buildInput`, but if it is (also) a runtime dependency, then it should be added -to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies. +Our example, `toolz`, does not have any dependencies on other Python packages or +system libraries. According to the manual, `buildPythonPackage` uses the +arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If +something is exclusively a build-time dependency, then the dependency should be +included as a `buildInput`, but if it is (also) a runtime dependency, then it +should be added to `propagatedBuildInputs`. Test dependencies are considered +build-time dependencies and passed to `checkInputs`. The following example shows which arguments are given to `buildPythonPackage` in order to build [`datashape`](https://github.com/blaze/datashape). @@ -292,7 +293,7 @@ order to build [`datashape`](https://github.com/blaze/datashape). checkInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; - meta = { + meta = with lib; { homepage = https://github.com/ContinuumIO/datashape; description = "A data description language"; license = licenses.bsd2; @@ -326,7 +327,7 @@ when building the bindings and are therefore added as `buildInputs`. buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; - meta = { + meta = with lib; { description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = https://lxml.de; license = licenses.bsd3; @@ -370,9 +371,9 @@ and `CFLAGS`. export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include" ''; - meta = { + meta = with lib; { description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; - homepage = http://hgomersall.github.com/pyFFTW/; + homepage = http://hgomersall.github.com/pyFFTW; license = with licenses; [ bsd2 bsd3 ]; maintainers = with maintainers; [ fridh ]; }; @@ -478,8 +479,6 @@ don't explicitly define which `python` derivation should be used. In the above example we use `buildPythonPackage` that is part of the set `python35Packages`, and in this case the `python35` interpreter is automatically used. - - ## Reference ### Interpreters @@ -549,31 +548,31 @@ The `buildPythonPackage` function is implemented in The following is an example: ```nix +{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools_scm, attrs, py, setuptools, six, pluggy }: buildPythonPackage rec { - version = "3.3.1"; pname = "pytest"; - - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; + version = "3.3.1"; src = fetchPypi { inherit pname version; sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93"; }; + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + checkInputs = [ hypothesis ]; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy ]; - meta = with stdenv.lib; { + meta = with lib; { maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; description = "Framework for writing tests"; }; } - ``` The `buildPythonPackage` mainly does four things: @@ -655,6 +654,9 @@ Another difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter. Because this is irrelevant for applications, the prefix is omitted. +When packaging a python application with `buildPythonApplication`, it should be +invoked with `callPackage` and passed `python` or `pythonPackages`. + #### `toPythonApplication` function A distinction is made between applications and libraries, however, sometimes a diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 0fea8f1ab751..974e3a43bc7c 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -21,10 +21,10 @@ buildPythonPackage rec{ nosetests toolz/tests ''; - meta = { - homepage = https://github.com/pytoolz/toolz/; + meta = with lib; { + homepage = https://github.com/pytoolz/toolz; description = "List processing tools and functional utilities"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; }; } From 1bcdf27c48cb730294136a5399a92d40cd3efef1 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 11 Oct 2018 20:18:33 +0000 Subject: [PATCH 470/992] Update with code review feedback; add example python application --- doc/languages-frameworks/python.section.md | 34 ++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index dda9e1077da7..b52b79c62d91 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -559,7 +559,7 @@ buildPythonPackage rec { sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93"; }; - preCheck = '' + postPatch = '' # don't test bash builtins rm testing/test_argcomplete.py ''; @@ -655,7 +655,37 @@ the packages with the version of the interpreter. Because this is irrelevant for applications, the prefix is omitted. When packaging a python application with `buildPythonApplication`, it should be -invoked with `callPackage` and passed `python` or `pythonPackages`. +called with `callPackage` and passed `python` or `pythonPackages` (possibly +specifying an interpreter version), like this: + +```nix +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "luigi"; + version = "2.7.9"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x"; + }; + + propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ]; + + meta = with lib; { + ... + }; +} +``` + +This is then added to `all-packages.nix` just as any other application would be. + +```nix +luigi = callPackage ../applications/networking/cluster/luigi { }; +``` + +Since the package is an application, a consumer doesn't need to care about +python versions or modules, which is why they don't go in `pythonPackages`. #### `toPythonApplication` function From e5ee89f7583319672632866364ff4c1ed875e4a2 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Fri, 12 Oct 2018 10:24:56 +0200 Subject: [PATCH 471/992] minikube: bump version 0.29.0 -> 0.30.0 This is a fix release for CVE-2018-1002103. More details in https://github.com/kubernetes/minikube/issues/3208 --- pkgs/applications/networking/cluster/minikube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index c68fb48fa1a4..c44b7ac1dc76 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -14,7 +14,7 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.29.0"; + version = "0.30.0"; kubernetesVersion = "1.11.2"; @@ -24,7 +24,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "09px8pxml7xrnfhyjvlhf1hw7zdj9sw47a0fv5wj5aard54lhs1l"; + sha256 = "02jxwh8qrvjn31rzjwx23908nd1i592drfdykxbc5b6a62fwp02z"; }; buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet; From b3dff39105beb0190d9a576afba95cd2a6903540 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 09:24:00 +0000 Subject: [PATCH 472/992] bootStage1: fix cross build (@matthewbauer's solution) --- nixos/modules/system/boot/stage-1.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 8688b5ad9bfb..f4cf9753c0a1 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -252,9 +252,8 @@ let echo checking syntax # check both with bash ${pkgs.buildPackages.bash}/bin/sh -n $target - '' + optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' # and with ash shell, just in case - ${extraUtils}/bin/ash -n $target + ${pkgs.buildPackages.busybox}/bin/ash -n $target ''; inherit udevRules extraUtils modulesClosure; From 432c44f6f0f48978f891747b4a62f583f4cf3ae2 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 10:02:34 +0000 Subject: [PATCH 473/992] coreutils-full: fix cross build (@matthewbauer's version) --- pkgs/tools/misc/coreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index de971cc51ac4..fe8d1a8380fc 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) '' rm $out/share/man/man1/* - cp ${if minimal then buildPackages.coreutils else buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1 + cp ${buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1 '' # du: 8.7 M locale + 0.4 M man pages + optionalString minimal '' From a08feadbe1b646ff71ca86f1b8398af61a8755b2 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 11 Oct 2018 07:58:10 +0200 Subject: [PATCH 474/992] i2p: 0.9.35 -> 0.9.37 also update tanuki's java-service-wrapper 3.5.32 -> 3.5.35 --- pkgs/tools/networking/i2p/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 55abeb4f583d..101f2a635a4b 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -2,10 +2,10 @@ let wrapper = stdenv.mkDerivation rec { name = "wrapper-${version}"; - version = "3.5.32"; + version = "3.5.35"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "1v388p5jjbpwybw0zjv5glzny17fwdwppaci2lqcsnm6qw0667f1"; + sha256 = "0mjyw9ays9v6lnj21pmfd3qdvd9b6rwxfmw3pg6z0kyf2jadixw2"; }; buildInputs = [ jdk ]; buildPhase = '' @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.35"; + name = "i2p-0.9.37"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "02p76vn1777lgv4zs27r6i9s4yk7b2x61b25i8dqmn6j60y3fa4g"; + sha256 = "1lmqdqavy471s187y0lhckznlxx6id6h0dlwlyif2vr8c0pwv2q9"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; From 4b7de150a83128f28031c30ab865b69cd5373612 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 28 Sep 2018 13:10:10 -0500 Subject: [PATCH 475/992] chromium/update.sh: don't use remote builders, lots of copying for work --- pkgs/applications/networking/browsers/chromium/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index df53068713de..ea67a62c107a 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -1,4 +1,4 @@ #!/bin/sh -e cd "$(dirname "$0")" -sp="$(nix-build -Q --no-out-link update.nix -A update)" +sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)" cat "$sp" > upstream-info.nix From ce6db5e36e1d01576d042b219b5208508696dab3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 28 Sep 2018 13:04:29 -0500 Subject: [PATCH 476/992] chromium: update to 69.0.3497.100 (and others), ran update.sh --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index ebf730129079..a26c8b8ddded 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn"; - sha256bin64 = "03k5y1nyzx26mxwxmdijkl2kj49vm5vhbxhakfxxjg3r1v0rsqrs"; - version = "69.0.3497.81"; + sha256 = "16biicw86mnjrmjazfbml2pf4rykhbvsz854cyfnpjhcvmlh24jp"; + sha256bin64 = "07jr1sqsxfdy3rymylkbpbgi79j9b2pax4igdzj943d0nbka84y5"; + version = "70.0.3538.35"; }; dev = { - sha256 = "1lx6dfd6w675b4kyrci8ikc8rfmjc1aqmm7bimxp3h4p97j5wml1"; - sha256bin64 = "0fsxj9h25glp3akw0x2rc488w5zr5v5yvl6ry7fy8w70fqgynffj"; - version = "70.0.3538.9"; + sha256 = "0fmkhvvydinv5f543n7rrmsv99rf0skwwhlpmszvspx6y4wz9smv"; + sha256bin64 = "0plr8ph78kfg2dpyacjy3aw3msfif95fqpb8xx0n8whkkpbl9968"; + version = "71.0.3559.6"; }; stable = { - sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn"; - sha256bin64 = "1f3shb85jynxq37vjxxkkxrjayqgvpss1zws5i28x6i9nygfzay7"; - version = "69.0.3497.81"; + sha256 = "0dcyzsb70ssx5hd2b25ab3ydpqh7crhxab9zzi5gn99ywxh1afg3"; + sha256bin64 = "0w56k7hmdi9knjaw67kdmyz0fdkjmk2ldh2n4l1c6szkr66vq30q"; + version = "69.0.3497.100"; }; } From ee561d9f57d28d15925ae3407c6ae82065369bfe Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 11 Oct 2018 08:20:08 +0200 Subject: [PATCH 477/992] linuxPackages.systemtap: 3.2 (2017.10.18) -> 3.3 removed quoting workaround. should be fixed as of https://sourceware.org/PR22462 --- .../tools/profiling/systemtap/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 55902f48bb73..ecc86d51a06e 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -5,9 +5,9 @@ let ## fetchgit info url = git://sourceware.org/git/systemtap.git; - rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892"; - sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq"; - version = "2017.10.18"; + rev = "release-${version}"; + sha256 = "0hckbmrlcz5nj438409fmdjjaaqzf68r2242v10lkssw5daia1gj"; + version = "3.3"; inherit (kernel) stdenv; inherit (stdenv) lib; @@ -18,12 +18,6 @@ let src = fetchgit { inherit url rev sha256; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ]; - # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs - postPatch = '' - substituteInPlace buildrun.cxx --replace \ - 'o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;' \ - 'o << "EXTRA_CFLAGS += -I" << s.runtime_path << endl;' - ''; enableParallelBuilding = true; }; @@ -53,7 +47,7 @@ in runCommand "systemtap-${kernel.version}-${version}" { }; } '' mkdir -p $out/bin - for bin in $stapBuild/bin/*; do # hello emacs */ + for bin in $stapBuild/bin/*; do ln -s $bin $out/bin done rm $out/bin/stap $out/bin/dtrace From b8e1e564101486af8b1cd74bef8f1266e3b0a85f Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 11:02:37 +0000 Subject: [PATCH 478/992] dos2unix: fix cross build --- pkgs/tools/text/dos2unix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 2db82c36a72a..dd0d1bbc9410 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --replace /usr $out ''; - buildInputs = [ perl gettext ]; + nativeBuildInputs = [ perl gettext ]; meta = with stdenv.lib; { homepage = http://waterlan.home.xs4all.nl/dos2unix.html; From 1aa94ba52d9ad22a6e2cfd8ede4405e65d9e0010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Oct 2018 08:06:54 -0300 Subject: [PATCH 479/992] go-gir-generator: fix instalation directory for source --- pkgs/desktops/deepin/go-gir-generator/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index cc05f6f055b0..d5ec29f1ef8b 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -22,9 +22,13 @@ stdenv.mkDerivation rec { libgudev ]; + postPatch = '' + sed -i -e 's:/share/gocode:/share/go:' Makefile + ''; + makeFlags = [ "PREFIX=$(out)" - "HOME=$(TMP)" + "GOCACHE=off" ]; meta = with stdenv.lib; { From 4c04969ef5daf70f39e22d49fbe16007827d66d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 12 Oct 2018 08:07:58 -0300 Subject: [PATCH 480/992] dde-api: init at 3.1.30 --- pkgs/desktops/deepin/dde-api/default.nix | 60 +++++++++++ pkgs/desktops/deepin/dde-api/deps.nix | 129 +++++++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 3 files changed, 190 insertions(+) create mode 100644 pkgs/desktops/deepin/dde-api/default.nix create mode 100644 pkgs/desktops/deepin/dde-api/deps.nix diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix new file mode 100644 index 000000000000..d8452e5f7a38 --- /dev/null +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -0,0 +1,60 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, +go-gir-generator, glib, gtk3, poppler, librsvg, pulseaudio, alsaLib, +libcanberra, gnome3, deepin-gettext-tools, go }: + +buildGoPackage rec { + name = "${pname}-${version}"; + pname = "dde-api"; + version = "3.1.30"; + + goPackagePath = "pkg.deepin.io/dde/api"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0piw6ka2xcbd5vi7m33d1afdjbb7nycxvmai530ka6r2xjabrkir"; + }; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ + pkgconfig + go-gir-generator + deepin-gettext-tools + ]; + + buildInputs = [ + glib + gtk3 + poppler + librsvg + pulseaudio + alsaLib + libcanberra + gnome3.libgudev + ]; + + postPatch = '' + sed -i -e "s|/var|$bin/var|" Makefile + ''; + + buildPhase = '' + make -C go/src/${goPackagePath} + ''; + + installPhase = '' + make install PREFIX="$bin" SYSTEMD_LIB_DIR="$bin/lib" -C go/src/${goPackagePath} + mkdir -p $out/share + mv $bin/share/gocode $out/share/go + remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/* + ''; + + meta = with stdenv.lib; { + description = "Go-lang bindings for dde-daemon"; + homepage = https://github.com/linuxdeepin/dde-api; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix new file mode 100644 index 000000000000..9df368325e3c --- /dev/null +++ b/pkgs/desktops/deepin/dde-api/deps.nix @@ -0,0 +1,129 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/cryptix/wav"; + fetch = { + type = "git"; + url = "https://github.com/cryptix/wav"; + rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; + sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; + }; + } + { + goPackagePath = "github.com/disintegration/imaging"; + fetch = { + type = "git"; + url = "https://github.com/disintegration/imaging"; + rev = "32df9565b4e0c1460f1915d53f6ff198d9a41af2"; + sha256 = "1nkmaav375fv4610g8i9bam33pv4aa4fy2n4nypprhc7vq0svwkm"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "73f6ac0b30a98e433b289500d779f50c1a6f0712"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/linuxdeepin/go-dbus-factory"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-dbus-factory"; + rev = "2a30fc6fb47b70b8879855df8e29c8f581c419aa"; + sha256 = "0b0j47n3bb5fd04p01jla6k9vz2ck8l8512ga0xsn78177yb2z0w"; + }; + } + { + goPackagePath = "github.com/linuxdeepin/go-x11-client"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-x11-client"; + rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; + sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; + }; + } + { + goPackagePath = "github.com/nfnt/resize"; + fetch = { + type = "git"; + url = "https://github.com/nfnt/resize"; + rev = "83c6a9932646f83e3267f353373d47347b6036b2"; + sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "991ec62608f3c0da01d400756917825d1e2fd528"; + sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "146acd28ed5894421fb5aac80ca93bc1b1f46f87"; + sha256 = "0d177474z85nvxz8ch6y9wjqz288844wwx8q9za3x2njnk4jbgxj"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd78401277ebd861206a03c884797c6ec5541"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "pkg.deepin.io/lib"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-lib.git"; + rev = "f09dcc32fc5a36b53ff7760e5a06e7f8f97b81f9"; + sha256 = "1z4iw7h6lknm9jrna2c73icg1a1mxvzrqdhgjvaiww89mql1jzb4"; + }; + } +] diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index f85d51b2072d..1ef7177e94d4 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -4,6 +4,7 @@ let packages = self: with self; { dbus-factory = callPackage ./dbus-factory { }; + dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; From 7a65f2c43dc3580ad8bee54fb939b7015af93d36 Mon Sep 17 00:00:00 2001 From: edude03 Date: Tue, 9 Oct 2018 15:00:39 +0800 Subject: [PATCH 481/992] envdir: init at 1.0.0 --- pkgs/tools/misc/envdir-go/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/envdir-go/default.nix diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix new file mode 100644 index 000000000000..ea08608da01c --- /dev/null +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -0,0 +1,27 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "1.0.0"; + name = "envdir-${version}"; + + goPackagePath = "github.com/d10n/envdir"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "d10n"; + repo = "envdir"; + sha256 = "1wdlblj127skgynf9amk7waabc3abbyxys9dvyc6c72zpcpdy5nc"; + }; + + preBuild = '' + # TODO: is there a way to get the commit ref so we can set main.buildCommit? + buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}") +''; + + meta = { + description = "A go rewrite of envdir"; + homepage = https://github.com/d10n/envdir; + maintainers = with stdenv.lib.maintainers; [ edude03 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3e54fa8d76d..b4c8612c53fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15075,6 +15075,8 @@ with pkgs; envypn-font = callPackage ../data/fonts/envypn-font { }; + envdir = callPackage ../tools/misc/envdir-go { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; From d74ea280d1cdd630642da22230b4eb9391392e03 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 8 Oct 2018 00:54:00 +0200 Subject: [PATCH 482/992] uhub: fix build for aarch64 related: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770175 related: https://github.com/janvidar/uhub/issues/46 --- pkgs/servers/uhub/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 456f73dc52ed..52866784faa9 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd +{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd , tlsSupport ? false }: assert tlsSupport -> openssl != null; @@ -31,9 +31,14 @@ stdenv.mkDerivation rec { patches = [ ./plugin-dir.patch + # fix aarch64 build: https://github.com/janvidar/uhub/issues/46 + (fetchpatch { + url = "https://github.com/janvidar/uhub/pull/47.patch"; + sha256 = "07yik6za89ar5bxm7m2183i7f6hfbawbxvd4vs02n1zr2fgfxmiq"; + }) # Fixed compilation on systemd > 210 - (fetchurl { + (fetchpatch { url = "https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.diff"; sha256 = "1jp8fvw6f9jh0sdjml9mahkk6p6b96p6rzg2y601mnnbcdj8y8xp"; }) From d4f88f1d0c8b3d80f2b1b9a15a6cb91786be8076 Mon Sep 17 00:00:00 2001 From: Shreyansh Khajanchi Date: Fri, 12 Oct 2018 17:39:58 +0530 Subject: [PATCH 483/992] hugo: apply upstream patch to call rst2html directly on Nix Initially, rst2html was called via the python interpreter which would fail if the script was wrapped in a launcher as on NixOS. --- pkgs/applications/misc/hugo/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a6a489492e31..c353a779b646 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { name = "hugo-${version}"; @@ -13,6 +13,13 @@ buildGoPackage rec { sha256 = "0n27vyg66jfx4lwswsmdlybly8c9gy5rk7yhy7wzs3rwzlqv1jzj"; }; + patches = [ + (fetchpatch { + url = "https://github.com/gohugoio/hugo/commit/b137ad4dbd6d14d0a9af68c044aaee61f2c87fe5.diff"; + sha256 = "0w1gpg11idqywqcpwzvx4xabn02kk8y4jmyz4h67mc3yh2dhq3ll"; + }) + ]; + goDeps = ./deps.nix; buildFlags = "-tags extended"; From d26c303bef670e33d7211b6c053fdb04983c7692 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 21 Jul 2018 00:04:19 +0200 Subject: [PATCH 484/992] futhark: init at 0.6.2 --- .../development/compilers/futhark/default.nix | 24 ++++++++ .../compilers/futhark/unwrapped.nix | 55 +++++++++++++++++++ .../haskell-modules/configuration-common.nix | 2 + 3 files changed, 81 insertions(+) create mode 100644 pkgs/development/compilers/futhark/default.nix create mode 100644 pkgs/development/compilers/futhark/unwrapped.nix diff --git a/pkgs/development/compilers/futhark/default.nix b/pkgs/development/compilers/futhark/default.nix new file mode 100644 index 000000000000..6cabd686b497 --- /dev/null +++ b/pkgs/development/compilers/futhark/default.nix @@ -0,0 +1,24 @@ +{ callPackage, symlinkJoin, makeWrapper, stdenv, gcc, opencl-headers, opencl-icd }: + +let + unwrapped = callPackage ./unwrapped.nix {}; + + path = stdenv.lib.makeBinPath [ gcc ]; + + wrapped = symlinkJoin { + name = "futhark-wrapped"; + buildInputs = [ makeWrapper ]; + paths = [ unwrapped ]; + postBuild = '' + wrapProgram $out/bin/futhark-c \ + --prefix PATH : "${path}" + + wrapProgram $out/bin/futhark-opencl \ + --prefix PATH : "${path}" \ + --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ + --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ + --set NIX_CFLAGS_LINK "-L${opencl-icd}/lib" + ''; + }; + +in wrapped diff --git a/pkgs/development/compilers/futhark/unwrapped.nix b/pkgs/development/compilers/futhark/unwrapped.nix new file mode 100644 index 000000000000..890be3431c3a --- /dev/null +++ b/pkgs/development/compilers/futhark/unwrapped.nix @@ -0,0 +1,55 @@ +# Generated using `cabal2nix --hpack .`, then replace src +{ mkDerivation, alex, array, base, bifunctors, binary, blaze-html +, bytestring, containers, data-binary-ieee754, directory +, directory-tree, dlist, extra, file-embed, filepath, gitrev, happy +, haskeline, hpack, HUnit, json, language-c-quote, mainland-pretty +, markdown, mtl, neat-interpolation, parallel, parsec, process +, process-extras, QuickCheck, random, raw-strings-qq, regex-tdfa +, srcloc, stdenv, template-haskell, temporary, test-framework +, test-framework-hunit, test-framework-quickcheck2, text +, th-lift-instances, transformers, vector, vector-binary-instances +, zlib, fetchFromGitHub +}: +mkDerivation { + pname = "futhark"; + version = "0.6.2"; + src = fetchFromGitHub { + owner = "diku-dk"; + repo = "futhark"; + rev = "v0.6.2"; + sha256 = "0yj7n01swpvqblybdnks3mjf0mzf1gdg2b2cpxdpxnrjw5j0pnq2"; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors binary blaze-html bytestring containers + data-binary-ieee754 directory directory-tree dlist extra file-embed + filepath gitrev language-c-quote mainland-pretty markdown mtl + neat-interpolation parallel parsec process raw-strings-qq + regex-tdfa srcloc template-haskell text th-lift-instances + transformers vector vector-binary-instances zlib + ]; + libraryToolDepends = [ alex happy hpack ]; + executableHaskellDepends = [ + array base bifunctors binary blaze-html bytestring containers + data-binary-ieee754 directory directory-tree dlist extra file-embed + filepath gitrev haskeline json language-c-quote mainland-pretty + markdown mtl neat-interpolation parallel parsec process + process-extras random raw-strings-qq regex-tdfa srcloc + template-haskell temporary text th-lift-instances transformers + vector vector-binary-instances zlib + ]; + testHaskellDepends = [ + array base bifunctors binary blaze-html bytestring containers + data-binary-ieee754 directory directory-tree dlist extra file-embed + filepath gitrev HUnit language-c-quote mainland-pretty markdown mtl + neat-interpolation parallel parsec process QuickCheck + raw-strings-qq regex-tdfa srcloc template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 text + th-lift-instances transformers vector vector-binary-instances zlib + ]; + preConfigure = "hpack"; + homepage = "https://futhark-lang.org"; + description = "An optimising compiler for a functional, array-oriented language"; + license = stdenv.lib.licenses.isc; +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8ff6aed506f2..447e9cb42272 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -707,6 +707,8 @@ self: super: { # vaultenv is not available from Hackage. vaultenv = self.callPackage ../tools/haskell/vaultenv { }; + futhark = self.callPackage ../compilers/futhark { }; + # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal super.stunclient (drv: { From 0c25079958ac46f7438d2a90e837acf7c69a2ab9 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 20 Aug 2018 22:14:32 +0200 Subject: [PATCH 485/992] futhark: introduce the top-level futhark attribute The fact that futhark is a Haskell package is an implementation detail. To install it users should just have to specify `futhark` instead of `haskellPackages.futhark`. Additionally futhark is overridden with `haskell.lib.justStaticExecutables` to reduce closure size. --- .../development/compilers/futhark/default.nix | 77 +++++++++++++------ .../compilers/futhark/unwrapped.nix | 55 ------------- .../haskell-modules/configuration-common.nix | 1 + .../haskell-modules/configuration-nix.nix | 15 ++++ pkgs/tools/audio/mpdsync/default.nix | 24 ++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 96 insertions(+), 78 deletions(-) delete mode 100644 pkgs/development/compilers/futhark/unwrapped.nix create mode 100644 pkgs/tools/audio/mpdsync/default.nix diff --git a/pkgs/development/compilers/futhark/default.nix b/pkgs/development/compilers/futhark/default.nix index 6cabd686b497..890be3431c3a 100644 --- a/pkgs/development/compilers/futhark/default.nix +++ b/pkgs/development/compilers/futhark/default.nix @@ -1,24 +1,55 @@ -{ callPackage, symlinkJoin, makeWrapper, stdenv, gcc, opencl-headers, opencl-icd }: - -let - unwrapped = callPackage ./unwrapped.nix {}; - - path = stdenv.lib.makeBinPath [ gcc ]; - - wrapped = symlinkJoin { - name = "futhark-wrapped"; - buildInputs = [ makeWrapper ]; - paths = [ unwrapped ]; - postBuild = '' - wrapProgram $out/bin/futhark-c \ - --prefix PATH : "${path}" - - wrapProgram $out/bin/futhark-opencl \ - --prefix PATH : "${path}" \ - --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ - --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ - --set NIX_CFLAGS_LINK "-L${opencl-icd}/lib" - ''; +# Generated using `cabal2nix --hpack .`, then replace src +{ mkDerivation, alex, array, base, bifunctors, binary, blaze-html +, bytestring, containers, data-binary-ieee754, directory +, directory-tree, dlist, extra, file-embed, filepath, gitrev, happy +, haskeline, hpack, HUnit, json, language-c-quote, mainland-pretty +, markdown, mtl, neat-interpolation, parallel, parsec, process +, process-extras, QuickCheck, random, raw-strings-qq, regex-tdfa +, srcloc, stdenv, template-haskell, temporary, test-framework +, test-framework-hunit, test-framework-quickcheck2, text +, th-lift-instances, transformers, vector, vector-binary-instances +, zlib, fetchFromGitHub +}: +mkDerivation { + pname = "futhark"; + version = "0.6.2"; + src = fetchFromGitHub { + owner = "diku-dk"; + repo = "futhark"; + rev = "v0.6.2"; + sha256 = "0yj7n01swpvqblybdnks3mjf0mzf1gdg2b2cpxdpxnrjw5j0pnq2"; }; - -in wrapped + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors binary blaze-html bytestring containers + data-binary-ieee754 directory directory-tree dlist extra file-embed + filepath gitrev language-c-quote mainland-pretty markdown mtl + neat-interpolation parallel parsec process raw-strings-qq + regex-tdfa srcloc template-haskell text th-lift-instances + transformers vector vector-binary-instances zlib + ]; + libraryToolDepends = [ alex happy hpack ]; + executableHaskellDepends = [ + array base bifunctors binary blaze-html bytestring containers + data-binary-ieee754 directory directory-tree dlist extra file-embed + filepath gitrev haskeline json language-c-quote mainland-pretty + markdown mtl neat-interpolation parallel parsec process + process-extras random raw-strings-qq regex-tdfa srcloc + template-haskell temporary text th-lift-instances transformers + vector vector-binary-instances zlib + ]; + testHaskellDepends = [ + array base bifunctors binary blaze-html bytestring containers + data-binary-ieee754 directory directory-tree dlist extra file-embed + filepath gitrev HUnit language-c-quote mainland-pretty markdown mtl + neat-interpolation parallel parsec process QuickCheck + raw-strings-qq regex-tdfa srcloc template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 text + th-lift-instances transformers vector vector-binary-instances zlib + ]; + preConfigure = "hpack"; + homepage = "https://futhark-lang.org"; + description = "An optimising compiler for a functional, array-oriented language"; + license = stdenv.lib.licenses.isc; +} diff --git a/pkgs/development/compilers/futhark/unwrapped.nix b/pkgs/development/compilers/futhark/unwrapped.nix deleted file mode 100644 index 890be3431c3a..000000000000 --- a/pkgs/development/compilers/futhark/unwrapped.nix +++ /dev/null @@ -1,55 +0,0 @@ -# Generated using `cabal2nix --hpack .`, then replace src -{ mkDerivation, alex, array, base, bifunctors, binary, blaze-html -, bytestring, containers, data-binary-ieee754, directory -, directory-tree, dlist, extra, file-embed, filepath, gitrev, happy -, haskeline, hpack, HUnit, json, language-c-quote, mainland-pretty -, markdown, mtl, neat-interpolation, parallel, parsec, process -, process-extras, QuickCheck, random, raw-strings-qq, regex-tdfa -, srcloc, stdenv, template-haskell, temporary, test-framework -, test-framework-hunit, test-framework-quickcheck2, text -, th-lift-instances, transformers, vector, vector-binary-instances -, zlib, fetchFromGitHub -}: -mkDerivation { - pname = "futhark"; - version = "0.6.2"; - src = fetchFromGitHub { - owner = "diku-dk"; - repo = "futhark"; - rev = "v0.6.2"; - sha256 = "0yj7n01swpvqblybdnks3mjf0mzf1gdg2b2cpxdpxnrjw5j0pnq2"; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bifunctors binary blaze-html bytestring containers - data-binary-ieee754 directory directory-tree dlist extra file-embed - filepath gitrev language-c-quote mainland-pretty markdown mtl - neat-interpolation parallel parsec process raw-strings-qq - regex-tdfa srcloc template-haskell text th-lift-instances - transformers vector vector-binary-instances zlib - ]; - libraryToolDepends = [ alex happy hpack ]; - executableHaskellDepends = [ - array base bifunctors binary blaze-html bytestring containers - data-binary-ieee754 directory directory-tree dlist extra file-embed - filepath gitrev haskeline json language-c-quote mainland-pretty - markdown mtl neat-interpolation parallel parsec process - process-extras random raw-strings-qq regex-tdfa srcloc - template-haskell temporary text th-lift-instances transformers - vector vector-binary-instances zlib - ]; - testHaskellDepends = [ - array base bifunctors binary blaze-html bytestring containers - data-binary-ieee754 directory directory-tree dlist extra file-embed - filepath gitrev HUnit language-c-quote mainland-pretty markdown mtl - neat-interpolation parallel parsec process QuickCheck - raw-strings-qq regex-tdfa srcloc template-haskell test-framework - test-framework-hunit test-framework-quickcheck2 text - th-lift-instances transformers vector vector-binary-instances zlib - ]; - preConfigure = "hpack"; - homepage = "https://futhark-lang.org"; - description = "An optimising compiler for a functional, array-oriented language"; - license = stdenv.lib.licenses.isc; -} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 447e9cb42272..46e104e34724 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -707,6 +707,7 @@ self: super: { # vaultenv is not available from Hackage. vaultenv = self.callPackage ../tools/haskell/vaultenv { }; + # futhark is not available from Hackage. futhark = self.callPackage ../compilers/futhark { }; # https://github.com/Philonous/hs-stun/pull/1 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bb9b0e5d5fe6..523f4ed0212c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -528,4 +528,19 @@ self: super: builtins.intersectAttrs super { # The test-suite requires a running PostgreSQL server. Frames-beam = dontCheck super.Frames-beam; + + futhark = with pkgs; + let path = stdenv.lib.makeBinPath [ gcc ]; + in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: { + postInstall = '' + wrapProgram $out/bin/futhark-c \ + --prefix PATH : "${path}" + + wrapProgram $out/bin/futhark-opencl \ + --prefix PATH : "${path}" \ + --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ + --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ + --set NIX_CFLAGS_LINK "-L${opencl-icd}/lib" + ''; + }); } diff --git a/pkgs/tools/audio/mpdsync/default.nix b/pkgs/tools/audio/mpdsync/default.nix new file mode 100644 index 000000000000..51f5ba656168 --- /dev/null +++ b/pkgs/tools/audio/mpdsync/default.nix @@ -0,0 +1,24 @@ +{ stdenv, python2, fetchFromGitHub }: +with python2.pkgs; +stdenv.mkDerivation { + name = "mpdsync-2017-06-15"; + + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "mpdsync"; + rev = "da90058f44dd9578cc5f2fb96a1fb2b26da40d07"; + sha256 = "1mfg3ipqj5dvyyqbgp6ia6sc1ja5gmm2c9mfrwx0jw2dl182if6q"; + }; + + pythonPath = [ mpd2 ]; + + nativeBuildInputs = [ + wrapPython + ]; + + dontBuild = true; + + installPhase = "install -D mpdsync.py $out/bin/mpdsync"; + postFixup = "wrapPythonPrograms"; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a31834b053a2..eb6e1505db9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1336,6 +1336,8 @@ with pkgs; fsmark = callPackage ../tools/misc/fsmark { }; + futhark = haskell.lib.justStaticExecutables haskellPackages.futhark; + fwup = callPackage ../tools/misc/fwup { }; fzf = callPackage ../tools/misc/fzf { }; From 7b49b870cb2326b998e90818a22055fd6e52959d Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 Aug 2018 15:24:41 +0200 Subject: [PATCH 486/992] haskell: have a dedicated file for non Hackage packages We had a few "overrides" in configuration-common.nix that were really extensions. They introduced packages that weren't in hackage-packages.nix. The advantage of having a dedicated file for these packages is that we can still place Nix-specific overrides to these packages in configuration-nix.nix. We weren't able do this before because configuration-nix.nix extended only the packages from hackage-packages.nix. --- .../haskell-modules/configuration-common.nix | 9 --------- pkgs/development/haskell-modules/default.nix | 5 ++++- .../haskell-modules/non-hackage-packages.nix | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/haskell-modules/non-hackage-packages.nix diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 46e104e34724..15bd1507cc93 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -704,12 +704,6 @@ self: super: { then appendConfigureFlag super.gtk "-fhave-quartz-gtk" else super.gtk; - # vaultenv is not available from Hackage. - vaultenv = self.callPackage ../tools/haskell/vaultenv { }; - - # futhark is not available from Hackage. - futhark = self.callPackage ../compilers/futhark { }; - # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal super.stunclient (drv: { @@ -950,9 +944,6 @@ self: super: { # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env; - # Add support for https://github.com/haskell-hvr/multi-ghc-travis. - multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {}; - # https://github.com/yesodweb/Shelly.hs/issues/162 shelly = dontCheck super.shelly; diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index b8943a55394a..a4f0399cf3c6 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -4,6 +4,7 @@ , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) , initialPackages ? import ./initial-packages.nix +, nonHackagePackages ? import ./non-hackage-packages.nix , configurationCommon ? import ./configuration-common.nix , configurationNix ? import ./configuration-nix.nix }: @@ -26,7 +27,9 @@ let (extends packageSetConfig (extends compilerConfig (extends commonConfiguration - (extends nixConfiguration haskellPackages))))); + (extends nixConfiguration + (extends nonHackagePackages + haskellPackages)))))); in diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix new file mode 100644 index 000000000000..642c6bff6b53 --- /dev/null +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -0,0 +1,14 @@ +# EXTRA HASKELL PACKAGES NOT ON HACKAGE +# +# This file should only contain packages that are not in ./hackage-packages.nix. +# Attributes in this set should be nothing more than a callPackage call. +# Overrides to these packages should go to either configuration-nix.nix, +# configuration-common.nix or to one of the compiler specific configuration +# files. +self: super: { + multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { }; + + vaultenv = self.callPackage ../tools/haskell/vaultenv { }; + + futhark = self.callPackage ../compilers/futhark { }; +} From b64193f69bb1dbadb9ff44cefb990d48d2a5d198 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 Aug 2018 15:54:17 +0200 Subject: [PATCH 487/992] haskellPackages.multi-ghc-travis: removed in favour of haskell-ci multi-ghc-travis has been renamed to haskell-ci which is now also on Hackage. --- pkgs/development/haskell-modules/non-hackage-packages.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 642c6bff6b53..6b8477b524bf 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -6,7 +6,9 @@ # configuration-common.nix or to one of the compiler specific configuration # files. self: super: { - multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { }; + + multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed" + + "to haskell-ci, which is now on hackage"); vaultenv = self.callPackage ../tools/haskell/vaultenv { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb6e1505db9c..88fe95c4196e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8602,7 +8602,7 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; - multi-ghc-travis = haskell.lib.justStaticExecutables haskellPackages.multi-ghc-travis; + haskell-ci = haskell.lib.justStaticExecutables haskellPackages.haskell-ci; neoload = callPackage ../development/tools/neoload { licenseAccepted = (config.neoload.accept_license or false); From 5ea9d9d097222cd0aa7ed9ff3ceaa9cd81a3e8cf Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 Aug 2018 15:54:30 +0200 Subject: [PATCH 488/992] haskell: add GitHub issues to non-hackage-packages.nix --- pkgs/development/haskell-modules/non-hackage-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 6b8477b524bf..68fcbdb79a5d 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -10,7 +10,9 @@ self: super: { multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed" + "to haskell-ci, which is now on hackage"); + # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; + # https://github.com/diku-dk/futhark/issues/614 futhark = self.callPackage ../compilers/futhark { }; } From fbeeed1c5c81dec0823ca12691a6cd66d5c7599f Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 12:36:48 +0000 Subject: [PATCH 489/992] p7zip: fix cross-compilation --- pkgs/tools/archivers/p7zip/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 4886217211df..5430c2cb73e7 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { # I think this is a typo and should be CXX? Either way let's kill it sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits + '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace makefile.machine \ + --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \ + --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' ''; preConfigure = '' From a4f4886ba30548e4920ade520c9a1a37d3897b69 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 12:48:59 +0000 Subject: [PATCH 490/992] ntp: fix cross-build --- pkgs/tools/networking/ntp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 8c4462c36bcf..de2fb1472aa9 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { "--with-openssl-libdir=${openssl.out}/lib" "--with-openssl-incdir=${openssl.dev}/include" "--enable-ignore-dns-errors" + "--with-yielding-select=yes" ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps" ++ stdenv.lib.optional withSeccomp "--enable-libseccomp"; From 0653da427ac4e75d2f5831e50b71bdb14769ef6c Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 13:03:50 +0000 Subject: [PATCH 491/992] psmisc: fix cross-compiling --- pkgs/os-specific/linux/psmisc/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 8b3906dedb1f..68e51afdf1bb 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake gettext ]; buildInputs = [ ncurses ]; - preConfigure = '' + preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + # Goes past the rpl_malloc linking failure + export ac_cv_func_malloc_0_nonnull=yes + export ac_cv_func_realloc_0_nonnull=yes + '' + '' echo $version > .tarball-version ./autogen.sh ''; From 4b17b8bba4507a322148bf901cfec387d5cd5e89 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 13:14:25 +0000 Subject: [PATCH 492/992] screen: fix cross-compiling --- pkgs/tools/misc/screen/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 1753f52ab1b6..fd641ea613d5 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { stripLen = 1; }); + postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) + # XXX: Awful hack to allow cross-compilation. + '' sed -i ./configure \ + -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' + ''; # " + buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam ++ stdenv.lib.optional stdenv.isDarwin utmp; From d6273e5161b85a8eec197c07d48cb0136b10fb1a Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 12 Oct 2018 12:48:05 +0200 Subject: [PATCH 493/992] termbox: init at 1.1.2 --- .../development/libraries/termbox/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/termbox/default.nix diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix new file mode 100644 index 000000000000..0898289978a2 --- /dev/null +++ b/pkgs/development/libraries/termbox/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + name = "termbox-${version}"; + version = "1.1.2"; + src = fetchFromGitHub { + owner = "nsf"; + repo = "termbox"; + rev = "v${version}"; + sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs"; + }; + nativeBuildInputs = [ python3 ]; + configurePhase = "python3 ./waf configure --prefix=$out"; + buildPhase = "python3 ./waf build"; + installPhase = "python3 ./waf install --destdir=$out"; + meta = with stdenv.lib; { + description = "Library for writing text-based user interfaces"; + license = licenses.mit; + homepage = "https://github.com/nsf/termbox#readme"; + downloadPage = "https://github.com/nsf/termbox/releases"; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a0b0956d759..1fc675ffc044 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12283,6 +12283,8 @@ with pkgs; telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; + termbox = callPackage ../development/libraries/termbox { }; + tevent = callPackage ../development/libraries/tevent { python = python2; }; From 992b13bd72788860705317bf06447cc27f418754 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 07:23:00 -0700 Subject: [PATCH 494/992] wavebox: 3.14.10 -> 4.3.0 (#47701) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wavebox/versions --- .../networking/instant-messengers/wavebox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index ce73acf8d596..ac58d4f39d6f 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let bits = "x86_64"; - version = "3.14.10"; + version = "4.3.0"; desktopItem = makeDesktopItem rec { name = "Wavebox"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { name = "wavebox-${version}"; src = fetchurl { url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; - sha256 = "06ce349f561c6122b2d326e9a1363fb358e263c81a7d1d08723ec567235bbd74"; + sha256 = "0kdg5q9rv8nxlg5jhmdfy5vv7gkdswzhy49af29d3zf57z69187c"; }; # don't remove runtime deps From b61dd2bcb7e0c88fcc53f48f8430d352b87b3388 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 12 Oct 2018 17:28:48 +0300 Subject: [PATCH 495/992] nixos/rmilter: don't enable by default, if rspamd enabled --- nixos/modules/services/mail/rmilter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index 0d91b247cd34..492c64583219 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -52,7 +52,7 @@ in enable = mkOption { type = types.bool; - default = cfg.rspamd.enable; + default = false; description = "Whether to run the rmilter daemon."; }; From 7969b9ed3ce1b1792e7a59845364e2f3c2134bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 12 Oct 2018 16:44:53 +0200 Subject: [PATCH 496/992] knot-dns: 2.7.2 -> 2.7.3 (minor update) https://gitlab.labs.nic.cz/knot/knot-dns/tags/v2.7.3 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 3837f06264b7..64b78d335f79 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "cb70b2ee1c7ecbaad8774a1e0c449a68c6a6f7c9d60595524f003201d6e38431"; + sha256 = "8717c0f34e441e96bc32bc93b48333ea9c094c5075f91575e40ac30fcf6692df"; }; outputs = [ "bin" "out" "dev" ]; From 7658ae6b729a46b458f37243671db3d2cbe476d3 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 12 Oct 2018 17:59:49 +0300 Subject: [PATCH 497/992] solc: 0.4.24 -> 0.4.25 --- pkgs/development/compilers/solc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index edb7fc61d2a3..e67e2191debe 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: let - version = "0.4.24"; - rev = "e67f0147998a9e3835ed3ce8bf6a0a0c634216c5"; - sha256 = "1gy2miv6ia1z98zy6w4y03balwfr964bnvwzyg8v7pn2mayqnaap"; + version = "0.4.25"; + rev = "59dbf8f1085b8b92e8b7eb0ce380cbeb642e97eb"; + sha256 = "11lss1sldzjg4689c06iw0iivyi9f4zpi4l9za0fgy6k85qz43v9"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; From dd6b5082a52617594863e4e03d5d7c909ef5ab9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 08:47:44 -0700 Subject: [PATCH 498/992] eccodes: 2.8.2 -> 2.9.0 (#47822) * eccodes: 2.8.2 -> 2.9.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/eccodes/versions * eccodes: src and homepage URLs changed --- pkgs/development/libraries/eccodes/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 5cd004c8d136..01600f90f284 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.8.2"; + version = "2.9.0"; src = fetchurl { - url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "0aki7llrdfj6273yjy8yv0d027sdbv8xs3iv68fb69s0clyygrin"; + url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; + sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z"; }; nativeBuildInputs = [ cmake ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://software.ecmwf.int/wiki/display/ECC/; + homepage = https://confluence.ecmwf.int/display/ECC/; license = licenses.asl20; maintainers = with maintainers; [ knedlsepp ]; platforms = platforms.unix; From 7bafe255530a73f8b68ed211099d7770277f9e1f Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Fri, 12 Oct 2018 09:33:37 -0700 Subject: [PATCH 499/992] add custom hooks directory to gitlab-shell Add custom_hooks_dir to gitlab-shell yml config file. --- nixos/modules/services/misc/gitlab.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index d81aa5643e53..8ea831afb7c1 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -53,6 +53,7 @@ let repos_path: "${cfg.statePath}/repositories" secret_file: "${cfg.statePath}/config/gitlab_shell_secret" log_file: "${cfg.statePath}/log/gitlab-shell.log" + custom_hooks_dir: "${cfg.statePath}/custom_hooks" redis: bin: ${pkgs.redis}/bin/redis-cli host: 127.0.0.1 @@ -562,6 +563,9 @@ in { mkdir -p ${cfg.statePath}/shell mkdir -p ${cfg.statePath}/db mkdir -p ${cfg.statePath}/uploads + mkdir -p ${cfg.statePath}/custom_hooks/pre-receive.d + mkdir -p ${cfg.statePath}/custom_hooks/post-receive.d + mkdir -p ${cfg.statePath}/custom_hooks/update.d rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks mkdir -p ${cfg.statePath}/config From c429b2b38952ea34808bac610b6f0065dbd03276 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 12 Oct 2018 19:01:51 +0200 Subject: [PATCH 500/992] cloc: 1.78 -> 1.80 --- pkgs/tools/misc/cloc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 0eff3f0c3916..5a69a6ae7ad2 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.78"; + version = "1.80"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = version; - sha256 = "030cnvl83hgynri3jimhhqp238375m1g6liqfiggl0habrnlbck2"; + rev = "v${version}"; + sha256 = "0zmkjpv4dbdr29x95j4i585wz4rxwlrkp6ldfr5wiw83h90n0ilp"; }; setSourceRoot = '' From 5eb7ca4e5d7d4c2931fa14c5575b9fe2befd2647 Mon Sep 17 00:00:00 2001 From: Renaud Date: Fri, 12 Oct 2018 19:04:09 +0200 Subject: [PATCH 501/992] pwsafe: 0.99BETA -> 1.06BETA (#48003) pwsafe: add c0bw3b as maintainer --- pkgs/applications/misc/pwsafe/default.nix | 64 ++++++++--------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 24 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 0ea530b6bf1c..7b0e299924cb 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchFromGitHub, wxGTK, libuuid, xercesc, zip , libXt, libXtst -, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, yubikey-personalization +{ stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl +, wxGTK31, libXi, libXt, libXtst, xercesc, xextproto +, libqrencode, libuuid, libyubikey, yubikey-personalization }: stdenv.mkDerivation rec { - name = "pwsafe-${version}"; - version = "0.99"; + pname = "pwsafe"; + version = "1.06"; + name = "${pname}-${version}"; src = fetchFromGitHub { - owner = "pwsafe"; - repo = "pwsafe"; + owner = "${pname}"; + repo = "${pname}"; rev = "${version}BETA"; - sha256 = "1bkimz4g9v9kfjkqr3dqddh4jps7anzc1hgmirmmhwpac0xdp60g"; + sha256 = "1q3xi7i4r3nmz3hc79lx8l15sr1nqhwbi3lrnfqr356nv6aaf03y"; }; - makefile = "Makefile.linux"; - makeFlags = "YBPERS_LIBPATH=${yubikey-personalization}/lib"; - - buildFlags = "unicoderelease"; - buildInputs = [ wxGTK libuuid gettext perl zip - xercesc libXt libXtst libXi xextproto - pkgconfig libyubikey yubikey-personalization ]; + nativeBuildInputs = [ cmake pkgconfig zip ]; + buildInputs = [ + gettext perl libqrencode libuuid + libXi libXt libXtst wxGTK31 xercesc xextproto + libyubikey yubikey-personalization + ]; + cmakeFlags = [ + "-DNO_GTEST=ON" + "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1" + ]; + enableParallelBuilding = true; postPatch = '' # Fix perl scripts used during the build. @@ -40,31 +46,7 @@ stdenv.mkDerivation rec { done ''; - installPhase = '' - mkdir -p $out/bin \ - $out/share/applications \ - $out/share/pwsafe/xml \ - $out/share/icons/hicolor/48x48/apps \ - $out/share/doc/passwordsafe/help \ - $out/share/man/man1 \ - $out/share/locale - - (cd help && make -f Makefile.linux) - cp help/help*.zip $out/share/doc/passwordsafe/help - - (cd src/ui/wxWidgets/I18N && make mos) - cp -dr src/ui/wxWidgets/I18N/mos/* $out/share/locale/ - # */ - - cp README.txt docs/ReleaseNotes.txt docs/ChangeLog.txt \ - LICENSE install/copyright $out/share/doc/passwordsafe - - cp src/ui/wxWidgets/GCCUnicodeRelease/pwsafe $out/bin/ - cp install/graphics/pwsafe.png $out/share/icons/hicolor/48x48/apps - cp docs/pwsafe.1 $out/share/man/man1 - cp xml/* $out/share/pwsafe/xml - # */ - ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A password database utility"; @@ -77,8 +59,8 @@ stdenv.mkDerivation rec { username/password combinations that you use. ''; - homepage = http://passwordsafe.sourceforge.net/; - maintainers = with maintainers; [ pjones ]; + homepage = https://pwsafe.org/; + maintainers = with maintainers; [ c0bw3b pjones ]; platforms = platforms.linux; license = licenses.artistic2; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b373b03dceaa..7cd28d95b165 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4327,9 +4327,7 @@ with pkgs; pulsemixer = callPackage ../tools/audio/pulsemixer { }; - pwsafe = callPackage ../applications/misc/pwsafe { - wxGTK = wxGTK30; - }; + pwsafe = callPackage ../applications/misc/pwsafe { }; niff = callPackage ../tools/package-management/niff { }; From 5c14decaa36ae559541cfb34d1477b8b1e76c81a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 12 Oct 2018 19:04:19 +0200 Subject: [PATCH 502/992] nix-index: fix darwin build --- pkgs/tools/package-management/nix-index/default.nix | 13 +++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 0b336d47fe4c..d0a81140fc83 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -1,8 +1,8 @@ -{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl }: +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl +, Security +}: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "nix-index-${version}"; version = "0.1.2"; @@ -14,7 +14,8 @@ buildRustPackage rec { }; cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl curl]; + buildInputs = [ openssl curl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; postInstall = '' mkdir -p $out/etc/profile.d @@ -23,7 +24,7 @@ buildRustPackage rec { --replace "@out@" "$out" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A files database for nixpkgs"; homepage = https://github.com/bennofs/nix-index; license = with licenses; [ bsd3 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b373b03dceaa..83949c4d865b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21971,7 +21971,9 @@ with pkgs; nix-info = callPackage ../tools/nix/info { }; nix-info-tested = nix-info.override { doCheck = true; }; - nix-index = callPackage ../tools/package-management/nix-index { }; + nix-index = callPackage ../tools/package-management/nix-index { + inherit (darwin.apple_sdk.frameworks) Security; + }; nix-pin = callPackage ../tools/package-management/nix-pin { }; From 964214b10700fab42bbeac6092d20bb7ad8d4e35 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 4 Oct 2018 01:17:18 +0000 Subject: [PATCH 503/992] cpplint: init at 1.3.0 Static analyzer for C++ code. Licensed under a very permissive, generic Google license (BSD3 wording). --- .../tools/analysis/cpplint/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/analysis/cpplint/default.nix diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix new file mode 100644 index 000000000000..10ed99e3ffe6 --- /dev/null +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -0,0 +1,29 @@ +{ lib, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + pname = "cpplint"; + version = "1.3.0"; + + # Fetch from github instead of pypi, since the test cases are not in the pypi archive + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "107v7bp35kxbv9v7wl79h7115z1m4b48rhasp0cnivql1grd277i"; + }; + + postPatch = '' + patchShebangs cpplint_unittest.py + ''; + + checkPhase = '' + ./cpplint_unittest.py + ''; + + meta = with lib; { + homepage = https://github.com/cpplint/cpplint; + description = "Static code checker for C++"; + maintainers = [ maintainers.bhipple ]; + license = [ licenses.bsd3 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d911181ae372..3126fe4fd1ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8264,6 +8264,8 @@ with pkgs; cppcheck = callPackage ../development/tools/analysis/cppcheck { }; + cpplint = callPackage ../development/tools/analysis/cpplint { }; + cquery = callPackage ../development/tools/misc/cquery { llvmPackages = llvmPackages_6; }; From ad992cbde10879455a5359ceb17937fc57cf2fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 13 Oct 2018 04:28:30 +0900 Subject: [PATCH 504/992] nheko: mark as insecure (#48281) The package is no longer maintained and includes potential security vulnerabilities (a use-after-free and several crashes) that are known and not fixed in the version present in nixpkgs. They don't look too bad judging from the trigger vectors mentioned in the changelog, but with the project going unmaintained one of them becoming a security vulnerability would likely not be noticed. --- .../applications/networking/instant-messengers/nheko/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 0d34a0a43628..6e78a9034aec 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ekleog fpletz ]; platforms = platforms.unix; license = licenses.gpl3Plus; + knownVulnerabilities = [ "No longer maintained" ]; }; } From f969e6e4744f998454dafad2c69f2ccfbbb16da3 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 12 Oct 2018 19:29:34 +0000 Subject: [PATCH 505/992] go: do not wrap with `go get` tools See: https://github.com/NixOS/nixpkgs/issues/46603 These tools are not required for `buildGoPackage`, while significantly affecting closure size and build time. This essentially reverts 458895db332d394bfadc05404a020ea0b4b1ee7f. --- pkgs/development/compilers/go/1.10.nix | 10 ++-------- pkgs/development/compilers/go/1.11.nix | 10 ++-------- pkgs/development/compilers/go/1.9.nix | 10 ++-------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index fa4b4abafdee..163577935839 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -1,8 +1,5 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps -, pcre, cacert, llvm -, Security, Foundation -, makeWrapper, git, subversion, mercurial, bazaar }: +, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }: let @@ -37,7 +34,7 @@ stdenv.mkDerivation rec { GOCACHE = "off"; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; + nativeBuildInputs = [ perl which pkgconfig patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; @@ -165,9 +162,6 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . $GOROOT ( cd $GOROOT/src && ./all.bash ) - - # (https://github.com/golang/go/wiki/GoGetTools) - wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" ''; preFixup = '' diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 56d363f1015f..f58e0801030e 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -1,8 +1,5 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps -, pcre, cacert, llvm -, Security, Foundation -, makeWrapper, git, subversion, mercurial, bazaar }: +, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }: let @@ -37,7 +34,7 @@ stdenv.mkDerivation rec { GOCACHE = "off"; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; + nativeBuildInputs = [ perl which pkgconfig patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; @@ -171,9 +168,6 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . $GOROOT ( cd $GOROOT/src && ./all.bash ) - - # (https://github.com/golang/go/wiki/GoGetTools) - wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" ''; preFixup = '' diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 48f16c3ffa5a..d6ae163813f3 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -1,8 +1,5 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps -, pcre, cacert, llvm -, Security, Foundation -, makeWrapper, git, subversion, mercurial, bazaar }: +, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }: let @@ -35,7 +32,7 @@ stdenv.mkDerivation rec { }; # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; + nativeBuildInputs = [ perl which pkgconfig patch procps ]; buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; @@ -165,9 +162,6 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . $GOROOT ( cd $GOROOT/src && ./all.bash ) - - # (https://github.com/golang/go/wiki/GoGetTools) - wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" ''; preFixup = '' From f830ab11968e8075229f4929282070caf1d8e656 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 12 Oct 2018 16:00:56 +0200 Subject: [PATCH 506/992] airspy: fix license --- pkgs/applications/misc/airspy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/airspy/default.nix b/pkgs/applications/misc/airspy/default.nix index 9b6771a3925b..2042f1047b22 100644 --- a/pkgs/applications/misc/airspy/default.nix +++ b/pkgs/applications/misc/airspy/default.nix @@ -28,7 +28,7 @@ in meta = with stdenv.lib; { homepage = https://github.com/airspy/airspyone_host; description = "Host tools and driver library for the AirSpy SDR"; - license = licenses.free; + license = licenses.bsd3; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ markuskowa ]; }; From 9580d80abe414ba3f89b02ef0cb5b80d6a57a66d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 12 Oct 2018 21:40:32 +0200 Subject: [PATCH 507/992] grantlee: add licenses --- pkgs/development/libraries/grantlee/5/default.nix | 1 + pkgs/development/libraries/grantlee/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index aa670cd4c86b..52c087b19147 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -46,6 +46,7 @@ mkDerivation rec { homepage = http://gitorious.org/grantlee; maintainers = [ maintainers.ttuegel ]; + license = licenses.lgpl21; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 9dde67b5c795..1446e339745e 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { and the design of Django is reused in Grantlee.''; homepage = http://gitorious.org/grantlee; - maintainers = [ ]; + license = stdenv.lib.licenses.lgpl21; inherit (qt4.meta) platforms; }; } From 867ddb29eafd56a71739a3eb0cf3d4906dba1e15 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 12 Oct 2018 21:42:14 +0200 Subject: [PATCH 508/992] qt-gstreamer: add license --- .../development/libraries/gstreamer/qt-gstreamer/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index a9e7f9fcff3e..a099643061a1 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.lgpl21; }; } From 2e335ac4bb64800db4ac74d3f36084ed6f3ebb3a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 12 Oct 2018 21:44:03 +0200 Subject: [PATCH 509/992] gtk-sharp-bean: add license, fix description --- pkgs/development/libraries/gtk-sharp-beans/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index b92bbf64514e..7f35f088da2b 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - description = "gtk-sharp-beans binds some API from Gtk+ that isn't in Gtk# 2.12.x"; + description = "Binds some API from Gtk+ that isn't in Gtk# 2.12.x"; platforms = platforms.linux; + license = licenses.lgpl21; }; } From e7549b96ad013da56e990440bb58986683d80d7c Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 14:51:46 -0400 Subject: [PATCH 510/992] nixpkgs docs: finish up mapAttrsRecursive --- doc/functions/library/attrsets.xml | 82 ++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index 6f23e267bab2..5d8182cc6097 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -966,5 +966,87 @@ lib.attrsets.mapAttrsToList (name: value: "${name}=${value}") itself to attribute sets. Also, the first argument of the argument function is a list of the names of the containing attributes. + + + + + f + + + + [ String ] -> Any -> Any + + + Given a list of attribute names and value, return a new value. + + + + + name_path + + + + The list of attribute names to this value. + + + For example, the name_path for the + example string in the attribute set { foo + = { bar = "example"; }; } is [ "foo" "bar" + ]. + + + + + + value + + + + The attribute's value. + + + + + + + + + set + + + + The attribute set to recursively map over. + + + + + + + A contrived example of using <function>lib.attrsets.mapAttrsRecursive</function> + { + n = { + a = "n-a-A"; + m = { + b = "n-m-b-B"; + c = "n-m-c-C"; + }; + }; + d = "d-D"; + } + ]]> + From d664b8f5e3aeff8d6cf826d103bca342a7cf81c2 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 15:22:41 -0400 Subject: [PATCH 511/992] nixpkgs docs: document mapAttrsRecursiveCond --- doc/functions/library/attrsets.xml | 123 +++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index 5d8182cc6097..7a8ce95fd030 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1049,4 +1049,127 @@ mapAttrsRecursive ]]> + +
+ <function>lib.attrsets.mapAttrsRecursiveCond</function> + + mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([ String ] -> Any -> Any) -> AttrSet -> AttrSet + + + + + + Like mapAttrsRecursive, but it takes an additional + predicate function that tells it whether to recursive into an attribute set. + If it returns false, mapAttrsRecursiveCond does not + recurse, but does apply the map function. It is returns true, it does + recurse, and does not apply the map function. + + + + + + cond + + + + (AttrSet -> Bool) + + + Determine if mapAttrsRecursive should recurse deeper + in to the attribute set. + + + + + attributeset + + + + An attribute set. + + + + + + + + + f + + + + [ String ] -> Any -> Any + + + Given a list of attribute names and value, return a new value. + + + + + name_path + + + + The list of attribute names to this value. + + + For example, the name_path for the + example string in the attribute set { foo + = { bar = "example"; }; } is [ "foo" "bar" + ]. + + + + + + value + + + + The attribute's value. + + + + + + + + + set + + + + The attribute set to recursively map over. + + + + + + + Only convert attribute values to JSON if the containing attribute set is marked for recursion + { + dorecur = { + hello = "\"there\""; + recurse = "true"; + }; + dontrecur = "{\"converted-to\":\"json\"}"; + } + ]]> + +
+ From ef05e1057b91647b7c2662437fd658e8b0286e80 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 15:29:09 -0400 Subject: [PATCH 512/992] nixpkgs docs: document genAttrs --- doc/functions/library/attrsets.xml | 59 ++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index 7a8ce95fd030..78d05589aa8f 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1172,4 +1172,63 @@ lib.attrsets.mapAttrsRecursiveCond +
+ <function>lib.attrsets.genAttrs</function> + + genAttrs :: [ String ] -> (String -> Any) -> AttrSet + + + + + + Generate an attribute set by mapping a function over a list of attribute + names. + + + + + + names + + + + Names of values in the resulting attribute set. + + + + + + f + + + + String -> Any + + + Takes the name of the attribute and return the attribute's value. + + + + + name + + + + The name of the attribute to generate a value for. + + + + + + + + + + Generate an attrset based on names only + { foo = "x_foo"; bar = "x_bar"; } + ]]> + +
From f85a4ba9c30434f9e0a2e2a57489543304d29f42 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 15:29:52 -0400 Subject: [PATCH 513/992] nixpkgs docs: document isDerivation --- doc/functions/library/attrsets.xml | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index 78d05589aa8f..f671c5f4e4be 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1231,4 +1231,47 @@ lib.attrsets.genAttrs [ "foo" "bar" ] (name: "x_${name}") ]]> + +
+ <function>lib.attrsets.isDerivation</function> + + isDerivation :: Any -> Bool + + + + + + Check whether the argument is a derivation. Any set with { type = + "derivation"; } counts as a derivation. + + + + + + value + + + + The value which is possibly a derivation. + + + + + + + A package is a derivation + {}).ruby +=> true + ]]> + + + + Anything else is not a derivation + false + ]]> + +
From c547c3fe8262270ab8ddf129ec2bb8ebd4a38766 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 15:34:57 -0400 Subject: [PATCH 514/992] nixpkgs docs: document toDerivation --- doc/functions/library/attrsets.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index f671c5f4e4be..222b4a882917 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1274,4 +1274,30 @@ lib.attrsets.isDerivation "foobar" ]]> + +
+ <function>lib.attrsets.toDerivation</function> + + toDerivation :: Path -> Derivation + + + + + + Converts a store path to a fake derivation. + + + + + + path + + + + A store path to convert to a derivation. + + + + +
From e0c6981d19d39d41258ab626a6b9871ff0014af2 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 15:42:39 -0400 Subject: [PATCH 515/992] nixpkgs docs: document optionalAttrs --- doc/functions/library/attrsets.xml | 53 ++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index 222b4a882917..8206142d7df2 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1300,4 +1300,57 @@ lib.attrsets.isDerivation "foobar" + +
+ <function>lib.attrsets.optionalAttrs</function> + + optionalAttrs :: Bool -> AttrSet + + + + + + Conditionally return an attribute set or an empty attribute set. + + + + + + cond + + + + Condition under which the as attribute set is + returned. + + + + + + as + + + + The attribute set to return if cond is true. + + + + + + + Return the provided attribute set when <varname>cond</varname> is true + { my = "set"; } + ]]> + + + + Return an empty attribute set when <varname>cond</varname> is false + { } + ]]> + +
From 3b3bde463ba7092dffdb78f20bffff4520e1df76 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 16:02:26 -0400 Subject: [PATCH 516/992] nixpkgs docs: document zipAttrsWithNames --- doc/functions/library/attrsets.xml | 88 ++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index 8206142d7df2..b49ccaf739ac 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1353,4 +1353,92 @@ lib.attrsets.optionalAttrs false { my = "set"; } ]]> + +
+ <function>lib.attrsets.zipAttrsWithNames</function> + + zipAttrsWithNames :: [ String ] -> (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet + + + + + + Merge sets of attributes and use the function f to merge + attribute values. + + + + + + names + + + + A list of attribute names to zip. + + + + + + f + + + + (String -> [ Any ] -> Any + + + Accepts an attribute name, all the values, and returns a combined value. + + + + + name + + + + The name of the attribute each value came from. + + + + + + vs + + + + A list of values collected from the list of attribute sets. + + + + + + + + + sets + + + + A list of attribute sets to zip together. + + + + + + + Summing a list of attribute sets of numbers + { a = "a 11"; b = "b 101"; } + ]]> + +
From d856710c1fd632d27f5100c696da34e0c860f3f9 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 12 Oct 2018 22:31:43 +0200 Subject: [PATCH 517/992] reattach-to-user-namespace: 2.6 -> 2.7 (#48283) Adds macOS Mojave (10.14) support. --- .../darwin/reattach-to-user-namespace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index b14008e11f10..631c59523e2a 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "reattach-to-user-namespace-${version}"; - version = "2.6"; + version = "2.7"; src = fetchurl { - url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/archive/v2.6.tar.gz"; - sha256 = "1d8ynzkdlxyyky9f88f7z50g9lwdydkpb2n7gkw3jgl2ac569xc0"; + url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/archive/v${version}.tar.gz"; + sha256 = "00mjyj8yicrpnlm46rlbkvxgl5381l8xawh7rmjk10p3zrm56jbv"; }; buildFlags = "ARCHES=x86_64"; From 8d6f4e5ca3167baa4993b7a83aa115b9510c79f3 Mon Sep 17 00:00:00 2001 From: Renaud Date: Fri, 12 Oct 2018 22:33:43 +0200 Subject: [PATCH 518/992] allegro: fix v4.4.2 src URL (#48287) Gna.org forge has disappeared --- pkgs/development/libraries/allegro/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 21d9ce23d319..f53aa873b482 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version="4.4.2"; src = fetchurl { - url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz"; + url = "https://github.com/liballeg/allegro5/releases/download/${version}/${name}.tar.gz"; sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; }; From 1ae8d8b793406434b8bf1e348931bb1a41973515 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 12 Oct 2018 18:58:38 +0000 Subject: [PATCH 519/992] libcacard: init at 2.6.1 --- .../libraries/libcacard/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libcacard/default.nix diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix new file mode 100644 index 000000000000..f116360474e4 --- /dev/null +++ b/pkgs/development/libraries/libcacard/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, glib, nss }: + +stdenv.mkDerivation rec { + name = "libcacard-${version}"; + version = "2.6.1"; + + src = fetchurl { + url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz"; + sha256 = "1w6y0kiakhg7dgyf8yqpm4jj6jiv17zhy9lp3d7z32q1pniccxk2"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib nss ]; + + meta = with stdenv.lib; { + description = "Smart card emulation library"; + homepage = https://gitlab.freedesktop.org/spice/libcacard; + license = licenses.lgpl21; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cc5fb80c254..a543fa9e6ee9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10279,6 +10279,8 @@ with pkgs; inherit (xorg) libX11 libXext; }; + libcacard = callPackage ../development/libraries/libcacard { }; + libcanberra = callPackage ../development/libraries/libcanberra { inherit (darwin.apple_sdk.frameworks) CoreServices; }; From 475da25b40e91d1030d96559b596e42125e4c617 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 12 Oct 2018 18:58:49 +0000 Subject: [PATCH 520/992] qemu: enable smartcard support --- pkgs/applications/virtualization/qemu/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 596bc9dd9e09..d9495bd984ef 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -10,6 +10,7 @@ , sdlSupport ? !stdenv.isDarwin, SDL2 , gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, gnome3 , vncSupport ? true, libjpeg, libpng +, smartcardSupport ? true, libcacard , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen @@ -58,6 +59,7 @@ stdenv.mkDerivation rec { ++ optionals sdlSupport [ SDL2 ] ++ optionals gtkSupport [ gtk3 gettext gnome3.vte ] ++ optionals vncSupport [ libjpeg libpng ] + ++ optionals smartcardSupport [ libcacard ] ++ optionals spiceSupport [ spice-protocol spice ] ++ optionals usbredirSupport [ usbredir ] ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] @@ -108,6 +110,7 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin "--cpu=x86_64" ++ optional numaSupport "--enable-numa" ++ optional seccompSupport "--enable-seccomp" + ++ optional smartcardSupport "--enable-smartcard" ++ optional spiceSupport "--enable-spice" ++ optional usbredirSupport "--enable-usb-redir" ++ optional hostCpuOnly "--target-list=${hostCpuTargets}" From 02602b2c15eaccf80490168591cf289ac81cc9d5 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 12 Oct 2018 18:59:01 +0000 Subject: [PATCH 521/992] spice: enable smartcard support --- pkgs/development/libraries/spice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index ba3791a8a8bd..e9b12d169849 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama , libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl -, lz4 }: +, libcacard, lz4 }: with stdenv.lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pixman celt alsaLib openssl libjpeg zlib libXrandr libXfixes libXrender libXext libXinerama - python pyparsing glib cyrus_sasl lz4 ]; + python pyparsing glib cyrus_sasl libcacard lz4 ]; nativeBuildInputs = [ pkgconfig spice-protocol ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sasl" - "--disable-smartcard" + "--enable-smartcard" "--enable-client" "--enable-lz4" ]; From 541e5b890004a17e3c868cc2b202934d229407d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 13:43:15 -0700 Subject: [PATCH 522/992] xpra: 2.3.3 -> 2.3.4 (#47705) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xpra/versions --- pkgs/tools/X11/xpra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 915144daa908..3e4d49108b71 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -14,11 +14,11 @@ let xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { pname = "xpra"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"; + sha256 = "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija"; }; nativeBuildInputs = [ pkgconfig ]; From 21ed2b9d32c00b585dccecd1b4c4460a652449ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 13:45:14 -0700 Subject: [PATCH 523/992] mercurialFull: 4.7.1 -> 4.7.2 (#47759) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mercurial-full/versions --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 41809e83b457..5464f605cbdb 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.7.1"; + version = "4.7.2"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "03217dk8jh2ckrqqhqyahw44f5j2aq3kv03ba5v2b11i3hy3h0w5"; + sha256 = "1yq9r8s9jzj8hk2yizjk25s4w16yx9b8mbdj6wp8ld7j2r15kw4p"; }; inherit python; # pass it so that the same version can be used in hg2git From ba3dbfd635cbc7ba5d619d50ce8968ec5c5997f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 13:47:02 -0700 Subject: [PATCH 524/992] mcelog: 160 -> 161 (#47768) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mcelog/versions --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 642653259c34..c0e8e1292330 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "160"; + version = "161"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1m985wvdykl3003967lp1i7707qhwdj3h13cl8g1afjaip9ccd48"; + sha256 = "1bqz53xgvwab3r487ihri3nvk7nsgjykdv8m993983vxsi2bgjmz"; }; postPatch = '' From 0e85226ee890881595ddb4d2403698a8d7a0f9b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 13:49:20 -0700 Subject: [PATCH 525/992] libcouchbase: 2.9.4 -> 2.9.5 (#47772) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libcouchbase/versions --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 4da0738fde5e..e3d5c7d6424e 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "0d6lmnr5yfpkzr1yr6f2ilxprl6v9r4r7917k4iz0wc3jlcndwl3"; + sha256 = "18l3579b47l8d6nhv0xls8pybkqdmdkw8jg4inalnx3g7ydqfn00"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; From c43e752dcb9a45b9c661cfb2549fbb755c272f57 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 13:50:47 -0700 Subject: [PATCH 526/992] duo-unix: 1.10.4 -> 1.10.5 (#47819) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/duo-unix/versions --- pkgs/tools/security/duo-unix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 3ef07c44f501..a76e88772bcf 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "duo-unix-${version}"; - version = "1.10.4"; + version = "1.10.5"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "1pbl6ii7sh66i277s5mqpnv092jd2q52qis3ar4lwy4mywfvrhjp"; + sha256 = "1h88gwvbh8vwwga7d65iwa9qrmyx23wh5m0rmlv8qbx4fyj7q1f9"; }; buildInputs = [ pam openssl zlib ]; From 437f58adcb5840e04ecb5a317b93a4763688860f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 13:51:36 -0700 Subject: [PATCH 527/992] qmmp: 1.2.3 -> 1.2.4 (#47730) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qmmp/versions --- pkgs/applications/audio/qmmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index f58e75c9e263..31b8bce90f49 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.2.3"; + name = "qmmp-1.2.4"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "05lqmj22vr5ch1i0928d64ybdnn3qc66s9lgarx5s6x6ffr6589j"; + sha256 = "0rmfd6h0186b6n4g079d8kshdmp3k5n8w06a1l41m4p3fgq08j92"; }; buildInputs = From e6b0646b3b5decaaf9a6b7fe5f59cb98f865d25f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 13:53:01 -0700 Subject: [PATCH 528/992] vulkan-headers: 1.1.82.0 -> 1.1.85 (#47702) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vulkan-headers/versions --- pkgs/development/libraries/vulkan-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 2a07eba261b7..dd3f14f91928 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "vulkan-headers-${version}"; - version = "1.1.82.0"; + version = "1.1.85"; buildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "1pp0kmgd89g8rz6qqfqmdmv209s0d6hbsshrzrlwrdm6dc25f20p"; + sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb"; }; meta = with stdenv.lib; { From 4edb31882c9830d947202542a13bdb0ede17e782 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 16:23:49 -0400 Subject: [PATCH 529/992] nixpkgs docs: Clarify zipAttrsWithNames's docs --- doc/functions/library/attrsets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index b49ccaf739ac..fe44dfe4f8e6 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1364,7 +1364,7 @@ lib.attrsets.optionalAttrs false { my = "set"; } Merge sets of attributes and use the function f to merge - attribute values. + attribute values where the attribute name is in names. From 655a5fa8bf47e104a50a2e627e1cf234fff1402e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 16:26:56 -0400 Subject: [PATCH 530/992] nixpkgs docs: document zipAttrsWith --- doc/functions/library/attrsets.xml | 79 ++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index fe44dfe4f8e6..da73e02e0561 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1441,4 +1441,83 @@ lib.attrsets.zipAttrsWithNames ]]> + +
+ <function>lib.attrsets.zipAttrsWith</function> + + zipAttrsWith :: (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet + + + + + + Merge sets of attributes and use the function f to merge + attribute values. Similar to where + all key names are passed for names. + + + + + + f + + + + (String -> [ Any ] -> Any + + + Accepts an attribute name, all the values, and returns a combined value. + + + + + name + + + + The name of the attribute each value came from. + + + + + + vs + + + + A list of values collected from the list of attribute sets. + + + + + + + + + sets + + + + A list of attribute sets to zip together. + + + + + + + Summing a list of attribute sets of numbers + { a = "a 11"; b = "b 101"; c = "c 1001"; } + ]]> + +
From 77140a9075ea651c060fcb91a7a5da832e3a1e68 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 16:31:23 -0400 Subject: [PATCH 531/992] nixpkgs docs: document zipAttrs --- doc/functions/library/attrsets.xml | 45 +++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index da73e02e0561..a719b7958458 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1452,7 +1452,8 @@ lib.attrsets.zipAttrsWithNames Merge sets of attributes and use the function f to merge - attribute values. Similar to where all key names are passed for names. @@ -1520,4 +1521,46 @@ lib.attrsets.zipAttrsWith ]]> + +
+ <function>lib.attrsets.zipAttrs</function> + + zipAttrsWith :: [ AttrSet ] -> AttrSet + + + + + + Merge sets of attributes and combine each attribute value in to a list. + Similar to + where the merge function returns a list of all values. + + + + + + sets + + + + A list of attribute sets to zip together. + + + + + + + Combining a list of attribute sets + { a = [ 1 10 ]; b = [ 1 100 ]; c = [ 1 1000 ]; } + ]]> + +
From c100a456b1da162ea010e5880cded268aa68cec6 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 16:51:05 -0400 Subject: [PATCH 532/992] nixpkgs docs: document recursivelyUpdateUntil --- doc/functions/library/attrsets.xml | 108 +++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index a719b7958458..a6fa2ea0e295 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1563,4 +1563,112 @@ lib.attrsets.zipAttrs ]]> + +
+ <function>lib.attrsets.recursiveUpdateUntil</function> + + recursiveUpdateUntil :: ( [ String ] -> AttrSet -> AttrSet -> Bool ) -> AttrSet -> AttrSet -> AttrSet + + + + + + Does the same as the update operator // except that + attributes are merged until the given predicate is verified. The predicate + should accept 3 arguments which are the path to reach the attribute, a part + of the first attribute set and a part of the second attribute set. When the + predicate is verified, the value of the first attribute set is replaced by + the value of the second attribute set. + + + + + + pred + + + + [ String ] -> AttrSet -> AttrSet -> Bool + + + + + path + + + + The path to the values in the left and right hand sides. + + + + + + l + + + + The left hand side value. + + + + + + r + + + + The right hand side value. + + + + + + + + + lhs + + + + The left hand attribute set of the merge. + + + + + + rhs + + + + The right hand attribute set of the merge. + + + + + + + Recursively merging two attribute sets + { + foo.bar = 1; # 'foo.*' from the second set + foo.quz = 2; # + bar = 3; # 'bar' from the first set + baz = 4; # 'baz' from the second set +} + ]]> + +
From 0eb3b93e1ae4ee6cea97768a1f24f90a88635753 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 12 Oct 2018 16:53:50 -0400 Subject: [PATCH 533/992] nixpkgs docs: document recursivelyUpdate --- doc/functions/library/attrsets.xml | 57 ++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index a6fa2ea0e295..65d0b40e2e82 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1671,4 +1671,61 @@ lib.attrsets.recursiveUpdateUntil (path: l: r: path == ["foo"]) ]]> + +
+ <function>lib.attrsets.recursiveUpdate</function> + + recursiveUpdate :: AttrSet -> AttrSet -> AttrSet + + + + + + A recursive variant of the update operator //. The + recursion stops when one of the attribute values is not an attribute set, in + which case the right hand side value takes precedence over the left hand + side value. + + + + + + lhs + + + + The left hand attribute set of the merge. + + + + + + rhs + + + + The right hand attribute set of the merge. + + + + + + + Recursively merging two attribute sets + { + boot.loader.grub.enable = true; + boot.loader.grub.device = ""; +} +]]> + +
From adeb9fade6a9639039efbce80c8ece7119fd3fa3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 13:55:20 -0700 Subject: [PATCH 534/992] libmesode: 0.9.1 -> 0.9.2 (#47767) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libmesode/versions --- pkgs/development/libraries/libmesode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 1becd0ee8ef6..e46eb9208de6 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libmesode-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "boothj5"; repo = "libmesode"; rev = version; - sha256 = "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh"; + sha256 = "06f5nfaypvxrbsinxa1k2vrxrs7kqmg38g4wwwk5d63hpn1pj8ak"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 979ebcd81fd45dbd4eef2724f354378b98c7198f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 13:56:49 -0700 Subject: [PATCH 535/992] libblockdev: 2.19 -> 2.20 (#47770) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libblockdev/versions --- pkgs/development/libraries/libblockdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 585f6f18bbab..b99a3c7059aa 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.19"; + version = "2.20"; in stdenv.mkDerivation rec { name = "libblockdev-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "1ny31vaarzbpw0h863p2r5cvjsfs77d33nnisf8bhjc6ps6js3ys"; + sha256 = "13xy8vx2dnnxczpnwapchc5ncigcxb2fhpmrmglbpkjqmhn2zbdj"; }; outputs = [ "out" "dev" "devdoc" ]; From 9665e64848b50ec37fcfa751c8527ce3d8b3c66e Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 12 Oct 2018 23:01:26 +0200 Subject: [PATCH 536/992] linuxPackages.evdi: mark broken on aarch64 never built in available Hydra history --- pkgs/os-specific/linux/evdi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 79a943895740..3c7e2f98b890 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; homepage = http://www.displaylink.com/; - broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "4.15"; + broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "4.15" || stdenv.isAarch64; }; } From 89e38721a47a724957ae76030d201ccbad139326 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 14:04:26 -0700 Subject: [PATCH 537/992] xdgmenumaker: 1.4 -> 1.5 (#47708) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xdgmenumaker/versions --- pkgs/applications/misc/xdgmenumaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 01782d18b12b..ed7f2b27c381 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xdgmenumaker-${version}"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "gapan"; repo = "xdgmenumaker"; rev = version; - sha256 = "0i909dk9chdsc7njp5llgm5xlag4lr0nkxkwl1g5lf8cvdjrawh2"; + sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif"; }; nativeBuildInputs = [ From 759703419a6b6214ef0e5e8fcc7b74a1f7369561 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 14:05:16 -0700 Subject: [PATCH 538/992] vim: 8.1.0348 -> 8.1.0450 (#47725) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/vim/versions --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 87a525b33021..dcec9fdfef95 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.0348"; + version = "8.1.0450"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0f18kpywnph708mvj1fpi06qb53nbhc26ngjh2kvfxwawn63k8ab"; + sha256 = "1zhggpn4i704apfqn2kqr717kz9dvkjwnbmc3ydza621zjyrnxb2"; }; enableParallelBuilding = true; From fa3b0afe077f551e5b1dc0a9edd99897cb9b3f6f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 14:09:51 -0700 Subject: [PATCH 539/992] pjsip: 2.7.2 -> 2.8 (#47735) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pjsip/versions --- pkgs/applications/networking/pjsip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index f7f989dc3a9d..3930ea4ff11f 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pjsip-${version}"; - version = "2.7.2"; + version = "2.8"; src = fetchurl { url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "0wiph6g51wanzwjjrpwsz63amgvly8g08jz033gnwqmppa584b4w"; + sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah"; }; buildInputs = [ openssl libsamplerate alsaLib ]; From ef93155f60284e7cd694ded81bd15f07997575bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Oct 2018 14:11:18 -0700 Subject: [PATCH 540/992] libuv: 1.23.0 -> 1.23.1 (#47763) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libuv/versions --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 73d2db8e9993..e608ea300d1a 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: stdenv.mkDerivation rec { - version = "1.23.0"; + version = "1.23.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1yfx99f7qnq3qvcgbnih27dgwfg6c51xw6n6n2c3c1wb3mh95im0"; + sha256 = "14h8dcyx81sbckbgmqhagncyz8s6z6qzpx0fy8p79whq5hb3f4jg"; }; patches = [ From aed19d59ae0b5afac92c924fe561216244ba85cb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 12 Oct 2018 22:36:57 +0200 Subject: [PATCH 541/992] gtk-sharp: add meta data --- pkgs/development/libraries/gtk-sharp/2.0.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 5b3ca828a3f8..c037db97c044 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -46,7 +46,10 @@ stdenv.mkDerivation { gtk = gtk2; }; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Graphical User Interface Toolkit for mono and .Net"; + homepage = https://www.mono-project.com/docs/gui/gtksharp; + platforms = platforms.linux; + license = licenses.gpl2; }; } From e3b313bb59f49f10970205aafd44878d35da07e7 Mon Sep 17 00:00:00 2001 From: Brendan Hall Date: Thu, 11 Oct 2018 02:32:08 +0100 Subject: [PATCH 542/992] now-cli: init at 11.4.6 --- pkgs/development/web/now-cli/default.nix | 87 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 89 insertions(+) create mode 100644 pkgs/development/web/now-cli/default.nix diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix new file mode 100644 index 000000000000..911e03daa371 --- /dev/null +++ b/pkgs/development/web/now-cli/default.nix @@ -0,0 +1,87 @@ +{ stdenv, lib, fetchurl }: +stdenv.mkDerivation rec { + name = "now-cli-${version}"; + version = "11.4.6"; + + # TODO: switch to building from source, if possible + src = fetchurl { + url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; + sha256 = "1bl0yrzxdfy6sks674qlfch8mg3b0x1wj488v83glags8ibsg3cl"; + }; + + sourceRoot = "."; + unpackCmd = '' + gunzip -c $curSrc > now-linux + ''; + + buildPhase = ":"; + + installPhase = '' + mkdir $out + mkdir $out/bin + cp now-linux $out/bin/now + ''; + + # now is a node program packaged using zeit/pkg. + # thus, it contains hardcoded offsets. + # patchelf shifts these locations when it expands headers. + + # this could probably be generalised into allowing any program packaged + # with zeit/pkg to be run on nixos. + + preFixup = let + libPath = lib.makeLibraryPath [stdenv.cc.cc]; + in '' + + orig_size=$(stat --printf=%s $out/bin/now) + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/now + patchelf --set-rpath ${libPath} $out/bin/now + chmod +x $out/bin/now + + new_size=$(stat --printf=%s $out/bin/now) + + ###### zeit-pkg fixing starts here. + # we're replacing plaintext js code that looks like + # PAYLOAD_POSITION = '1234 ' | 0 + # [...] + # PRELUDE_POSITION = '1234 ' | 0 + # ^-----20-chars-----^^------22-chars------^ + # ^-- grep points here + # + # var_* are as described above + # shift_by seems to be safe so long as all patchelf adjustments occur + # before any locations pointed to by hardcoded offsets + + var_skip=20 + var_select=22 + shift_by=$(expr $new_size - $orig_size) + + function fix_offset { + # $1 = name of variable to adjust + location=$(grep -obUam1 "$1" $out/bin/now | cut -d: -f1) + location=$(expr $location + $var_skip) + + value=$(dd if=$out/bin/now iflag=count_bytes,skip_bytes skip=$location \ + bs=1 count=$var_select status=none) + value=$(expr $shift_by + $value) + + echo -n $value | dd of=$out/bin/now bs=1 seek=$location conv=notrunc + } + + fix_offset PAYLOAD_POSITION + fix_offset PRELUDE_POSITION + + ''; + dontStrip = true; + + + + meta = with stdenv.lib; { + homepage = https://zeit.co/now; + description = "The Command Line Interface for Now - Global Serverless Deployments"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.bhall ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 866adafff53f..7a47916d5900 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3759,6 +3759,8 @@ with pkgs; npm2nix = nodePackages.npm2nix; + now-cli = callPackage ../development/web/now-cli {}; + file-rename = callPackage ../tools/filesystems/file-rename { }; kea = callPackage ../tools/networking/kea { From 2216467f32a30e1f8d1e9c131bef2a8a4cf98208 Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Fri, 12 Oct 2018 23:45:07 +0200 Subject: [PATCH 543/992] fcppt: 2.5.0 -> 2.9.0 (#48257) --- pkgs/development/libraries/fcppt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index 660cdfa6414b..49e929821f7f 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, boost }: +{ stdenv, fetchFromGitHub, cmake, boost, brigand }: stdenv.mkDerivation rec { name = "fcppt-${version}"; - version = "2.5.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "freundlich"; repo = "fcppt"; rev = version; - sha256 = "0pjldwwxgnzjfd04cy29a9mn2szq4v2mjnw0367kxd141q2iglqi"; + sha256 = "0zyqgmi1shjbwin1lx428v7vbi6jnywb1d47dascdn89r5gz6klv"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; - cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ]; + cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" "-DBrigand_INCLUDE_DIR=${brigand}/include" ]; enableParallelBuilding = true; From 340c76263d88bf47119c638164093c63d5292f8b Mon Sep 17 00:00:00 2001 From: Thilo Uttendorfer Date: Sat, 13 Oct 2018 00:03:44 +0200 Subject: [PATCH 544/992] openxcom: 1.0.0.2018.01.28 -> 1.0.0.2018.10.08 (#48290) --- pkgs/games/openxcom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 9a82c678f370..211172cee203 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: -let version = "1.0.0.2018.01.28"; in +let version = "1.0.0.2018.10.08"; in stdenv.mkDerivation { name = "openxcom-${version}"; src = fetchFromGitHub { owner = "SupSuper"; repo = "OpenXcom"; - rev = "b148916268a6ce104c3b6b7eb4d9e0487cba5487"; - sha256 = "1128ip3g4aw59f3f23mvlyhl8xckhwjjw9rd7wn7xv51hxdh191c"; + rev = "13049d617fe762b91893faaf7c14ddefa49e2f1d"; + sha256 = "0vpcfk3g1bnwwmrln14jkj2wvw2z8igxw2mdb7c3y66466wm93ig"; }; nativeBuildInputs = [ cmake ]; From 59e9c12db3bc1f68da113b5e4b5baad721bb8321 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 12 Oct 2018 23:20:54 +0200 Subject: [PATCH 545/992] gtk-spell: add meta data --- pkgs/development/libraries/gtkspell/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 22094f3a3f64..14676be0dcb9 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -2,16 +2,19 @@ stdenv.mkDerivation { name = "gtkspell-2.0.16"; - + src = fetchurl { url = mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz; sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - + nativeBuildInputs = [ pkgconfig ]; buildInputs = [aspell gtk2 enchant intltool]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Word-processor-style highlighting and replacement of misspelled words"; + homepage = http://gtkspell.sourceforge.net; + platforms = platforms.unix; + license = licenses.gpl2; }; } From 4d83f5305f9184224a13872a94ab612a13b03024 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 12 Oct 2018 23:24:30 +0200 Subject: [PATCH 546/992] hspell: add license --- pkgs/development/libraries/hspell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 20dda589b9cc..9d2088808c13 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { patchPhase = ''patchShebangs .''; buildInputs = [ perl zlib ]; - meta = { + meta = with stdenv.lib; { description = "Hebrew spell checker"; homepage = http://hspell.ivrix.org.il/; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + platforms = platforms.all; + license = licenses.gpl2; }; } From f9e1b104b1e8401a9d8b43af5fbbca42f59b535c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 12 Oct 2018 23:26:50 +0200 Subject: [PATCH 547/992] hunspell: add licenses --- pkgs/development/libraries/hunspell/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index b3914a4438b3..62c3d79cf9a1 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { * Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO. ''; platforms = platforms.all; + license = with licenses; [ gpl2 lgpl21 mpl11 ]; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } From f7995a6ea67cbeb06b1b2718c0b5ea799f5106ac Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 12 Oct 2018 23:28:05 +0200 Subject: [PATCH 548/992] hyena: add license --- pkgs/development/libraries/hyena/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index f99aa0b6f0cf..516e4184623a 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; maintainers = with maintainers; [ obadz ]; + license = licenses.mit; }; } From 8f4eb29584e5f328f9bcc5809187b244a23f9e89 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 12 Oct 2018 23:33:05 +0200 Subject: [PATCH 549/992] id3lib: add meta data --- pkgs/development/libraries/id3lib/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index dda1435c1dac..ddce76b10f72 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation { doCheck = false; # fails to compile - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags"; + homepage = http://id3lib.sourceforge.net; + platforms = platforms.unix; + license = licenses.lgpl2; }; } From adbdba25d07b03acebaa91a11966802fadb4512b Mon Sep 17 00:00:00 2001 From: Christopher Ostrouchov Date: Fri, 12 Oct 2018 18:16:47 -0400 Subject: [PATCH 550/992] pythonPackages.tinycss: 0.3 -> 0.4 refactor move to python-modules (#48163) --- .../python-modules/tinycss/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------- 2 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 pkgs/development/python-modules/tinycss/default.nix diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix new file mode 100644 index 000000000000..ab6a4183df50 --- /dev/null +++ b/pkgs/development/python-modules/tinycss/default.nix @@ -0,0 +1,35 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, pytest +, python +, cssutils +, isPyPy +}: + +buildPythonPackage rec { + pname = "tinycss"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ cssutils ]; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + # Disable Cython tests for PyPy + TINYCSS_SKIP_SPEEDUPS_TESTS = pkgs.lib.optional isPyPy true; + + meta = with pkgs.lib; { + description = "Complete yet simple CSS parser for Python"; + license = licenses.bsd3; + homepage = https://pythonhosted.org/tinycss/; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57f8c947fcc5..62b77b187bc7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1979,32 +1979,7 @@ in { pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; - tinycss = buildPythonPackage rec { - name = "tinycss-${version}"; - version = "0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tinycss/${name}.tar.gz"; - sha256 = "1pichqra4wk86142hqgvy9s5x6c5k5zhy8l9qxr0620pqk8spbd4"; - }; - - buildInputs = with self; [ pytest ]; - - propagatedBuildInputs = with self; [ cssutils ]; - - checkPhase = '' - py.test $out/${python.sitePackages} - ''; - - # Disable Cython tests for PyPy - TINYCSS_SKIP_SPEEDUPS_TESTS = optional isPyPy true; - - meta = { - description = "Complete yet simple CSS parser for Python"; - license = licenses.bsd3; - homepage = https://pythonhosted.org/tinycss/; - }; - }; + tinycss = callPackage ../development/python-modules/tinycss { }; tinycss2 = callPackage ../development/python-modules/tinycss2 { }; From 0d44d639f67336050efc470b1776714d504e22b8 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 22:41:46 +0000 Subject: [PATCH 551/992] nixos/qemu-guest-agent: pkgs.{kvm -> qemu} (#48293) there is no top-level pkgs.kvm --- nixos/modules/virtualisation/qemu-guest-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-guest-agent.nix b/nixos/modules/virtualisation/qemu-guest-agent.nix index e0d2b3dc509d..665224e35d8c 100644 --- a/nixos/modules/virtualisation/qemu-guest-agent.nix +++ b/nixos/modules/virtualisation/qemu-guest-agent.nix @@ -25,7 +25,7 @@ in { systemd.services.qemu-guest-agent = { description = "Run the QEMU Guest Agent"; serviceConfig = { - ExecStart = "${pkgs.kvm.ga}/bin/qemu-ga"; + ExecStart = "${pkgs.qemu.ga}/bin/qemu-ga"; Restart = "always"; RestartSec = 0; }; From 0808c7cd31aaa329aba21430b8b26c3a233dd83f Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 11 Oct 2018 21:23:11 -0400 Subject: [PATCH 552/992] lib/types: enhances separatedString's description The previous description "string" is misleading in the full options manual pages; they are actually concatenated strings, with a specific character. The empty string version ("types.string") has been special-cased to provide a better message. --- lib/types.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 4e44e7521c4b..ca6794e274c3 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -194,7 +194,10 @@ rec { # separator between the values). separatedString = sep: mkOptionType rec { name = "separatedString"; - description = "string"; + description = if sep == "" + then "Concatenated string" # for types.string. + else "strings concatenated with ${builtins.toJSON sep}" + ; check = isString; merge = loc: defs: concatStringsSep sep (getValues defs); functor = (defaultFunctor name) // { From 028164ef057119ee37c99bcb98224672441d2d81 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Oct 2018 02:54:42 +0200 Subject: [PATCH 553/992] monero: 0.12.3.0 -> 0.13.0.2 --- pkgs/applications/altcoins/monero/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index a4a884707a98..2b396c4b938d 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit , cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq -, zeromq, pcsclite, readline +, zeromq, pcsclite, readline, libsodium , CoreData, IOKit, PCSC }: @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.12.3.0"; + version = "0.13.0.2"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i"; + sha256 = "078iw76ajvaj08rgnx3c13pnq8fxah1z9wwyz54fcnj2349sjbf5"; }; nativeBuildInputs = [ cmake pkgconfig git ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline + libsodium ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ From 6dc4ae5eb237b709dcb1b637b6b3a733fdc1f616 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Oct 2018 03:02:10 +0200 Subject: [PATCH 554/992] xmr-stak: 2.4.7 -> 2.5.0 --- pkgs/applications/misc/xmr-stak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index b98d10efdee1..877a25fe662e 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.4.7"; + version = "2.5.0"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817"; + sha256 = "1qls0rai9c1cszcqqqmhcdvcsmm23w1jxzlq2b035apkz7ywbxjl"; }; NIX_CFLAGS_COMPILE = "-O3"; From c02fc32e1d3fefb9ccc7e8f3b1cba7d11180851c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 12 Oct 2018 21:45:02 -0500 Subject: [PATCH 555/992] gpgme: enable tests, they pass! :) --- pkgs/development/libraries/gpgme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 04ceea137cdd..8e7d10782157 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { checkInputs = [ which ]; - doCheck = false; # fails 8 out of 26 tests with "GPGME: Decryption failed". Spooky! + doCheck = true; meta = with stdenv.lib; { homepage = https://gnupg.org/software/gpgme/index.html; From a838003c323c8910f479a75d070b880695d9a294 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Oct 2018 00:04:15 -0500 Subject: [PATCH 556/992] notmuch: 0.27 -> 0.28 https://notmuchmail.org/pipermail/notmuch/2018/027128.html --- .../applications/networking/mailreaders/notmuch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 2d1b6ee15301..9db9782e2ed6 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.27"; + version = "0.28"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0"; + sha256 = "0dqarmjc8544m2w7bqrqmvsfy55fw82707z3lz9cql8nr777bjmc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doxygen perl # (optional) api docs pythonPackages.sphinx pythonPackages.python # (optional) documentation -> doc/INSTALL bash-completion # (optional) dependency to install bash completion - emacs # (optional) to byte compile emacs code + emacs # (optional) to byte compile emacs code, also needed for tests ruby # (optional) ruby bindings which dtach openssl bash # test dependencies ] From 13f3021bbbddd060eb92672d570c2a87fda65795 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Oct 2018 00:17:22 -0500 Subject: [PATCH 557/992] notmuch: fix zsh completions by specifying dir to use --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 9db9782e2ed6..c2c5d18e2f0d 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { done ''; + configureFlags = [ "--zshcompletiondir=$(out)/share/zsh/site-functions" ]; + # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and # friends setOutputFlags = false; From 909c46b271617d0322bb137aa6d63771ec513fbc Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 19:44:17 -0400 Subject: [PATCH 558/992] pythonPackages.atsim_potentials: init at 0.2.1 --- .../atsim_potentials/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/atsim_potentials/default.nix diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix new file mode 100644 index 000000000000..5d664e77d295 --- /dev/null +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytest +, future +}: + +buildPythonPackage rec { + version = "0.2.1"; + pname = "atsim.potentials"; + + src = fetchPypi { + inherit pname version; + sha256 = "2abdec2fb4e8198f4e0e41634ad86625d5356a4a3f1ba1f41568d0697df8f36f"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ future ]; + + # tests are not included with release + doCheck = false; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://bitbucket.org/mjdr/atsim_potentials; + description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62b77b187bc7..2bea7b3053b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -745,6 +745,8 @@ in { attrs = callPackage ../development/python-modules/attrs { }; + atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; + audioread = callPackage ../development/python-modules/audioread { }; audiotools = callPackage ../development/python-modules/audiotools { }; From 979f91567dc813b4132bb4cd7e941e78d6fcc134 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 19:30:47 -0400 Subject: [PATCH 559/992] pythonPackages.pyannotate: init at 1.0.6 --- .../python-modules/pyannotate/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pyannotate/default.nix diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix new file mode 100644 index 000000000000..5bcf07f10157 --- /dev/null +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, six +, mypy_extensions +, typing +, pytest +}: + +buildPythonPackage rec { + version = "1.0.6"; + pname = "pyannotate"; + + src = fetchPypi { + inherit pname version; + sha256 = "dbdc2a26cbf45490a650e976ba45f99abe9ddbf0af5746307914e5ef419e325e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ six mypy_extensions ] + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/dropbox/pyannotate; + description = "Auto-generate PEP-484 annotations"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bea7b3053b9..1a79b3b8be39 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -416,6 +416,8 @@ in { inherit (pkgs) arrow-cpp cmake pkgconfig; }; + pyannotate = callPackage ../development/python-modules/pyannotate { }; + pyatspi = callPackage ../development/python-modules/pyatspi { }; pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; From 648acbabcae11bef8c82e60a517bed5ed8fa192d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 19:31:12 -0400 Subject: [PATCH 560/992] pythonPackages.pytest-annotate: init at 1.0.2 --- .../pytest-annotate/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-annotate/default.nix diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix new file mode 100644 index 000000000000..581de7beeebc --- /dev/null +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyannotate +, pytest +}: + +buildPythonPackage rec { + version = "1.0.2"; + pname = "pytest-annotate"; + + src = fetchPypi { + inherit pname version; + sha256 = "03e4dece2d1aa91666034f1b2e8bb7a7b8c6be11baf3cf2929b26eea5c6e86f3"; + }; + + propagatedBuildInputs = [ pyannotate pytest ]; + + # not testing for a testing module... + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/kensho-technologies/pytest-annotate; + description = "Generate PyAnnotate annotations from your pytest tests"; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a79b3b8be39..e07a1d7d7432 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1919,6 +1919,8 @@ in { pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; + pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; + pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; From 1533099b9f95ae71d332597536dfb069cc374d5d Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 19:31:31 -0400 Subject: [PATCH 561/992] pythonPackages.pytest-ansible: init at 2.0.1 --- .../python-modules/pytest-ansible/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-ansible/default.nix diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix new file mode 100644 index 000000000000..09d8aa40e197 --- /dev/null +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ansible +, pytest +, mock +, isPy3k +}: + +buildPythonPackage rec { + version = "2.0.1"; + pname = "pytest-ansible"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "553f2bc9e64f8c871ad29b7d5c100f6e549fe85db26bd1ff5dda8b769bb38a3e"; + }; + + patchPhase = '' + sed -i "s/'setuptools-markdown'//g" setup.py + ''; + + # requires pandoc < 2.0 + # buildInputs = [ setuptools-markdown ]; + checkInputs = [ mock ]; + propagatedBuildInputs = [ ansible pytest ]; + + # tests not included with release + doCheck = false; + + checkPhase = '' + pytest tests + ''; + + meta = with stdenv.lib; { + homepage = http://github.com/jlaska/pytest-ansible; + description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e07a1d7d7432..5e5e6128f559 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1921,6 +1921,8 @@ in { pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; + pytest-ansible = callPackage ../development/python-modules/pytest-ansible { }; + pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; From 56e277354aa46b12eb50799310ca1fe796454e5f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 17:32:13 -0400 Subject: [PATCH 562/992] pythonPackages.amqplib: 0.6.1 -> 1.0.2 --- .../python-modules/amqplib/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index 3699fdd5d499..682dee000144 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -1,19 +1,24 @@ -{ stdenv, buildPythonPackage, fetchurl }: +{ stdenv, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "amqplib"; - version = "0.6.1"; + version = "1.0.2"; - src = fetchurl { - url = https://github.com/barryp/py-amqplib/archive/0.6.1.tar.gz; - sha256 = "04nsn68wz9m24rvbssirkyighazbn20j60wjmi0r7jcpcf00sb3s"; + src = fetchPypi { + inherit pname version; + extension = "tgz"; + sha256 = "843d69b681a60afd21fbf50f310404ec67fcdf9d13dfcf6e9d41f3b456217e5b"; }; - # error: invalid command 'test' + # testing assumes network connection doCheck = false; + checkPhase = '' + ${python.interpreter} tests/client_0_8/run_all.py + ''; + meta = with stdenv.lib; { - homepage = http://code.google.com/p/py-amqplib/; + homepage = https://github.com/barryp/py-amqplib; description = "Python client for the Advanced Message Queuing Procotol (AMQP)"; license = licenses.lgpl21; }; From 08505d87d36c2219b50cd0c1bb43bfda8c8f5cad Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:48:15 -0400 Subject: [PATCH 563/992] pythonPackages.boto: 2.47.0 -> 2.49.0 refactor move to python-modules --- .../python-modules/boto/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 31 +-------------- 2 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/python-modules/boto/default.nix diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix new file mode 100644 index 000000000000..e58f071589a6 --- /dev/null +++ b/pkgs/development/python-modules/boto/default.nix @@ -0,0 +1,38 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, nose +, mock +, requests +, httpretty +}: + +buildPythonPackage rec { + pname = "boto"; + version = "2.49.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"; + }; + + checkPhase = '' + ${python.interpreter} tests/test.py default + ''; + + checkInputs = [ nose mock ]; + propagatedBuildInputs = [ requests httpretty ]; + + meta = with pkgs.lib; { + homepage = https://github.com/boto/boto; + license = licenses.mit; + description = "Python interface to Amazon Web Services"; + longDescription = '' + The boto module is an integrated interface to current and + future infrastructural services offered by Amazon Web + Services. This includes S3, SQS, EC2, among others. + ''; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e5e6128f559..72b5e0b97b03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1338,36 +1338,7 @@ in { bokeh = callPackage ../development/python-modules/bokeh { }; - boto = buildPythonPackage rec { - name = "boto-${version}"; - version = "2.47.0"; - - src = pkgs.fetchurl { - url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "051gq8z9m2cir03jhc00qs36bnpla7zkqm9xqiqcqvdknmi2ndbq"; - }; - - checkPhase = '' - ${python.interpreter} tests/test.py default - ''; - - buildInputs = [ self.nose self.mock ]; - propagatedBuildInputs = [ self.requests self.httpretty ]; - - meta = { - homepage = https://github.com/boto/boto; - - license = "bsd"; - - description = "Python interface to Amazon Web Services"; - - longDescription = '' - The boto module is an integrated interface to current and - future infrastructural services offered by Amazon Web - Services. This includes S3, SQS, EC2, among others. - ''; - }; - }; + boto = callPackage ../development/python-modules/boto { }; boto3 = callPackage ../development/python-modules/boto3 { }; From 990da90083d2fb911143a4af5f682b4fe48c4839 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:23:25 -0400 Subject: [PATCH 564/992] pythonPackages.azure: refactor move to python-modules --- .../python-modules/azure/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +--------- 2 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/azure/default.nix diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix new file mode 100644 index 000000000000..c021e483d943 --- /dev/null +++ b/pkgs/development/python-modules/azure/default.nix @@ -0,0 +1,39 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, dateutil +, futures +, pyopenssl +, requests +, pythonOlder +, isPy3k +}: + +buildPythonPackage rec { + version = "0.11.0"; + pname = "azure"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24"; + }; + + propagatedBuildInputs = [ dateutil pyopenssl requests ] + ++ pkgs.lib.optionals (!isPy3k) [ futures ]; + + # depends on futures for python 3 (not necissary) + patchPhase = if (!isPy3k) then "" else '' + sed -i -e "s/'futures'//" setup.py + ''; + + # tests are not packaged in pypi release + doCheck = false; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 72b5e0b97b03..1ae2dfc76302 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -216,6 +216,8 @@ in { ansiconv = callPackage ../development/python-modules/ansiconv { }; + azure = callPackage ../development/python-modules/azure { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; @@ -767,25 +769,6 @@ in { noise = callPackage ../development/python-modules/noise {}; - azure = buildPythonPackage rec { - version = "0.11.0"; - name = "azure-${version}"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/azure/${name}.zip"; - sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24"; - }; - - propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ]; - - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; azure-nspkg = buildPythonPackage rec { version = "1.0.0"; From 1c397de0ff9a0453ca8c7659f9c2cd0d1acf9e80 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:24:46 -0400 Subject: [PATCH 565/992] pythonPackages.azure-common: refactor move to python-modules --- .../python-modules/azure-common/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 ++----------- 2 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/azure-common/default.nix diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix new file mode 100644 index 000000000000..00cc67d34bd9 --- /dev/null +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -0,0 +1,32 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, azure-nspkg +, isPyPy +, python +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "azure-common"; + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "074rwwy8zzs7zw3nww5q2wg5lxgdc4rmypp2gfc9mwsz0gb70491"; + }; + + propagatedBuildInputs = [ azure-nspkg ]; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ae2dfc76302..b779ab8a25e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -218,6 +218,8 @@ in { azure = callPackage ../development/python-modules/azure { }; + azure-common = callPackage ../development/python-modules/azure-common { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; @@ -785,26 +787,6 @@ in { }; }; - azure-common = buildPythonPackage rec { - version = "1.0.0"; - name = "azure-common-${version}"; - disabled = isPyPy; - src = pkgs.fetchurl { - url = mirror://pypi/a/azure-common/azure-common-1.0.0.zip; - sha256 = "074rwwy8zzs7zw3nww5q2wg5lxgdc4rmypp2gfc9mwsz0gb70491"; - }; - propagatedBuildInputs = with self; [ azure-nspkg ]; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - ''; - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; - azure-mgmt-common = buildPythonPackage rec { version = "0.20.0"; name = "azure-mgmt-common-${version}"; From caaac35fffe7013227e5495a859defb3abb89a25 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:25:27 -0400 Subject: [PATCH 566/992] pythonPackages.azure-mgmt-common: refactor move to python-modules --- .../azure-mgmt-common/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 ++----------- 2 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/azure-mgmt-common/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix new file mode 100644 index 000000000000..5ba49d1f3f1f --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -0,0 +1,33 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-common +, azure-mgmt-nspkg +, requests +}: + +buildPythonPackage rec { + version = "0.20.0"; + pname = "azure-mgmt-common"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66"; + }; + + propagatedBuildInputs = [ azure-common azure-mgmt-nspkg requests ]; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b779ab8a25e1..4801ac847300 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -220,6 +220,8 @@ in { azure-common = callPackage ../development/python-modules/azure-common { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; @@ -787,26 +789,6 @@ in { }; }; - azure-mgmt-common = buildPythonPackage rec { - version = "0.20.0"; - name = "azure-mgmt-common-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/a/azure-mgmt-common/azure-mgmt-common-0.20.0.zip; - sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66"; - }; - propagatedBuildInputs = with self; [ azure-common azure-mgmt-nspkg requests ]; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; - azure-mgmt-compute = buildPythonPackage rec { version = "0.20.0"; name = "azure-mgmt-compute-${version}"; From acb73361338956b0d5e108890e726b098e24f314 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:26:06 -0400 Subject: [PATCH 567/992] pythonPackages.azure-mgmt-compute: refactor move to python-modules --- .../azure-mgmt-compute/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------- 2 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/azure-mgmt-compute/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix new file mode 100644 index 000000000000..4ea60f2f29a5 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -0,0 +1,37 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-mgmt-common +}: + +buildPythonPackage rec { + version = "0.20.0"; + pname = "azure-mgmt-compute"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4801ac847300..fb95b40888cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -222,6 +222,8 @@ in { azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; + azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; @@ -789,31 +791,6 @@ in { }; }; - azure-mgmt-compute = buildPythonPackage rec { - version = "0.20.0"; - name = "azure-mgmt-compute-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/a/azure-mgmt-compute/azure-mgmt-compute-0.20.0.zip; - sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v"; - }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py - ''; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - propagatedBuildInputs = with self; [ azure-mgmt-common ]; - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; - azure-mgmt-network = buildPythonPackage rec { version = "0.20.1"; name = "azure-mgmt-network-${version}"; From 3b49976b8af26d3143616f548d17bb3add18fd13 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:26:45 -0400 Subject: [PATCH 568/992] pythonPackages.azure-mgmt-network: refactor move to python-modules --- .../azure-mgmt-network/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 27 +------------- 2 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/azure-mgmt-network/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix new file mode 100644 index 000000000000..fd47f8895fd4 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -0,0 +1,37 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, azure-mgmt-common +, python +}: + +buildPythonPackage rec { + version = "0.20.1"; + pname = "azure-mgmt-network"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb95b40888cf..87db5d400630 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -224,6 +224,8 @@ in { azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; + azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; @@ -791,31 +793,6 @@ in { }; }; - azure-mgmt-network = buildPythonPackage rec { - version = "0.20.1"; - name = "azure-mgmt-network-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/a/azure-mgmt-network/azure-mgmt-network-0.20.1.zip; - sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; - }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py - ''; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - propagatedBuildInputs = with self; [ azure-mgmt-common ]; - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; - azure-mgmt-nspkg = buildPythonPackage rec { version = "1.0.0"; name = "azure-mgmt-nspkg-${version}"; From 1675213fac242b0f2174b170fd04d35d8d271602 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:27:54 -0400 Subject: [PATCH 569/992] pythonPackages.azure-nspkg: refactor move to python-modules --- .../azure-mgmt-nspkg/default.nix | 25 +++++++++++++ .../python-modules/azure-nspkg/default.nix | 22 ++++++++++++ pkgs/top-level/python-packages.nix | 36 +++---------------- 3 files changed, 51 insertions(+), 32 deletions(-) create mode 100644 pkgs/development/python-modules/azure-mgmt-nspkg/default.nix create mode 100644 pkgs/development/python-modules/azure-nspkg/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix new file mode 100644 index 000000000000..aa037b48b4f5 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -0,0 +1,25 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, azure-nspkg +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "azure-mgmt-nspkg"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; + }; + + propagatedBuildInputs = [ azure-nspkg ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/pkgs/development/python-modules/azure-nspkg/default.nix new file mode 100644 index 000000000000..fb06758c5d40 --- /dev/null +++ b/pkgs/development/python-modules/azure-nspkg/default.nix @@ -0,0 +1,22 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "azure-nspkg"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "293f286c15ea123761f30f5b1cb5adebe5f1e5009efade923c6dd1e017621bf7"; + }; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87db5d400630..2e94571c72af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -218,6 +218,8 @@ in { azure = callPackage ../development/python-modules/azure { }; + azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; + azure-common = callPackage ../development/python-modules/azure-common { }; azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; @@ -226,6 +228,8 @@ in { azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { }; + azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; @@ -777,38 +781,6 @@ in { noise = callPackage ../development/python-modules/noise {}; - - azure-nspkg = buildPythonPackage rec { - version = "1.0.0"; - name = "azure-nspkg-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/a/azure-nspkg/azure-nspkg-1.0.0.zip; - sha256 = "1xqvc8by1lbd7j9dxyly03jz3rgbmnsiqnqgydhkf4pa2mn2hgr9"; - }; - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; - - azure-mgmt-nspkg = buildPythonPackage rec { - version = "1.0.0"; - name = "azure-mgmt-nspkg-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/a/azure-mgmt-nspkg/azure-mgmt-nspkg-1.0.0.zip; - sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq"; - }; - propagatedBuildInputs = with self; [ azure-nspkg ]; - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; - azure-mgmt-resource = buildPythonPackage rec { version = "0.20.1"; name = "azure-mgmt-resource-${version}"; From 071053bcb03001597e4b4e926c40c88cac095092 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:29:12 -0400 Subject: [PATCH 570/992] pythonPackages.azure-mgmt-storage: refactor move to python-modules --- .../azure-mgmt-storage/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-storage/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix new file mode 100644 index 000000000000..2e0523bb25cc --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -0,0 +1,37 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-mgmt-common +}: + +buildPythonPackage rec { + version = "0.20.0"; + pname = "azure-mgmt-storage"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e94571c72af..43c4c2e275a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -230,6 +230,8 @@ in { azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; From 110afaae5cd5e59f3c7573434cb9c0c23e74faab Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:30:56 -0400 Subject: [PATCH 571/992] pythonPackages.azure-mgmt-resource: refactor move to python-modules --- .../azure-mgmt-resource/default.nix | 38 ++++++++++++++ pkgs/top-level/python-packages.nix | 52 +------------------ 2 files changed, 40 insertions(+), 50 deletions(-) create mode 100644 pkgs/development/python-modules/azure-mgmt-resource/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix new file mode 100644 index 000000000000..b60e3aee3402 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -0,0 +1,38 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-mgmt-common +}: + + +buildPythonPackage rec { + version = "0.20.1"; + pname = "azure-mgmt-resource"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; + }; + + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py + ''; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py + ''; + + propagatedBuildInputs = [ azure-mgmt-common ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43c4c2e275a6..4d773612f186 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -230,6 +230,8 @@ in { azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { }; + azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; backports_csv = callPackage ../development/python-modules/backports_csv {}; @@ -783,56 +785,6 @@ in { noise = callPackage ../development/python-modules/noise {}; - azure-mgmt-resource = buildPythonPackage rec { - version = "0.20.1"; - name = "azure-mgmt-resource-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/a/azure-mgmt-resource/azure-mgmt-resource-0.20.1.zip; - sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; - }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py - ''; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - propagatedBuildInputs = with self; [ azure-mgmt-common ]; - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; - - azure-mgmt-storage = buildPythonPackage rec { - version = "0.20.0"; - name = "azure-mgmt-storage-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/a/azure-mgmt-storage/azure-mgmt-storage-0.20.0.zip; - sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; - }; - preConfigure = '' - # Patch to make this package work on requests >= 2.11.x - # CAN BE REMOVED ON NEXT PACKAGE UPDATE - sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py - ''; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - propagatedBuildInputs = with self; [ azure-mgmt-common ]; - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; - azure-storage = buildPythonPackage rec { version = "0.20.3"; name = "azure-storage-${version}"; From 5d26b1b9c0f9e04103ef4193819b7c0b2ec7fe7f Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:31:40 -0400 Subject: [PATCH 572/992] pythonPackages.azure-storage: refactor move to python-modules --- .../python-modules/azure-storage/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 ++--------- 2 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/azure-storage/default.nix diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix new file mode 100644 index 000000000000..6693a7464d43 --- /dev/null +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -0,0 +1,35 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-common +, futures +, dateutil +, requests +, isPy3k +}: + +buildPythonPackage rec { + version = "0.20.3"; + pname = "azure-storage"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; + }; + + propagatedBuildInputs = [ azure-common dateutil requests ] + ++ pkgs.lib.optionals (!isPy3k) [ futures ]; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d773612f186..da8d303ead5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -234,6 +234,8 @@ in { azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { }; + azure-storage = callPackage ../development/python-modules/azure-storage { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; @@ -785,25 +787,6 @@ in { noise = callPackage ../development/python-modules/noise {}; - azure-storage = buildPythonPackage rec { - version = "0.20.3"; - name = "azure-storage-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/a/azure-storage/azure-storage-0.20.3.zip; - sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; - }; - propagatedBuildInputs = with self; [ azure-common futures dateutil requests ]; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - ''; - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; - azure-servicemanagement-legacy = buildPythonPackage rec { version = "0.20.1"; name = "azure-servicemanagement-legacy-${version}"; From 9a5aaf34211b9dd53d45751226ffd83159c27d06 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 12:32:20 -0400 Subject: [PATCH 573/992] pythonPackages.azure-servicemanagement-lagacy: refactor move to python-modules --- .../default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 ++----------- 2 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix new file mode 100644 index 000000000000..8fb27be0e51f --- /dev/null +++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -0,0 +1,31 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, azure-common +, requests +, python +}: + +buildPythonPackage rec { + version = "0.20.1"; + pname = "azure-servicemanagement-legacy"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs"; + }; + + propagatedBuildInputs = [ azure-common requests ]; + + postInstall = '' + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + ''; + + meta = with pkgs.lib; { + description = "Microsoft Azure SDK for Python"; + homepage = "https://azure.microsoft.com/en-us/develop/python/"; + license = licenses.asl20; + maintainers = with maintainers; [ olcai ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da8d303ead5c..30e23885f14d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -236,6 +236,8 @@ in { azure-storage = callPackage ../development/python-modules/azure-storage { }; + azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; + backports_csv = callPackage ../development/python-modules/backports_csv {}; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; @@ -787,25 +789,6 @@ in { noise = callPackage ../development/python-modules/noise {}; - azure-servicemanagement-legacy = buildPythonPackage rec { - version = "0.20.1"; - name = "azure-servicemanagement-legacy-${version}"; - src = pkgs.fetchurl { - url = mirror://pypi/a/azure-servicemanagement-legacy/azure-servicemanagement-legacy-0.20.1.zip; - sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs"; - }; - propagatedBuildInputs = with self; [ azure-common requests ]; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - ''; - meta = { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - }; - }; - backcall = callPackage ../development/python-modules/backcall { }; backports_abc = callPackage ../development/python-modules/backports_abc { }; From e79d93a848565478e3eea1c7d7690ec8d355f8dd Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 10 Oct 2018 14:55:38 +0200 Subject: [PATCH 574/992] pythonPackages.django: 1.11.15 -> 1.11.16 See https://docs.djangoproject.com/en/1.11/releases/1.11.16/ --- pkgs/development/python-modules/django/1_11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index ba65297dbb9c..c8c9267265d9 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.15"; + version = "1.11.16"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "0h2sl02x2mxr3rl3dy750pzm5kvmx77116fys8rrgw164kc3b0mi"; + sha256 = "14apywfi8mfy50xh07cagp24kx9mlqfzfq4f60klz90ng328q9i9"; }; patches = stdenv.lib.optionals withGdal [ From b80f6ea733cc2280d3a9ae07d20b0eb3b8ea9541 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 10 Oct 2018 14:57:45 +0200 Subject: [PATCH 575/992] pythonPackages.django_2_1: 2.0.8 -> 2.0.9 See https://docs.djangoproject.com/en/2.0/releases/2.0.9/ --- pkgs/development/python-modules/django/2_0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix index 0bfe43a20e18..bf04f5e61197 100644 --- a/pkgs/development/python-modules/django/2_0.nix +++ b/pkgs/development/python-modules/django/2_0.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.0.8"; + version = "2.0.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "12z3b9v0zl7w9bm5sl7dpkk5w35ypalizfmnaj9jac41k8vfmbk8"; + sha256 = "0sgx548zp5xf8dajiamdskbrphssiyajhgbw8iza6b68mda4bnfn"; }; patches = stdenv.lib.optionals withGdal [ From 66a11d365c04454d55af5df3061380f4d89f1daf Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 10 Oct 2018 14:58:51 +0200 Subject: [PATCH 576/992] pythonPackages.django_2_1: 2.1.1 -> 2.1.2 See https://docs.djangoproject.com/en/2.1/releases/2.1.2/ --- pkgs/development/python-modules/django/2_1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index f66215c84db1..f79a7c49ca9b 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.1"; + version = "2.1.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0b7p6d77xqs2hdq2k1amqgbr3050zn5i8asz5w2lxajqnvb1rk71"; + sha256 = "0ibbs76pzy8zd47yviljrp1s66fmbf5b62fixayaznj7pdzavg7g"; }; patches = stdenv.lib.optionals withGdal [ From a3b28907289c0fcabfe89a39886ae2acab6b2fd4 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 01:53:40 -0400 Subject: [PATCH 577/992] pythonPackages.fdint: init at 2.0.2 --- .../python-modules/fdint/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/fdint/default.nix diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix new file mode 100644 index 000000000000..869e26d675a3 --- /dev/null +++ b/pkgs/development/python-modules/fdint/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, cython +, numpy +, python +, isPy3k +}: + +buildPythonPackage rec { + version = "2.0.2"; + pname = "fdint"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "30db139684d362652670e2cd3206b5dd7b3b93b86c3aff37f4b4fd4a3f98aead"; + }; + + buildInputs = [ cython ]; + propagatedBuildInputs = [ numpy ]; + + # tests not included with pypi release + doCheck = false; + + checkPhase = '' + ${python.interpreter} -m fdint.tests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/scott-maddox/fdint; + description = "A free, open-source python package for quickly and precisely approximating Fermi-Dirac integrals"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30e23885f14d..437c1b94749b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -330,6 +330,8 @@ in { fire = callPackage ../development/python-modules/fire { }; + fdint = callPackage ../development/python-modules/fdint { }; + fuse = callPackage ../development/python-modules/fuse-python { fuse = pkgs.fuse; }; genanki = callPackage ../development/python-modules/genanki { }; From e8bcf55d34faa1636f9d491c590fd3b757ee0a65 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 01:33:00 -0400 Subject: [PATCH 578/992] python36Packages.pyvoro: init at 1.3.2 python wrapper to voro++ --- .../python-modules/pyvoro/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pyvoro/default.nix diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix new file mode 100644 index 000000000000..83bdcec86bd2 --- /dev/null +++ b/pkgs/development/python-modules/pyvoro/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.3.2"; + pname = "pyvoro"; + + src = fetchPypi { + inherit pname version; + sha256 = "f31c047f6e4fc5f66eb0ab43afd046ba82ce247e18071141791364c4998716fc"; + }; + + # No tests in package + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/joe-jordan/pyvoro; + description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 437c1b94749b..a8cfcdbdc432 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -574,6 +574,8 @@ in { pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); + pyvoro = callPackage ../development/python-modules/pyvoro { }; + relatorio = callPackage ../development/python-modules/relatorio { }; pyzufall = callPackage ../development/python-modules/pyzufall { }; From 343a5b4e63a991c28c7981fabf99b513f35478e5 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 20 Sep 2018 15:57:05 -0400 Subject: [PATCH 579/992] pythonPackages.nest-asyncio: init at 0.9.1 --- .../python-modules/nest-asyncio/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/nest-asyncio/default.nix diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix new file mode 100644 index 000000000000..7cfc42e352b6 --- /dev/null +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonAtLeast +}: + +buildPythonPackage rec { + version = "0.9.1"; + pname = "nest_asyncio"; + disabled = !(pythonAtLeast "3.5"); + + src = fetchPypi { + inherit pname version; + sha256 = "0844af67deda3243389d47cd8754b6775c5c828345e0277beca7bd008d273392"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/erdewit/nest_asyncio; + description = "Patch asyncio to allow nested event loops"; + license = licenses.bsdOriginal; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8cfcdbdc432..524556732be3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -382,6 +382,8 @@ in { mwoauth = callPackage ../development/python-modules/mwoauth { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; + neuron = pkgs.neuron.override { inherit python; }; From 08d2c98e2ba5399dd36fede68c1ac228035e332c Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 21 Sep 2018 15:16:14 -0400 Subject: [PATCH 580/992] pythonPackages.gsd: init at 1.5.2 --- .../python-modules/gsd/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/gsd/default.nix diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix new file mode 100644 index 000000000000..d6c6a41ae084 --- /dev/null +++ b/pkgs/development/python-modules/gsd/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + version = "1.5.2"; + pname = "gsd"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ce73a9bc7b79968a2b96cc2b0934e2cbe11700adbd02b4b492fea1e3d4d51f4"; + }; + + propagatedBuildInputs = [ numpy ]; + + # tests not packaged with gsd + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://bitbucket.org/glotzer/gsd; + description = "General simulation data file format"; + license = licenses.bsd2; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 524556732be3..f55fbfc6c5ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -340,6 +340,8 @@ in { goocalendar = callPackage ../development/python-modules/goocalendar { }; + gsd = callPackage ../development/python-modules/gsd { }; + gssapi = callPackage ../development/python-modules/gssapi { }; h5py = callPackage ../development/python-modules/h5py { From 5410e6b6b6b15721e0591c9b73b1d1bb1721d489 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 13 Oct 2018 10:10:02 +0200 Subject: [PATCH 581/992] maintainers: add delroth --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e7756f0bff11..3a50eb2819b8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -986,6 +986,11 @@ github = "deepfire"; name = "Kosyrev Serge"; }; + delroth = { + email = "delroth@gmail.com"; + github = "delroth"; + name = "Pierre Bourdon"; + }; deltaevo = { email = "deltaduartedavid@gmail.com"; github = "DeltaEvo"; From 86d644f8cc85234e10165989ebc25e1da5135e99 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 13 Oct 2018 10:07:05 +0200 Subject: [PATCH 582/992] prometheus-tor-exporter: init at 0.3 Upstream: https://github.com/atx/prometheus-tor_exporter --- .../monitoring/prometheus/exporters.nix | 1 + .../monitoring/prometheus/exporters/tor.nix | 40 +++++++++++++++++++ .../monitoring/prometheus/tor-exporter.nix | 37 +++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 79 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/tor.nix create mode 100644 pkgs/servers/monitoring/prometheus/tor-exporter.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index ae8caac436da..950af848c0f6 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -30,6 +30,7 @@ let postfix = import ./exporters/postfix.nix { inherit config lib pkgs; }; snmp = import ./exporters/snmp.nix { inherit config lib pkgs; }; surfboard = import ./exporters/surfboard.nix { inherit config lib pkgs; }; + tor = import ./exporters/tor.nix { inherit config lib pkgs; }; unifi = import ./exporters/unifi.nix { inherit config lib pkgs; }; varnish = import ./exporters/varnish.nix { inherit config lib pkgs; }; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix new file mode 100644 index 000000000000..0e2a13c44ab7 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs }: + +with lib; + +let + cfg = config.services.prometheus.exporters.tor; +in +{ + port = 9130; + extraOpts = { + torControlAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Tor control IP address or hostname. + ''; + }; + + torControlPort = mkOption { + type = types.int; + default = 9051; + description = '' + Tor control port. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + DynamicUser = true; + ExecStart = '' + ${pkgs.prometheus-tor-exporter}/bin/prometheus-tor-exporter \ + -b ${cfg.listenAddress} \ + -p ${toString cfg.port} \ + -a ${cfg.torControlAddress} \ + -c ${toString cfg.torControlPort} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix new file mode 100644 index 000000000000..88f469ebe179 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -0,0 +1,37 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "tor-exporter-${version}"; + version = "0.3"; + + # Just a single .py file to use as the application's main entry point. + format = "other"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "atx"; + repo = "prometheus-tor_exporter"; + sha256 = "0d7pk8s8ya2pm8b4ijbfdniqcbd3vqy15dlhnmaf4wgb51pmm5yv"; + }; + + propagatedBuildInputs = with python3Packages; [ prometheus_client stem retrying ]; + + installPhase = '' + mkdir -p $out/share/ + cp prometheus-tor-exporter.py $out/share/ + ''; + + fixupPhase = '' + makeWrapper "${python3Packages.python.interpreter}" "$out/bin/prometheus-tor-exporter" \ + --set PYTHONPATH "$PYTHONPATH" \ + --add-flags "$out/share/prometheus-tor-exporter.py" + ''; + + meta = with lib; { + description = "Prometheus exporter that exposes metrics from a Tor daemon"; + homepage = https://github.com/atx/prometheus-tor_exporter; + license = licenses.mit; + maintainers = with maintainers; [ delroth ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f4bc519285f..e837d5049f84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13530,6 +13530,7 @@ with pkgs; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { buildGoPackage = buildGo110Package; }; + prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; From 489d120ef508e6e605ba2091e9decd898b1dafd0 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 00:58:07 -0400 Subject: [PATCH 583/992] pythonPackages.progress: init at 1.4 --- .../python-modules/progress/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/progress/default.nix diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix new file mode 100644 index 000000000000..4b8269136ad2 --- /dev/null +++ b/pkgs/development/python-modules/progress/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + version = "1.4"; + pname = "progress"; + + src = fetchPypi { + inherit pname version; + sha256 = "5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a"; + }; + + # tests not packaged with pypi release + doCheck = false; + + checkPhase = '' + ${python.interpreter} test_progress.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/verigak/progress/; + description = "Easy to use progress bars"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f55fbfc6c5ff..563494605464 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -428,6 +428,8 @@ in { plantuml = callPackage ../tools/misc/plantuml { }; + progress = callPackage ../development/python-modules/progress { }; + pymysql = callPackage ../development/python-modules/pymysql { }; Pmw = callPackage ../development/python-modules/Pmw { }; From 77e8b33cb74e9900afad523a282adbef3d0950d6 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 00:58:37 -0400 Subject: [PATCH 584/992] pythonPackages.imutils: init at 0.5.1 --- .../python-modules/imutils/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/imutils/default.nix diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix new file mode 100644 index 000000000000..4afdb1a1dc9c --- /dev/null +++ b/pkgs/development/python-modules/imutils/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, opencv3 +}: + +buildPythonPackage rec { + version = "0.5.1"; + pname = "imutils"; + + src = fetchPypi { + inherit pname version; + sha256 = "37d17adc9e71386c59b28f4ef5972ef6fe0023714fa1a652b8edc83f7ce0654c"; + }; + + propagatedBuildInputs = [ opencv3 ]; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/jrosebr1/imutils; + description = "A series of convenience functions to make basic image processing functions"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 563494605464..efec8fda7d11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -360,6 +360,8 @@ in { i3ipc = callPackage ../development/python-modules/i3ipc { }; + imutils = callPackage ../development/python-modules/imutils { }; + intelhex = callPackage ../development/python-modules/intelhex { }; jira = callPackage ../development/python-modules/jira { }; From 045a4a4b724fe344ad1f65edff44b8d824e3e79e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 00:58:59 -0400 Subject: [PATCH 585/992] pythonPackages.vidstab: init at 0.1.5 --- .../python-modules/vidstab/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/vidstab/default.nix diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix new file mode 100644 index 000000000000..8697d5dc4427 --- /dev/null +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, pandas +, imutils +, progress +, matplotlib +, pytest +}: + +buildPythonPackage rec { + version = "0.1.5"; + pname = "vidstab"; + + src = fetchPypi { + inherit pname version; + sha256 = "b775652cc4f41812de04bc443ad522c1bdaef456a00c74857e9ebc5d2066e362"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ]; + + # tests not packaged with pypi + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/AdamSpannbauer/python_video_stab; + description = "Video Stabilization using OpenCV"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efec8fda7d11..7136ce18d9da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -646,6 +646,8 @@ in { unifi = callPackage ../development/python-modules/unifi { }; + vidstab = callPackage ../development/python-modules/vidstab { }; + pyunbound = callPackage ../tools/networking/unbound/python.nix { }; # packages defined here From 4ed993367f085b8881e71cb86ed1e31800d62279 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 13 Oct 2018 03:12:26 -0500 Subject: [PATCH 586/992] arrow-cpp: 0.10.0 -> 0.11.0 (#48066) * arrow-cpp: 0.10.0 -> 0.11.0 * arrow-cpp: enable testing --- .../libraries/arrow-cpp/default.nix | 49 ++++++++++++++++--- .../arrow-cpp/double-conversion_cmake.patch | 43 ++++++++++++++++ .../libraries/parquet-cpp/default.nix | 39 --------------- .../python-modules/pyarrow/default.nix | 18 ++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 6 files changed, 90 insertions(+), 62 deletions(-) create mode 100644 pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch delete mode 100644 pkgs/development/libraries/parquet-cpp/default.nix diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 16fc7e0c960d..77ce77dee5ad 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,42 +1,75 @@ -{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, python, rapidjson, snappy, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: + +let + parquet-testing = fetchFromGitHub { + owner = "apache"; + repo = "parquet-testing"; + rev = "46ae2605c2de306f5740587107dcf333a527f2d1"; + sha256 = "07ps745gas2zcfmg56m3vwl63yyzmalnxwb5dc40vd004cx5hdik"; + }; +in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll"; + sha256 = "0pc5pqr0dbnx8s1ji102dhw9bbrsq3ml4ac3mmi2022yfyizlf0q"; }; sourceRoot = "apache-arrow-${version}/cpp"; - # patch to fix python-test - patches = [ ./darwin.patch ]; + patches = [ + # fix ARROW-3467 + ./double-conversion_cmake.patch + + # patch to fix python-test + ./darwin.patch + ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost python.pkgs.python python.pkgs.numpy ]; + buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ]; preConfigure = '' + substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + substituteInPlace cmake_modules/FindGLOG.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY + + patchShebangs build-support/ ''; BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; }; + DOUBLE_CONVERSION_HOME = double-conversion; FLATBUFFERS_HOME = flatbuffers; - GTEST_HOME = gtest; GFLAGS_HOME = gflags; + GLOG_HOME = glog; + GTEST_HOME = gtest; LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; }; RAPIDJSON_HOME = rapidjson; SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; - ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; + THRIFT_HOME = thrift; + ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib zlib.dev ]; }; ZSTD_HOME = zstd; cmakeFlags = [ "-DARROW_PYTHON=ON" + "-DARROW_PARQUET=ON" ]; + doInstallCheck = true; + PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; + installCheckInputs = [ perl which ]; + installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin '' + for f in release/*-test; do + install_name_tool -add_rpath "$out"/lib "$f" + done + '') + '' + ctest -L unittest -V + ''; + meta = { description = "A cross-language development platform for in-memory data"; homepage = https://arrow.apache.org/; diff --git a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch new file mode 100644 index 000000000000..336fdde9e8fb --- /dev/null +++ b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch @@ -0,0 +1,43 @@ +diff --git a/CMakeLists.txt b/cpp/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -615,7 +615,7 @@ endif(UNIX) + set(ARROW_LINK_LIBS) + + # Libraries to link statically with libarrow.so +-set(ARROW_STATIC_LINK_LIBS double-conversion) ++set(ARROW_STATIC_LINK_LIBS ${DOUBLE_CONVERSION_TARGET}) + + if (ARROW_WITH_BROTLI) + SET(ARROW_STATIC_LINK_LIBS +@@ -694,7 +694,7 @@ else () + set(ARROW_MIN_TEST_LIBS + arrow_shared + ${ARROW_LINK_LIBS} +- double-conversion ++ ${DOUBLE_CONVERSION_TARGET} + ${BOOST_SYSTEM_LIBRARY} + ${BOOST_FILESYSTEM_LIBRARY} + ${BOOST_REGEX_LIBRARY} +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -469,14 +469,16 @@ if("${DOUBLE_CONVERSION_HOME}" STREQUAL "") + set(DOUBLE_CONVERSION_VENDORED 1) + else() + find_package(double-conversion REQUIRED) ++ set(DOUBLE_CONVERSION_TARGET double-conversion::double-conversion) + set(DOUBLE_CONVERSION_VENDORED 0) + endif() + + include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR}) +-ADD_THIRDPARTY_LIB(double-conversion +- STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) + + if (DOUBLE_CONVERSION_VENDORED) ++ ADD_THIRDPARTY_LIB(double-conversion ++ STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) ++ set(DOUBLE_CONVERSION_TARGET double-conversion) + add_dependencies(arrow_dependencies double-conversion_ep) + endif() + diff --git a/pkgs/development/libraries/parquet-cpp/default.nix b/pkgs/development/libraries/parquet-cpp/default.nix deleted file mode 100644 index 804ddb136f03..000000000000 --- a/pkgs/development/libraries/parquet-cpp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, symlinkJoin, fetchurl, arrow-cpp, boost, cmake, gtest, snappy, thrift, zlib }: - -stdenv.mkDerivation rec { - name = "parquet-cpp-${version}"; - version = "1.5.0"; - - src = fetchurl { - url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz"; - sha256 = "19nwqahc0igr0jfprbf2m86rmzz6zicw4z7b8z832wbsyc904wli"; - }; - - patches = [ ./api.patch ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; - - preConfigure = '' - substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY - ''; - - ARROW_HOME = arrow-cpp; - THRIFT_HOME = thrift; - GTEST_HOME = gtest; - SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; - ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; - - cmakeFlags = [ - "-DPARQUET_BUILD_BENCHMARKS=OFF" - ]; - - meta = { - description = "A C++ library to read and write the Apache Parquet columnar data format"; - homepage = http://parquet.apache.org; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index e73b1717331c..8ebb88fa6a73 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,8 +1,7 @@ -{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }: +{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, pkgconfig, setuptools_scm, six }: let - _arrow-cpp = arrow-cpp.override { inherit python;}; - _parquet-cpp = parquet-cpp.override { arrow-cpp = _arrow-cpp; }; + _arrow-cpp = arrow-cpp.override { inherit python; }; in buildPythonPackage rec { @@ -17,18 +16,11 @@ buildPythonPackage rec { checkInputs = [ pandas pytest pytestrunner JPype1 ]; PYARROW_BUILD_TYPE = "release"; - PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib"; - - preBuild = '' - substituteInPlace CMakeLists.txt --replace "\''${ARROW_ABI_VERSION}" '"0.0.0"' - substituteInPlace CMakeLists.txt --replace "\''${ARROW_SO_VERSION}" '"0"' - - # fix the hardcoded value - substituteInPlace cmake_modules/FindParquet.cmake --replace 'set(PARQUET_ABI_VERSION "1.0.0")' 'set(PARQUET_ABI_VERSION "${_parquet-cpp.version}")' - ''; + PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"; preCheck = '' rm pyarrow/tests/test_hdfs.py + rm pyarrow/tests/test_cuda.py # fails: "ArrowNotImplementedError: Unsupported numpy type 22" substituteInPlace pyarrow/tests/test_feather.py --replace "test_timedelta_with_nulls" "_disabled" @@ -47,7 +39,7 @@ buildPythonPackage rec { ''; ARROW_HOME = _arrow-cpp; - PARQUET_HOME = _parquet-cpp; + PARQUET_HOME = _arrow-cpp; setupPyBuildFlags = ["--with-parquet" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0abf0e608466..8fcf0baba02d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -207,6 +207,7 @@ mapAliases ({ openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 + parquet-cpp = arrow-cpp; # added 2018-09-08 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f4bc519285f..e05d180457ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11600,8 +11600,6 @@ with pkgs; paperkey = callPackage ../tools/security/paperkey { }; - parquet-cpp = callPackage ../development/libraries/parquet-cpp {}; - pangoxsl = callPackage ../development/libraries/pangoxsl { }; pcaudiolib = callPackage ../development/libraries/pcaudiolib { From fd9d45c7c146c6b7dc59f9ab950cac00ccb1ae1d Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Sun, 7 Oct 2018 21:54:34 +0000 Subject: [PATCH 587/992] pythonPackages.mypy_extensions: use typing from stdlib on >=3.5 It's not necessary to depend on the "typing" backport since it's in the standard library; I also observed serious breakage in anything using the typing module (including) when the backport was in the closure on >=3.5. --- pkgs/development/python-modules/mypy/extensions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix index f57ac12c0da8..36407fd684ae 100644 --- a/pkgs/development/python-modules/mypy/extensions.nix +++ b/pkgs/development/python-modules/mypy/extensions.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, typing, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }: buildPythonPackage rec { pname = "mypy_extensions"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "04h8brrbbx151dfa2cvvlnxgmb5wa00mhd2z7nd20s8kyibfkq1p"; }; - propagatedBuildInputs = [ typing ]; + propagatedBuildInputs = if pythonOlder "3.5" then [ typing ] else [ ]; meta = with stdenv.lib; { description = "Experimental type system extensions for programs checked with the mypy typechecker"; From fcbec42fc838d7bf99406796b41322be75f23717 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 5 Oct 2018 15:46:26 -0400 Subject: [PATCH 588/992] pythonPackages.histbook: init at 1.2.3 --- .../python-modules/histbook/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/histbook/default.nix diff --git a/pkgs/development/python-modules/histbook/default.nix b/pkgs/development/python-modules/histbook/default.nix new file mode 100644 index 000000000000..8c44bd3ebdae --- /dev/null +++ b/pkgs/development/python-modules/histbook/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, numpy, pandas }: + +buildPythonPackage rec { + pname = "histbook"; + version = "1.2.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "12d5l4c5pxwac5hzcfif51j87qjljm0w9nd0c8pnhj7q2snap4x4"; + }; + + propagatedBuildInputs = [ numpy pandas ]; + + meta = with lib; { + homepage = https://github.com/scikit-hep/histbook; + description = "Versatile, high-performance histogram toolkit for Numpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7136ce18d9da..27f6d3b0b9e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -356,6 +356,8 @@ in { habanero = callPackage ../development/python-modules/habanero { }; + histbook = callPackage ../development/python-modules/histbook { }; + httpsig = callPackage ../development/python-modules/httpsig { }; i3ipc = callPackage ../development/python-modules/i3ipc { }; From 24c6f141c2a5442853fd549f2b7f96492063fc13 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 2 Oct 2018 19:56:28 +0300 Subject: [PATCH 589/992] pythonPackages.XlsxWriter: 1.0.9 -> 1.1.1 --- pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 71229b886e7b..8b7caef8eda5 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "XlsxWriter"; - version = "1.0.9"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "98a94b32d4929d3e34595b4654b8e7f951182f540056b9cb734c88899912f729"; + sha256 = "15yhjbx1xwdbfkg0l1c1wgjayb55zgm8rywjymj655yaqiammm5r"; }; meta = { From 69af83b202743f53e7488d0167c712bb95efd612 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Fri, 21 Sep 2018 11:36:43 +0200 Subject: [PATCH 590/992] tensorflow: Add contrib/tensor_forest to rpath --- pkgs/development/python-modules/tensorflow/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index b09da2d4cecf..cad2a93640ae 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -72,7 +72,7 @@ in buildPythonPackage rec { ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn nvidia_x11 ]); in lib.optionalString (stdenv.isLinux) '' - rrPath="$out/${python.sitePackages}/tensorflow/:${rpath}" + rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}" internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so" find $out -name '*${stdenv.hostPlatform.extensions.sharedLibrary}' -exec patchelf --set-rpath "$rrPath" {} \; ''; From fc92b6167fa90a4116ce06c71cea1b1023a44156 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Tue, 9 Oct 2018 23:26:00 +0200 Subject: [PATCH 591/992] jameica: 2.8.1 -> 2.8.2 --- pkgs/applications/office/jameica/default.nix | 24 ++++++-------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 8d17ef2acaa4..61cc3ea78f05 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg, Cocoa }: +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let - _version = "2.8.1"; - _build = "449"; + _version = "2.8.2"; + _build = "450"; version = "${_version}-${_build}"; name = "jameica-${version}"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { inherit name version; - nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ]; + nativeBuildInputs = [ ant jdk makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; @@ -31,23 +31,13 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; - sha256 = "1w25lxjskn1yxllbv0vgvcc9f9xvgv9430dm4b59ia9baf98syd2"; + sha256 = "197n35lvx51k6cbp3fhndvfb38sikl4mjqcd42fgvn2khy2sij68"; }; # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries # and is not able to build the application itself buildPhase = '' - (cd build; ant init compile jar) - ''; - - # jameica itself loads ./plugin.xml to determine it's version. - # Unfortunately, the version attribute there seems to be wrong, - # so it thinks it's older than it really is, - # and refuses to load plugins destined for its version. - # Set version manually to workaround that. - postPatch = '' - xml ed -u '/system/@version' -v '${version}' plugin.xml > plugin.xml.new - mv plugin.xml.new plugin.xml + (cd build; ant -Dsystem.version=${version} init compile jar) ''; installPhase = '' @@ -73,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.willuhn.de/products/jameica/; - description = "Free Runtime Environment for Java Applications."; + description = "Free Runtime Environment for Java Applications"; longDescription = '' Runtime Environment for plugins like Hibiscus (HBCI Online Banking), SynTAX (accounting) and JVerein (club management). From 95db49f5c3f91dcc906103b2b78b3b4d43fbf671 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sat, 13 Oct 2018 10:44:56 +0200 Subject: [PATCH 592/992] go-sct: 20160529 -> 20180605 --- pkgs/tools/X11/go-sct/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index 189dc56975f3..c750a5ce1c66 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -1,16 +1,17 @@ -{ stdenv, xorg, buildGoPackage, fetchgit }: +{ stdenv, xorg, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "go-sct-${version}"; - version = "20160529-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "1d6b5e05a0b63bfeac9df55003efec352e1bc19d"; + version = "20180605-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "eb1e851f2d5017038d2b8e3653645c36d3a279f4"; goPackagePath = "github.com/d4l3k/go-sct"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/d4l3k/go-sct"; - sha256 = "1iqdagrq0j7sqxgsj31skgk73k2rbpbvj41v087af9103wf8h9z7"; + owner = "d4l3k"; + repo = "go-sct"; + sha256 = "16z2ml9x424cnliazyxlw7pm7q64pppjam3dnmq2xab0wlbbm3nm"; }; goDeps = ./deps.nix; @@ -20,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.linux; + maintainers = with maintainers; [ rvolosatovs cstrahan ]; + platforms = platforms.linux ++ platforms.windows; }; } From c15006d410d053da4a70e23e1d82d7b9a2928381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 13 Oct 2018 11:27:54 +0200 Subject: [PATCH 593/992] liblinear: 2.20 -> 2.21 (#48304) --- pkgs/development/libraries/liblinear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index ea05df45169f..5f295009b994 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "liblinear-${version}"; - version = "2.20"; + version = "2.21"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz"; - sha256 = "13q48azqy9pd8jyhk0c2hzj5xav1snbdrj8pp38vwrv2wwhfz7rz"; + sha256 = "0jp0z3s32czf748i6dnlabs1psqx1dcn9w96c56m24xq5l789chs"; }; buildPhase = '' From b6421bfec41c82d46350c9120decf0ca4f533b85 Mon Sep 17 00:00:00 2001 From: Ben Challenor Date: Sat, 13 Oct 2018 09:47:41 +0100 Subject: [PATCH 594/992] jenkins: add update script --- .../tools/continuous-integration/jenkins/update.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 pkgs/development/tools/continuous-integration/jenkins/update.sh diff --git a/pkgs/development/tools/continuous-integration/jenkins/update.sh b/pkgs/development/tools/continuous-integration/jenkins/update.sh new file mode 100755 index 000000000000..e8b6d9257758 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/jenkins/update.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts jq + +set -eu -o pipefail + +core_json="$(curl --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" + +version="$(jq -r .version <<<$core_json)" +sha256="$(jq -r .sha256 <<<$core_json)" +hash="$(nix-hash --type sha256 --to-base32 "$sha256")" +url="$(jq -r .url <<<$core_json)" + +update-source-version jenkins "$version" "$hash" "$url" From 88e7d7b350c4012f413c0a308e7248f15a6524ab Mon Sep 17 00:00:00 2001 From: Ben Challenor Date: Sat, 13 Oct 2018 09:55:29 +0100 Subject: [PATCH 595/992] jenkins: 2.138.1 -> 2.138.2 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index a6a6e9a11054..0f7fc4804906 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.138.1"; + version = "2.138.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "09svkqii9lv1br0al6wjn1l0fsqf6s7fdrfc0awmfsg8fmjlpf7c"; + sha256 = "10qyr8izngnhlr1b03a9vdnbmwprbqsjnd55hjdalmxy6dq5mvfq"; }; buildCommand = '' From 4283eca2658dfa9f208b4c2853ce06440bd878d2 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sat, 13 Oct 2018 11:55:26 +0200 Subject: [PATCH 596/992] teamspeak_server: 3.3.0 -> 3.4.0 --- .../networking/instant-messengers/teamspeak/server.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index bd1346b12194..e3566c50962b 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.3.0"; + version = "3.4.0"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "1jv5c1br3ypxz8px7fl5rg75j0kfdg8mqasdk2gka6yvgf7qc97i" - else "0m889xl9iz3fmq7wyjjn42swprpspagbkn52a82nzkhgvagd45bz"; + then "12wis5sbbx502g86irhi3g2gvpczbxzjw7z0lw9rk7jagplwhvkx" + else "01ajiqizy4f8niqipxccimvvsqlfypr4a28rwxk6zran7m1kjpp6"; }; buildInputs = [ makeWrapper ]; From 7472c5477a7f37355867d8d3caf836fae257835d Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 5 Oct 2018 00:56:01 +0000 Subject: [PATCH 597/992] luigi: init at 2.7.9 --- .../networking/cluster/luigi/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/networking/cluster/luigi/default.nix diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix new file mode 100644 index 000000000000..ced7b9882b9c --- /dev/null +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -0,0 +1,32 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "luigi"; + version = "2.7.9"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x"; + }; + + # Relax version constraint + postPatch = '' + sed -i 's/<2.2.0//' setup.py + ''; + + propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ]; + + # Requires tox, hadoop, and google cloud + doCheck = false; + + meta = with lib; { + homepage = https://github.com/spotify/luigi; + description = "Python package that helps you build complex pipelines of batch jobs"; + longDescription = '' + Luigi handles dependency resolution, workflow management, visualization, + handling failures, command line integration, and much more. + ''; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e05d180457ec..ee6dcbb74be8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -736,6 +736,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; + luigi = callPackage ../applications/networking/cluster/luigi { }; + m-cli = callPackage ../os-specific/darwin/m-cli { }; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; From b73579e5f16064e235d460aeaa6e5dffef645dcd Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 4 Oct 2018 14:57:07 +0200 Subject: [PATCH 598/992] taskell: init at 1.3.2 Signed-off-by: Matthias Beyer Suggested-by: Profpatsch --- pkgs/applications/misc/taskell/default.nix | 59 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/applications/misc/taskell/default.nix diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix new file mode 100644 index 000000000000..6cb78e6d6bd7 --- /dev/null +++ b/pkgs/applications/misc/taskell/default.nix @@ -0,0 +1,59 @@ +{ haskell, lib, haskellPackages, fetchFromGitHub }: + +let + version = "1.3.2"; + sha256 = "0cyysvkl8m1ldlprmw9mpvch3r244nl25yv74dwcykga3g5mw4aa"; + +in (haskellPackages.mkDerivation { + pname = "taskell"; + inherit version; + + src = fetchFromGitHub { + owner = "smallhadroncollider"; + repo = "taskell"; + rev = version; + inherit sha256; + }; + + postPatch = ''${haskellPackages.hpack}/bin/hpack''; + + # basically justStaticExecutables; TODO: use justStaticExecutables + enableSharedExecutables = false; + enableLibraryProfiling = false; + isExecutable = true; + doHaddock = false; + postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; + + # copied from packages.yaml + libraryHaskellDepends = with haskellPackages; [ + classy-prelude + # base <=5 + aeson + brick + # bytestring + config-ini + # containers + # directory + file-embed + http-conduit + http-client + http-types + lens + # mtl + # template-haskell + # text + time + vty + ]; + + executableHaskellDepends = []; + + testHaskellDepends = with haskellPackages; [ + tasty + tasty-discover + tasty-expected-failure + tasty-hunit + ]; + + license = lib.licenses.bsd3; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e05d180457ec..8a2e972ef2c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18993,6 +18993,8 @@ with pkgs; teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; + taskell = callPackage ../applications/misc/taskell { }; + taskjuggler = callPackage ../applications/misc/taskjuggler { }; tasknc = callPackage ../applications/misc/tasknc { }; From 80651cff84da00f04262cd9c69968e13ca261de9 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 4 Oct 2018 21:26:03 -0400 Subject: [PATCH 599/992] pythonPackages.eradicate: init at 0.2.1 --- .../python-modules/eradicate/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/eradicate/default.nix diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix new file mode 100644 index 000000000000..7c071a5cee6b --- /dev/null +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "eradicate"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "092zmck919bn6sl31ixrzhn88g9nvhwzmwzpq8dzgn6c8k2h3bzr"; + }; + + meta = with lib; { + description = "eradicate removes commented-out code from Python files."; + homepage = https://github.com/myint/eradicate; + license = [ licenses.mit ]; + + maintainers = [ maintainers.mmlb ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27f6d3b0b9e4..4c66fd52d43b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -324,6 +324,8 @@ in { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + eradicate = callPackage ../development/python-modules/eradicate { }; + fido2 = callPackage ../development/python-modules/fido2 { }; filterpy = callPackage ../development/python-modules/filterpy { }; From 123e3a7e9d8704d79a71ee27d31cfe0ecb72e376 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 4 Oct 2018 21:27:47 -0400 Subject: [PATCH 600/992] pythonPackages.pylama: 7.4.3 -> 7.5.5 --- .../python-modules/pylama/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index c4ef98b43ef6..c463ab8823c8 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -1,22 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, mccabe, pycodestyle, pydocstyle, pyflakes +{ lib, buildPythonPackage, fetchPypi +, eradicate, mccabe, pycodestyle, pydocstyle, pyflakes , pytest, ipdb }: buildPythonPackage rec { pname = "pylama"; - version = "7.4.3"; + version = "7.5.5"; src = fetchPypi { inherit pname version; - sha256 = "390c1dab1daebdf3d6acc923e551b035c3faa77d8b96b98530c230493f9ec712"; + sha256 = "1zg7wca9s5srvbj3kawalv4438l47hg7m6gaw8rd4i43lbyyqya6"; }; - patches = fetchpatch { - url = "${meta.homepage}/pull/116.patch"; - sha256 = "00jz5k2w0xahs1m3s603j6l4cwzz92qsbbk81fh17nq0f47999mv"; - }; - - propagatedBuildInputs = [ mccabe pycodestyle pydocstyle pyflakes ]; + propagatedBuildInputs = [ + eradicate + mccabe + pycodestyle + pydocstyle + pyflakes + ]; checkInputs = [ pytest ipdb ]; @@ -27,7 +28,7 @@ buildPythonPackage rec { description = "Code audit tool for python"; homepage = https://github.com/klen/pylama; # ambiguous license declarations: https://github.com/klen/pylama/issues/64 - license = licenses.lgpl3; + license = [ licenses.lgpl3 ]; maintainers = with maintainers; [ dotlambda ]; }; } From 12d9443a66248165e49322ff67a16b7d7c0bbed6 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Wed, 26 Sep 2018 13:55:56 +0200 Subject: [PATCH 601/992] wineStable: 3.0.2 -> 3.0.3 --- pkgs/misc/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index b1af27807316..214d259f9c1f 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "3.0.2"; + version = "3.0.3"; url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz"; - sha256 = "1zv3nk31s758ghp4795ym3w8l5868c2dllmjx9245qh9ahvp3mya"; + sha256 = "18add8wqqz7y1aj8x0dcba7pqj9jkbhngwjv4yjmar3gxacmjr7b"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { From c73ed9625bfcb9b4726cc4468b8c557c6e6f530d Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Wed, 26 Sep 2018 16:24:14 +0200 Subject: [PATCH 602/992] wine: use current flex --- pkgs/misc/emulators/wine/base.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index d56a485c1529..f87f8eab9849 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -1,7 +1,6 @@ { stdenv, lib, pkgArches, name, version, src, monos, geckos, platforms, - # flex 2.6.3 causes: undefined reference to `yywrap' - pkgconfig, fontforge, makeWrapper, flex_2_6_1, bison, + pkgconfig, fontforge, makeWrapper, flex, bison, supportFlags, buildScript ? null, configureFlags ? [] }: @@ -14,7 +13,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { inherit name src configureFlags; nativeBuildInputs = [ - pkgconfig fontforge makeWrapper flex_2_6_1 bison + pkgconfig fontforge makeWrapper flex bison ]; buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: From bae3fd3d83cc9f227ae7974c32506afdda103ea6 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Sat, 13 Oct 2018 13:05:34 +0200 Subject: [PATCH 603/992] vulkan-loader: update to match vulkan-headers at 1.1.85 --- pkgs/development/libraries/vulkan-loader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 5ffdc4375373..ad110817fea1 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: -let version = "1.1.82.0"; in +let version = "1.1.85"; in assert version == vulkan-headers.version; stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; From a1b4859d1b560ec1b61bad16db4f6bf0e7a3f0d2 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Sat, 13 Oct 2018 13:09:20 +0200 Subject: [PATCH 604/992] wine: 3.17 -> 3.18 (unstable and staging) --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 214d259f9c1f..78e4faf433c1 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.17"; + version = "3.18"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "08fcziadw40153a9rv630m7iz6ipfzylms5y191z4sj2vvhy5vac"; + sha256 = "0xqs76hxcym8nb95r7l72xx0msbscp7fhkr1wrv4r0923d5x9s4v"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - sha256 = "1ds9q90xjg59ikic98kqkhmijnqx4yplvwsm6rav4mx72yci7d4w"; + sha256 = "18g1lmqzkc7ngppynimfvza1gkdhqlnjbvnckmaws847ns4i0kzp"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 011a463d17031c0c5d54710cef90d48f0de0b9d8 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 6 Oct 2018 19:34:30 +0000 Subject: [PATCH 605/992] wireguard: 0.0.20180925 -> 0.0.20181006 --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 493f52bd11b1..048748b9fea3 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180925"; + version = "0.0.20181006"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "10k63ld0f5q5aykpcrg9m3xmrsf3qmlkvhiv18q73hnky2cjfx62"; + sha256 = "0283slpyqb8d4cx9wyahqmqi4lwhzamc4i2710zid5y71vjgsgw3"; }; sourceRoot = "source/src/tools"; From fed0a4ec94cacca2ebec9b6f2929d65bac0e60cd Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 13 Oct 2018 12:26:42 +0000 Subject: [PATCH 606/992] wireguard-go: 0.0.20180613 -> 0.0.20181001 --- pkgs/tools/networking/wireguard-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index c6b8cb242fdc..a6a32ccf12ad 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "wireguard-go-${version}"; - version = "0.0.20180613"; + version = "0.0.20181001"; goPackagePath = "git.zx2c4.com/wireguard-go"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "0pvg7s1kyn48az54lsnyn1ryhjk0flmpz5dx520rc94g6xn88fic"; + sha256 = "0yh9f58xn8kcq3wgx2s8j19k2h1vbmg70fn5gvw9k98f5mzynls3"; }; goDeps = ./deps.nix; From dee07afe96d559929b74a6720972af556c1edd17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 05:44:31 -0700 Subject: [PATCH 607/992] urh: 2.2.4 -> 2.3.0 (#47715) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/urh/versions --- pkgs/applications/misc/urh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index c5e8d1e24560..dba492ca8dd1 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "1afmja4cffyw0ipx7zm93wvjmz0v5ccl7vcw2r18kdzrs1mr99zl"; + sha256 = "1n105lwz8w5fiw93w9amasq0f4gknihl3x9kj0q77lw7ha1lvdfz"; }; buildInputs = [ hackrf rtl-sdr ]; From 972aa96f27ae9a5c7d02010f3ca040caafe772a2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 13 Oct 2018 14:13:58 +0200 Subject: [PATCH 608/992] tdesktop: 1.4.2 -> 1.4.3 tdesktopPackages.preview: 1.4.2 -> 1.4.3 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 56bf7ee078db..03a99aea4001 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.4.2"; - sha256Hash = "025qld597b6x7wbf1y1qpcsz0brpf3qsqj650mq9fpps1yi1vfk7"; + version = "1.4.3"; + sha256Hash = "1pvjvndqc7ylgc8ihf20fl1vb1x6fj7ywl6p1fr16j683vhdcml8"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "388730"; archPatchesHash = "1gvisz36bc6bl4zcpjyyk0a2dl6ixp65an8wgm2lkc9mhkl783q7"; From ac6f4851480e3a7016a2257a62c34ed46dcea789 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 13 Oct 2018 15:02:15 +0200 Subject: [PATCH 609/992] Revert "vulkan-headers: 1.1.82.0 -> 1.1.85 (#47702)" This reverts commit e6b0646b3b5decaaf9a6b7fe5f59cb98f865d25f. The bump broke vulkan-loader (eval error). --- pkgs/development/libraries/vulkan-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index dd3f14f91928..2a07eba261b7 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "vulkan-headers-${version}"; - version = "1.1.85"; + version = "1.1.82.0"; buildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb"; + sha256 = "1pp0kmgd89g8rz6qqfqmdmv209s0d6hbsshrzrlwrdm6dc25f20p"; }; meta = with stdenv.lib; { From 4eee2cd0e03657dfb39e3e7c93460442e3d2d86c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 21 Aug 2018 21:05:20 +0200 Subject: [PATCH 610/992] nixos/znc: move to own folder Move legacy options to separate file --- nixos/modules/module-list.nix | 2 +- .../services/networking/znc/default.nix | 170 ++++++++++++++++++ .../networking/{znc.nix => znc/options.nix} | 153 +--------------- 3 files changed, 175 insertions(+), 150 deletions(-) create mode 100644 nixos/modules/services/networking/znc/default.nix rename nixos/modules/services/networking/{znc.nix => znc/options.nix} (61%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f55c32fa511d..290db674c68e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -634,7 +634,7 @@ ./services/networking/zerobin.nix ./services/networking/zeronet.nix ./services/networking/zerotierone.nix - ./services/networking/znc.nix + ./services/networking/znc/default.nix ./services/printing/cupsd.nix ./services/scheduling/atd.nix ./services/scheduling/chronos.nix diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix new file mode 100644 index 000000000000..e2526550caf3 --- /dev/null +++ b/nixos/modules/services/networking/znc/default.nix @@ -0,0 +1,170 @@ +{ config, lib, pkgs, ...}: + +with lib; + +let + cfg = config.services.znc; + + defaultUser = "znc"; # Default user to own process. + + modules = pkgs.buildEnv { + name = "znc-modules"; + paths = cfg.modulePackages; + }; + +in + +{ + + imports = [ + ./options.nix + ]; + + ###### Interface + + options = { + services.znc = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enable a ZNC service for a user. + ''; + }; + + user = mkOption { + default = "znc"; + example = "john"; + type = types.string; + description = '' + The name of an existing user account to use to own the ZNC server process. + If not specified, a default user will be created to own the process. + ''; + }; + + group = mkOption { + default = ""; + example = "users"; + type = types.string; + description = '' + Group to own the ZNCserver process. + ''; + }; + + dataDir = mkOption { + default = "/var/lib/znc/"; + example = "/home/john/.znc/"; + type = types.path; + description = '' + The data directory. Used for configuration files and modules. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open ports in the firewall for ZNC. + ''; + }; + + modulePackages = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExample "[ pkgs.zncModules.fish pkgs.zncModules.push ]"; + description = '' + A list of global znc module packages to add to znc. + ''; + }; + + mutable = mkOption { + default = true; + type = types.bool; + description = '' + Indicates whether to allow the contents of the `dataDir` directory to be changed + by the user at run-time. + If true, modifications to the ZNC configuration after its initial creation are not + overwritten by a NixOS system rebuild. + If false, the ZNC configuration is rebuilt by every system rebuild. + If the user wants to manage the ZNC service using the web admin interface, this value + should be set to true. + ''; + }; + + extraFlags = mkOption { + default = [ ]; + example = [ "--debug" ]; + type = types.listOf types.str; + description = '' + Extra flags to use when executing znc command. + ''; + }; + }; + }; + + + ###### Implementation + + config = mkIf cfg.enable { + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ ]; # TODO: Add port + }; + + systemd.services.znc = { + description = "ZNC Server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.service" ]; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Restart = "always"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; + }; + preStart = '' + ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/configs + + # If mutable, regenerate conf file every time. + ${optionalString (!cfg.mutable) '' + ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated." + ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf + ''} + + # Ensure essential files exist. + if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then + ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now." + ${pkgs.coreutils}/bin/cp --no-clobber ${/* TODO */"zncConfFile"} ${cfg.dataDir}/configs/znc.conf + ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf + ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf + fi + + if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then + ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now." + ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir} + fi + + # Symlink modules + rm ${cfg.dataDir}/modules || true + ln -fs ${modules}/lib/znc ${cfg.dataDir}/modules + ''; + script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}"; + }; + + users.users = optional (cfg.user == defaultUser) + { name = defaultUser; + description = "ZNC server daemon owner"; + group = defaultUser; + uid = config.ids.uids.znc; + home = cfg.dataDir; + createHome = true; + }; + + users.groups = optional (cfg.user == defaultUser) + { name = defaultUser; + gid = config.ids.gids.znc; + members = [ defaultUser ]; + }; + + }; +} diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc/options.nix similarity index 61% rename from nixos/modules/services/networking/znc.nix rename to nixos/modules/services/networking/znc/options.nix index f817db2ad000..ce5ca0a9a3b6 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc/options.nix @@ -1,11 +1,10 @@ -{ config, lib, pkgs, ...}: +{ lib, config, ... }: with lib; let - cfg = config.services.znc; - defaultUser = "znc"; # Default user to own process. + cfg = config.services.znc; # Default user and pass: # un=znc @@ -20,11 +19,6 @@ let "; - modules = pkgs.buildEnv { - name = "znc-modules"; - paths = cfg.modulePackages; - }; - # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`. mkZncConf = confOpts: '' Version = 1.6.3 @@ -70,7 +64,7 @@ let else mkZncConf cfg.confOptions; }; - networkOpts = { ... }: { + networkOpts = { options = { server = mkOption { type = types.str; @@ -176,49 +170,6 @@ in options = { services.znc = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable a ZNC service for a user. - ''; - }; - - user = mkOption { - default = "znc"; - example = "john"; - type = types.string; - description = '' - The name of an existing user account to use to own the ZNC server process. - If not specified, a default user will be created to own the process. - ''; - }; - - group = mkOption { - default = ""; - example = "users"; - type = types.string; - description = '' - Group to own the ZNCserver process. - ''; - }; - - dataDir = mkOption { - default = "/var/lib/znc/"; - example = "/home/john/.znc/"; - type = types.path; - description = '' - The data directory. Used for configuration files and modules. - ''; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = '' - Whether to open ports in the firewall for ZNC. - ''; - }; zncConf = mkOption { default = ""; @@ -231,6 +182,7 @@ in ''; }; + confOptions = { modules = mkOption { type = types.listOf types.str; @@ -329,103 +281,6 @@ in }; }; - modulePackages = mkOption { - type = types.listOf types.package; - default = [ ]; - example = literalExample "[ pkgs.zncModules.fish pkgs.zncModules.push ]"; - description = '' - A list of global znc module packages to add to znc. - ''; - }; - - mutable = mkOption { - default = true; - type = types.bool; - description = '' - Indicates whether to allow the contents of the `dataDir` directory to be changed - by the user at run-time. - If true, modifications to the ZNC configuration after its initial creation are not - overwritten by a NixOS system rebuild. - If false, the ZNC configuration is rebuilt by every system rebuild. - If the user wants to manage the ZNC service using the web admin interface, this value - should be set to true. - ''; - }; - - extraFlags = mkOption { - default = [ ]; - example = [ "--debug" ]; - type = types.listOf types.str; - description = '' - Extra flags to use when executing znc command. - ''; - }; }; }; - - - ###### Implementation - - config = mkIf cfg.enable { - - networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.confOptions.port ]; - }; - - systemd.services.znc = { - description = "ZNC Server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.service" ]; - serviceConfig = { - User = cfg.user; - Group = cfg.group; - Restart = "always"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; - }; - preStart = '' - ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/configs - - # If mutable, regenerate conf file every time. - ${optionalString (!cfg.mutable) '' - ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated." - ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf - ''} - - # Ensure essential files exist. - if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then - ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now." - ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf - ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf - ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf - fi - - if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then - ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now." - ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir} - fi - - # Symlink modules - rm ${cfg.dataDir}/modules || true - ln -fs ${modules}/lib/znc ${cfg.dataDir}/modules - ''; - script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}"; - }; - - users.users = optional (cfg.user == defaultUser) - { name = defaultUser; - description = "ZNC server daemon owner"; - group = defaultUser; - uid = config.ids.uids.znc; - home = cfg.dataDir; - createHome = true; - }; - - users.groups = optional (cfg.user == defaultUser) - { name = defaultUser; - gid = config.ids.gids.znc; - members = [ defaultUser ]; - }; - - }; } From 7e615310f7085d0083e76799ac281f0fae91b0b1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 13 Oct 2018 14:57:16 +0200 Subject: [PATCH 611/992] android-studio: 3.2.0.26 -> 3.2.1.0 androidStudioPackages.beta: 3.2.0.26 -> 3.2.1.0 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 051078e1f5a1..51ecfc0866e4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.2.0.26"; # "Android Studio 3.2.0" - build = "181.5014246"; - sha256Hash = "0v1a3b0n8dq5p8f6jap2ypqw724v61ki31qhqmh9hn36mn6d8wg6"; + version = "3.2.1.0"; # "Android Studio 3.2.1" + build = "181.5056338"; + sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r"; }; betaVersion = stableVersion; latestVersion = { # canary & dev From ef54c618dc7af978e875704b0142d3d1e8b96f29 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 13 Oct 2018 13:22:18 +0000 Subject: [PATCH 612/992] COPYING: move notice to README.md --- COPYING | 9 --------- README.md | 6 ++++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/COPYING b/COPYING index 198597a1b410..7c52fb768978 100644 --- a/COPYING +++ b/COPYING @@ -18,12 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -====================================================================== - -Note: the license above does not apply to the packages built by the -Nix Packages collection, merely to the package descriptions (i.e., Nix -expressions, build scripts, etc.). It also might not apply to patches -included in Nixpkgs, which may be derivative works of the packages to -which they apply. The aforementioned artifacts are all covered by the -licenses of the respective packages. diff --git a/README.md b/README.md index 144a23027db9..278ef66cf7e8 100644 --- a/README.md +++ b/README.md @@ -39,3 +39,9 @@ Communication: * [Discourse Forum](https://discourse.nixos.org/) * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) + +Note: MIT license does not apply to the packages built by Nixpkgs, merely to +the package descriptions (Nix expressions, build scripts, and so on). It also +might not apply to patches included in Nixpkgs, which may be derivative works +of the packages to which they apply. The aforementioned artifacts are all +covered by the licenses of the respective packages. From b13a6b6791def7d50931015db6413f11c85262ab Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 13 Oct 2018 15:38:57 +0200 Subject: [PATCH 613/992] guile-cairo: 1.4.1 -> 1.10.0 --- .../development/guile-modules/guile-cairo/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 32a22566bdb1..4bd49b06796d 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { name = "guile-cairo-${version}"; - version = "1.4.1"; + version = "1.10.0"; src = fetchurl { - url = "http://download.gna.org/guile-cairo/${name}.tar.gz"; - sha256 = "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x"; + url = "mirror://savannah/guile-cairo/${name}.tar.gz"; + sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile cairo expat ]; - checkInputs = [ guile-lib ]; + enableParallelBuilding = true; doCheck = true; + checkInputs = [ guile-lib ]; meta = with stdenv.lib; { description = "Cairo bindings for GNU Guile"; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment. ''; - homepage = "http://home.gna.org/guile-cairo/"; + homepage = https://www.nongnu.org/guile-cairo/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c9bdd844033..626f75abd130 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7939,9 +7939,7 @@ with pkgs; jython = callPackage ../development/interpreters/jython {}; - guile-cairo = callPackage ../development/guile-modules/guile-cairo { - guile = guile_2_0; - }; + guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; From 97d2779059869653e2d97ed46da16842046eff81 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 13 Oct 2018 15:44:18 +0200 Subject: [PATCH 614/992] wireguard: 0.0.20181006 -> 0.0.20181007 --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 048748b9fea3..33b62d1bb380 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20181006"; + version = "0.0.20181007"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0283slpyqb8d4cx9wyahqmqi4lwhzamc4i2710zid5y71vjgsgw3"; + sha256 = "1nrhwnccs6sqq1qs7yhxqb989inrc9n2saibpqs6ga6gb0pvpac6"; }; sourceRoot = "source/src/tools"; From 49284e4a00a1b8a93d1ae93896f3856c98f5f266 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 07:41:54 -0700 Subject: [PATCH 615/992] goxel: 0.8.0 -> 0.8.1 (#47789) * goxel: 0.8.0 -> 0.8.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/goxel/versions * goxel: build only on x86_64-linux --- pkgs/applications/graphics/goxel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 99230eb23e32..27dd37d1803a 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "goxel-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "01022c43pmwiqb18rx9fz08xr99h6p03gw6bp0lay5z61g3xkz17"; + sha256 = "0g6jkihjmsx6lyfl301qrq26gwvq89sk7xkkba6vrpklfs2jafkb"; }; patches = [ ./disable-imgui_ini.patch ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open Source 3D voxel editor"; homepage = https://guillaumechereau.github.io/goxel/; license = licenses.gpl3; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; # see https://github.com/guillaumechereau/goxel/issues/125 maintainers = with maintainers; [ tilpner ]; }; } From e4e160cc3990584bf3472d8df76d6cb3deb38b47 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Sat, 4 Aug 2018 17:35:05 +0900 Subject: [PATCH 616/992] nixos/shells: do not override user-defined shell aliases --- nixos/modules/config/shells-environment.nix | 9 +++++++-- nixos/modules/programs/shell.nix | 6 ------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 555db459f57a..a279120e125d 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -108,14 +108,13 @@ in }; environment.shellAliases = mkOption { - default = {}; example = { ll = "ls -l"; }; description = '' An attribute set that maps aliases (the top level attribute names in this option) to command strings or directly to build outputs. The aliases are added to all users' shells. ''; - type = types.attrs; # types.attrsOf types.stringOrPath; + type = with types; attrsOf (either str path); }; environment.binsh = mkOption { @@ -157,6 +156,12 @@ in # terminal instead of logging out of X11). environment.variables = config.environment.sessionVariables; + environment.shellAliases = mapAttrs (name: mkDefault) { + ls = "ls --color=tty"; + ll = "ls -l"; + l = "ls -alh"; + }; + environment.etc."shells".text = '' ${concatStringsSep "\n" (map utils.toShellPath cfg.shells)} diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix index 944a8bdf16fc..6aa0262e3a4c 100644 --- a/nixos/modules/programs/shell.nix +++ b/nixos/modules/programs/shell.nix @@ -8,12 +8,6 @@ with lib; config = { - environment.shellAliases = - { ls = "ls --color=tty"; - ll = "ls -l"; - l = "ls -alh"; - }; - environment.shellInit = '' # Set up the per-user profile. From 3b5449b80c1840aeb07322fbd3c37f8a80d11958 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Sat, 4 Aug 2018 12:32:30 +0900 Subject: [PATCH 617/992] nixos/shells: programs.*sh.shellAliases override environment.shellAliases --- nixos/modules/programs/bash/bash.nix | 10 ++++++---- nixos/modules/programs/fish.nix | 10 ++++++---- nixos/modules/programs/zsh/zsh.nix | 9 +++++---- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index f664e2225550..aa524a333ee6 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -59,12 +59,12 @@ in */ shellAliases = mkOption { - default = config.environment.shellAliases; + default = {}; description = '' - Set of aliases for bash shell. See - for an option format description. + Set of aliases for bash shell, which overrides . + See for an option format description. ''; - type = types.attrs; # types.attrsOf types.stringOrPath; + type = with types; attrsOf (either str path); }; shellInit = mkOption { @@ -125,6 +125,8 @@ in programs.bash = { + shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + shellInit = '' if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then . ${config.system.build.setEnvironment} diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 5948fe11f92b..82af9ecc5611 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -53,12 +53,12 @@ in }; shellAliases = mkOption { - default = config.environment.shellAliases; + default = {}; description = '' - Set of aliases for fish shell. See - for an option format description. + Set of aliases for fish shell, which overrides . + See for an option format description. ''; - type = types.attrs; + type = with types; attrsOf (either str path); }; shellInit = mkOption { @@ -99,6 +99,8 @@ in config = mkIf cfg.enable { + programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit; environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit; environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit; diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 865d148c1629..66ca5e5d4eb5 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -34,13 +34,12 @@ in }; shellAliases = mkOption { - default = config.environment.shellAliases; + default = {}; description = '' - Set of aliases for zsh shell. Overrides the default value taken from - . + Set of aliases for zsh shell, which overrides . See for an option format description. ''; - type = types.attrs; # types.attrsOf types.stringOrPath; + type = with types; attrsOf (either str path); }; shellInit = mkOption { @@ -106,6 +105,8 @@ in config = mkIf cfg.enable { + programs.zsh.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + environment.etc."zshenv".text = '' # /etc/zshenv: DO NOT EDIT -- this file has been generated automatically. From c941577dcb68ad413853ae744a458555b3209c21 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 12 Oct 2018 22:58:35 +0900 Subject: [PATCH 618/992] nixos/shells: enable to nullify already defined aliases --- nixos/modules/config/shells-environment.nix | 5 +++-- nixos/modules/programs/bash/bash.nix | 5 +++-- nixos/modules/programs/fish.nix | 5 +++-- nixos/modules/programs/zsh/zsh.nix | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index a279120e125d..6379b52870ea 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -108,13 +108,14 @@ in }; environment.shellAliases = mkOption { - example = { ll = "ls -l"; }; + example = { l = null; ll = "ls -l"; }; description = '' An attribute set that maps aliases (the top level attribute names in this option) to command strings or directly to build outputs. The aliases are added to all users' shells. + Aliases mapped to null are ignored. ''; - type = with types; attrsOf (either str path); + type = with types; attrsOf (nullOr (either str path)); }; environment.binsh = mkOption { diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index aa524a333ee6..0fbc77ea44cf 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -33,7 +33,8 @@ let ''; bashAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases + mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") + (filterAttrs (k: v: !isNull v) cfg.shellAliases) ); in @@ -64,7 +65,7 @@ in Set of aliases for bash shell, which overrides . See for an option format description. ''; - type = with types; attrsOf (either str path); + type = with types; attrsOf (nullOr (either str path)); }; shellInit = mkOption { diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 82af9ecc5611..b38af07b92c3 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -9,7 +9,8 @@ let cfg = config.programs.fish; fishAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") cfg.shellAliases + mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") + (filterAttrs (k: v: !isNull v) cfg.shellAliases) ); in @@ -58,7 +59,7 @@ in Set of aliases for fish shell, which overrides . See for an option format description. ''; - type = with types; attrsOf (either str path); + type = with types; attrsOf (nullOr (either str path)); }; shellInit = mkOption { diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 66ca5e5d4eb5..164d8db5859a 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -11,7 +11,8 @@ let cfg = config.programs.zsh; zshAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases + mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") + (filterAttrs (k: v: !isNull v) cfg.shellAliases) ); in @@ -39,7 +40,7 @@ in Set of aliases for zsh shell, which overrides . See for an option format description. ''; - type = with types; attrsOf (either str path); + type = with types; attrsOf (nullOr (either str path)); }; shellInit = mkOption { From a1825aecfcbf4605047cbb0cb33241e25dcd0b38 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Tue, 15 May 2018 15:30:54 +0200 Subject: [PATCH 619/992] nixos/matomo: introduce services.matomo.package option --- nixos/doc/manual/release-notes/rl-1903.xml | 6 +++++- nixos/modules/services/web-apps/matomo.nix | 15 +++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 1f26d4765b97..ef17f104ff1e 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -117,7 +117,11 @@ - + + The module gained the option + which determines the used + Matomo version. + diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index fbbd7715c6b3..9fddf8320748 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -34,6 +34,13 @@ in { ''; }; + package = mkOption { + type = types.package; + description = "Matomo package to use"; + default = pkgs.matomo; + defaultText = "pkgs.matomo"; + }; + webServerUser = mkOption { type = types.nullOr types.str; default = null; @@ -124,7 +131,7 @@ in { # the update part of the script can only work if the database is already up and running requires = [ databaseService ]; after = [ databaseService ]; - path = [ pkgs.matomo ]; + path = [ cfg.package ]; serviceConfig = { Type = "oneshot"; User = user; @@ -151,7 +158,7 @@ in { # Use User-Private Group scheme to protect matomo data, but allow administration / backup via matomo group # Copy config folder chmod g+s "${dataDir}" - cp -r "${pkgs.matomo}/config" "${dataDir}/" + cp -r "${cfg.package}/config" "${dataDir}/" chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" # check whether user setup has already been done @@ -164,7 +171,7 @@ in { systemd.services.${phpExecutionUnit} = { # stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart - restartTriggers = [ pkgs.matomo ]; + restartTriggers = [ cfg.package ]; # stop config.ini.php from getting written with read permission for others serviceConfig.UMask = "0007"; }; @@ -195,7 +202,7 @@ in { "${user}.${fqdn}" = mkMerge [ cfg.nginx { # don't allow to override the root easily, as it will almost certainly break matomo. # disadvantage: not shown as default in docs. - root = mkForce "${pkgs.matomo}/share"; + root = mkForce "${cfg.package}/share"; # define locations here instead of as the submodule option's default # so that they can easily be extended with additional locations if required From 45351e6916ac56a04b633b445e5f42a357d0437e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 13 Oct 2018 16:14:09 +0000 Subject: [PATCH 620/992] Revert "Revert "vulkan-headers: 1.1.82.0 -> 1.1.85 (#47702)"" This reverts commit ac6f4851480e3a7016a2257a62c34ed46dcea789. vulkan-loader bump: bae3fd3d83cc9f227ae7974c32506afdda103ea6. --- pkgs/development/libraries/vulkan-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 2a07eba261b7..dd3f14f91928 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "vulkan-headers-${version}"; - version = "1.1.82.0"; + version = "1.1.85"; buildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "1pp0kmgd89g8rz6qqfqmdmv209s0d6hbsshrzrlwrdm6dc25f20p"; + sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb"; }; meta = with stdenv.lib; { From 3ad8afbf3e5cda12b402fa0ee80241741c8cf4cb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 13 Oct 2018 12:40:53 -0400 Subject: [PATCH 621/992] linux: 4.4.160 -> 4.4.161 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 39e96d4b5dc2..641e368f74e6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.160"; + version = "4.4.161"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i0wqccab2xxjsx58pgzgbmm5cclfd3hh3yjasnfrqsdaarxvgkd"; + sha256 = "11rz66qvbcb6y3fz9k04jzn547sqdahqknd43imsr9sjgkaq60xy"; }; } // (args.argsOverride or {})) From b4d4affe41285fb47ed6d9f57967c7998b91439d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 13 Oct 2018 12:41:07 -0400 Subject: [PATCH 622/992] linux: 4.9.132 -> 4.9.133 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 24c11fca7935..cdf7000fba89 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, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.132"; + version = "4.9.133"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lz53r6p293y5fwx7pz9ymj9sss3wmip8hcc48zwkcwm8phnmrk7"; + sha256 = "0qv5n8vipkqcd0hpf5l41h023n46rgja39h895phlcxs4p00ywsk"; }; } // (args.argsOverride or {})) From 43d8a40653c66ab72836d54a721d75db7728df8a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 13 Oct 2018 12:41:16 -0400 Subject: [PATCH 623/992] linux: 4.14.75 -> 4.14.76 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 9afc81eddf52..60b3ffb2d8dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.75"; + version = "4.14.76"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "084176rl51ls0dhy39vpj9fhasm4436iqv6aa0s5a74g1cixg4sh"; + sha256 = "1gl2wkq4sazvpr0xnn4vrajj3j7w6hfiwdiy34y7jhlazyj1jgzf"; }; } // (args.argsOverride or {})) From 0ba1f0aa727bb76aa4ebc76a42ee3fb78844b932 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 13 Oct 2018 12:41:21 -0400 Subject: [PATCH 624/992] linux: 4.18.13 -> 4.18.14 --- pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 2b65ed377ffc..9bf33c068b55 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.13"; + version = "4.18.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0l4n72gajgw2vqghl6ps0yjy1safnypyzkcp841zkkwinp3a31yw"; + sha256 = "1lv2hpxzlk1yzr5dcjb0q0ylvlwx4ln2jvfvf01b9smr1lvd3iin"; }; } // (args.argsOverride or {})) From 994b84d816b76425964cabdbee334b52aa151d52 Mon Sep 17 00:00:00 2001 From: "nagato.pain" Date: Sat, 13 Oct 2018 10:12:58 -0700 Subject: [PATCH 625/992] pythonPackages.helper: 2.4.1 -> 2.4.2 | cleanup --- .../python-modules/helper/default.nix | 24 +++++++++++++++++ pkgs/top-level/python-packages.nix | 27 ++----------------- 2 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/python-modules/helper/default.nix diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix new file mode 100644 index 000000000000..15dadd0bf114 --- /dev/null +++ b/pkgs/development/python-modules/helper/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }: + +buildPythonPackage rec { + pname = "helper"; + version = "2.4.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0p56dvjpaz9wnr0ik2wmvgqjf9ji180bhjky7q272l5dan94lgd6"; + }; + + buildInputs = [ mock ]; + propagatedBuildInputs = [ pyyaml ]; + + # No tests in the pypi tarball + doCheck = false; + + meta = with stdenv.lib; { + description = "Development library for quickly writing configurable applications and daemons"; + homepage = https://helper.readthedocs.org/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c66fd52d43b..3ab1af6c32a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -358,6 +358,8 @@ in { habanero = callPackage ../development/python-modules/habanero { }; + helper = callPackage ../development/python-modules/helper { }; + histbook = callPackage ../development/python-modules/histbook { }; httpsig = callPackage ../development/python-modules/httpsig { }; @@ -2532,31 +2534,6 @@ in { hbmqtt = callPackage ../development/python-modules/hbmqtt { }; - helper = buildPythonPackage rec { - pname = "helper"; - version = "2.4.1"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/h/${pname}/${name}.tar.gz"; - sha256 = "4e33dde42ad4df30fb7790689f93d77252cff26a565610d03ff2e434865a53a2"; - }; - - buildInputs = with self; [ mock ]; - propagatedBuildInputs = with self; [ pyyaml ]; - - # No tests - doCheck = false; - - meta = { - description = "Development library for quickly writing configurable applications and daemons"; - homepage = https://helper.readthedocs.org/; - license = licenses.bsd3; - }; - - - }; - hiro = callPackage ../development/python-modules/hiro {}; hglib = callPackage ../development/python-modules/hglib {}; From 206f9ce2e008ac85e58fcfbf731e60ab2847e5d8 Mon Sep 17 00:00:00 2001 From: "nagato.pain" Date: Sat, 13 Oct 2018 10:24:23 -0700 Subject: [PATCH 626/992] pythonPackages.mwclient: 0.8.3 -> 0.9.1 | move to a seperate file --- .../python-modules/mwclient/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 ++----------------- 2 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/mwclient/default.nix diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix new file mode 100644 index 000000000000..186bc26f002f --- /dev/null +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib +, responses, mock, pytestcov, pytest, pytestcache, pytestpep8, coverage, six }: + +buildPythonPackage rec { + version = "0.9.1"; + pname = "mwclient"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "mwclient"; + repo = "mwclient"; + rev = "v${version}"; + sha256 = "0l7l5j7znlyn2yqvdfxr4dq23wyp6d8z49pnkjqy2kan11nrjzym"; + }; + + buildInputs = [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ]; + + propagatedBuildInputs = [ six requests requests_oauthlib ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Python client library to the MediaWiki API"; + maintainers = with maintainers; [ ]; + license = licenses.mit; + homepage = https://github.com/mwclient/mwclient; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ab1af6c32a9..30c9de1c445a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -390,6 +390,8 @@ in { mpi = pkgs.openmpi; }; + mwclient = callPackage ../development/python-modules/mwclient { }; + mwoauth = callPackage ../development/python-modules/mwoauth { }; nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; @@ -7479,34 +7481,6 @@ in { mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; - mwclient = buildPythonPackage rec { - version = "0.8.3"; - pname = "mwclient"; - name = "${pname}-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "mwclient"; - repo = "mwclient"; - rev = "v${version}"; - sha256 = "0kl1yp9z5f1wl6lkm0vix87zkrbl9wcmkrrj1x5c35xvf95laf53"; - }; - - buildInputs = with self; [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ]; - - propagatedBuildInputs = with self; [ six requests requests_oauthlib ]; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Python client library to the MediaWiki API"; - maintainers = with maintainers; [ ]; - license = licenses.mit; - homepage = https://github.com/mwclient/mwclient; - }; - }; - neuronpy = buildPythonPackage rec { name = "neuronpy-${version}"; version = "0.1.6"; From 1d1748c3c0b8b3c972451ec7aafbc5ea97e8a2ef Mon Sep 17 00:00:00 2001 From: "nagato.pain" Date: Sat, 13 Oct 2018 10:35:18 -0700 Subject: [PATCH 627/992] pythonPackages.pystache: move to a seperate file --- .../python-modules/pystache/default.nix | 29 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 ++----------------- 2 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/pystache/default.nix diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix new file mode 100644 index 000000000000..ee57c4995481 --- /dev/null +++ b/pkgs/development/python-modules/pystache/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }: + +buildPythonPackage rec { + pname = "pystache-${version}"; + version = "0.5.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a"; + }; + + LC_ALL = "en_US.UTF-8"; + + buildInputs = [ glibcLocales ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + # SyntaxError Python 3 + # https://github.com/defunkt/pystache/issues/181 + doCheck = !isPy3k; + + meta = with stdenv.lib; { + description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et"; + homepage = https://github.com/defunkt/pystache; + license = licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 30c9de1c445a..dfd6437550bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -559,6 +559,8 @@ in { slurm = pkgs.slurm; }; + pystache = callPackage ../development/python-modules/pystache { }; + pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; python-binance = callPackage ../development/python-modules/python-binance { }; @@ -10333,34 +10335,6 @@ in { }; }; - pystache = buildPythonPackage rec { - name = "pystache-${version}"; - version = "0.5.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pystache/${name}.tar.gz"; - sha256 = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a"; - }; - - LC_ALL = "en_US.UTF-8"; - - buildInputs = [ pkgs.glibcLocales ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - # SyntaxError Python 3 - # https://github.com/defunkt/pystache/issues/181 - doCheck = !isPy3k; - - meta = { - description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et"; - homepage = https://github.com/defunkt/pystache; - license = licenses.mit; - }; - }; - PyStemmer = callPackage ../development/python-modules/pystemmer {}; Pyro = callPackage ../development/python-modules/pyro { }; From 2e31732bc4d66de470d46c50de9fe6fd35f274bc Mon Sep 17 00:00:00 2001 From: Jos van Bakel Date: Sat, 13 Oct 2018 13:46:30 +0200 Subject: [PATCH 628/992] sonic-pi: 3.0.1 -> 3.1.0 --- pkgs/applications/audio/sonic-pi/default.nix | 10 +++++----- .../development/interpreters/supercollider/default.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index d1c48ce44ed8..ee72b6cdb1a4 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -20,14 +20,14 @@ let }; in stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.1.0"; name = "sonic-pi-${version}"; src = fetchFromGitHub { owner = "samaaron"; repo = "sonic-pi"; rev = "v${version}"; - sha256 = "1l1892hijp1dj2h799sfjr699q6xp660n0siibab5kv238521a81"; + sha256 = "0gi4a73szaa8iz5q1gxgpsnyvhhghcfqm6bfwwxbix4m5csbfgh9"; }; buildInputs = [ @@ -58,21 +58,21 @@ in stdenv.mkDerivation rec { export SONIC_PI_HOME=$TMPDIR export AUBIO_LIB=${aubio}/lib/libaubio.so - pushd app/server/bin + pushd app/server/ruby/bin ./compile-extensions.rb ./i18n-tool.rb -t popd pushd app/gui/qt cp -f ruby_help.tmpl ruby_help.h - ../../server/bin/qt-doc.rb -o ruby_help.h + ../../server/ruby/bin/qt-doc.rb -o ruby_help.h substituteInPlace SonicPi.pro \ --replace "LIBS += -lrt -lqt5scintilla2" \ "LIBS += -lrt -lqscintilla2 -lqwt" lrelease SonicPi.pro - qmake SonicPi.pro + qmake SonicPi.pro make popd diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 2737fd6fae04..7109ec68d3c8 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Programming language for real time audio synthesis"; homepage = http://supercollider.sourceforge.net/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x686-linux" "x86_64-linux" ]; }; } From 6738033727ca7945f1465ad76492891489e133ce Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Wed, 10 Oct 2018 21:03:45 +0200 Subject: [PATCH 629/992] alt-ergo: 1.30->2.2.0, ocplib-simplex: 0.3->0.4 --- lib/licenses.nix | 6 ++++++ pkgs/applications/science/logic/alt-ergo/default.nix | 8 ++++---- pkgs/development/ocaml-modules/ocplib-simplex/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +--- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index c4db280645a4..2d4e52ae4806 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -500,6 +500,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Non-Profit Open Software License 3.0"; }; + ocamlpro_nc = { + fullName = "OCamlPro Non Commercial license version 1"; + url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-2.2.0/OCamlPro-Non-Commercial-License.pdf"; + free = false; + }; + ofl = spdx { spdxId = "OFL-1.1"; fullName = "SIL Open Font License 1.1"; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 8cf4bb9b6d25..794430ebbe84 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "alt-ergo-${version}"; - version = "1.30"; + version = "2.2.0"; src = fetchurl { url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "025pacb4ax864fn5x8k78mw6hiig4jcazblj18gzxspg4f1l5n1g"; + sha256 = "106zfgisq6qxr7dlk8z7gi68ly7qff4frn8wab2g8z2nkkwla92w"; }; buildInputs = with ocamlPackages; - [ ocaml findlib camlzip ocamlgraph zarith lablgtk ocplib-simplex ]; + [ ocaml findlib camlzip ocamlgraph zarith lablgtk ocplib-simplex psmt2-frontend menhir num ]; meta = { description = "High-performance theorem prover and SMT solver"; homepage = "https://alt-ergo.ocamlpro.com/"; - license = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible + license = stdenv.lib.licenses.ocamlpro_nc; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index eb25982a69b3..1c09edf3a7ea 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -2,7 +2,7 @@ let pname = "ocplib-simplex"; - version = "0.3"; + version = "0.4"; in stdenv.mkDerivation { @@ -11,13 +11,15 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "OCamlPro-Iguernlala"; repo = pname; - rev = version; - sha256 = "1fmz38w2cj9fny4adqqyil59dvndqkr59s7wk2gqs47r72b6sisa"; + rev = "v${version}"; + sha256 = "09niyidrjzrj8g1qwx4wgsdf5m6cwrnzg7zsgala36jliic4di60"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ocaml findlib ]; + installFlags = "LIBDIR=$(OCAMLFIND_DESTDIR)"; + createFindlibDestdir = true; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c64ccdc34b5..f2b38e80b041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21171,9 +21171,7 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; - alt-ergo = callPackage ../applications/science/logic/alt-ergo { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - }; + alt-ergo = callPackage ../applications/science/logic/alt-ergo {}; aspino = callPackage ../applications/science/logic/aspino {}; From 4d9366805219775e98d1b1da7587d56986168195 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 13 Oct 2018 17:54:45 +0000 Subject: [PATCH 630/992] vulkan-loader: lock rev, update sha256 after bump See: https://git.io/fxRIA --- .../libraries/vulkan-loader/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index ad110817fea1..6f720857f7cf 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, - xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: -let version = "1.1.85"; in +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig +, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: + +let + version = "1.1.85"; +in + assert version == vulkan-headers.version; stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; @@ -9,8 +13,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; - rev = "sdk-${version}"; - sha256 = "16i4s1adfh822ahj3ywp279lv6szwd2sn2q5pmvpg2kk6mbh410d"; + rev = "b02f64293680c484e1d7ff6ecb88f89277c0dc8c"; + sha256 = "1n4vjyxlmi2ygx34srwbvalc5gz95gcsrmdw0k10353xja755gmj"; }; nativeBuildInputs = [ pkgconfig ]; From d21881ca5af8769c1694fb93262f92cd181fa241 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 13 Oct 2018 18:00:22 +0000 Subject: [PATCH 631/992] vulkan-headers: lock rev --- pkgs/development/libraries/vulkan-headers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index dd3f14f91928..c93ba1b12909 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "sdk-${version}"; + rev = "2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0"; sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb"; }; From 63b897a473bba49e0882362224def68c8bc08803 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Thu, 11 Oct 2018 20:14:43 +0200 Subject: [PATCH 632/992] masterpdfeditor: use qtbase.qtPluginPrefix #44047 --- pkgs/applications/misc/masterpdfeditor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index c5a125e95adf..c821690e14fe 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -17,8 +17,9 @@ in stdenv.mkDerivation { dontStrip = true; + # Please remove this when #44047 is fixed postInstall = '' - wrapProgram $out/bin/masterpdfeditor5 --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins + wrapProgram $out/bin/masterpdfeditor5 --prefix QT_PLUGIN_PATH : ${lib.getBin qtbase}/${qtbase.qtPluginPrefix} ''; installPhase = '' From 27298d378f2128450bedbb7cec3d0dc4b967a131 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Thu, 11 Oct 2018 20:17:37 +0200 Subject: [PATCH 633/992] masterpdfeditor: 5.1.36 -> 5.1.60 --- pkgs/applications/misc/masterpdfeditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index c821690e14fe..1cb472ff0194 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }: let - version = "5.1.36"; + version = "5.1.60"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "10kydjg9qi6kvzn7ny5nk4xn2fsm47anq3al89hq97ppm9dlvh48"; + sha256 = "0br5f04klzpbd25igbjjj1dqasmrcrw2zsan5bv0ydnr2lmpb2fz"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; From 7bffaa8efa2b2b191ec8595dbb7fe409f943459e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Oct 2018 14:05:26 -0500 Subject: [PATCH 634/992] gmailieer: 0.9 -> 0.10 --- pkgs/applications/networking/gmailieer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index 6d134708a5eb..fdd8e004c8b2 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "gmailieer-${version}"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "gauteh"; repo = "gmailieer"; rev = "v${version}"; - sha256 = "1ixs5hip37hzcxwi2gsxp34r914f1wrl4r3swxqmzln3a15kngsk"; + sha256 = "0qv74marzdv99xc2jbzzcwx3b2hm6byjl734h9x42g4mcg5pq9yf"; }; propagatedBuildInputs = with python3Packages; [ From 14a971d60950ab11c605675aa26789effc2bfa8f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Oct 2018 15:22:32 -0500 Subject: [PATCH 635/992] notmuch-bower: 0.8.1 -> 0.9 (#48332) --- .../networking/mailreaders/notmuch-bower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index f99a192889c9..84466f7cd3d6 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "notmuch-bower-${version}"; - version = "0.8.1"; + version = "0.9"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "0rdjip6jq7qlfn640ci81m9vfgcn4q5vaj72zp3bria8m55a56rf"; + sha256 = "0f8djiclq4rz9isbx18bpzymbvb2q0spvjp982b149hr1my6klaf"; }; nativeBuildInputs = [ gawk mercury pandoc ]; From c7f27571d34b7130b7e7584249860b98fcdd3c74 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 13 Oct 2018 22:42:40 +0200 Subject: [PATCH 636/992] cryptodev-linux: update meta.homepage gna.org forge is closed --- pkgs/os-specific/linux/cryptodev/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 45a7fe177f2b..c146e18f68d5 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz" - "http://download.gna.org/cryptodev-linux/${pname}.tar.gz" ]; sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z"; }; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; - homepage = http://home.gna.org/cryptodev-linux/; + homepage = http://cryptodev-linux.org/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; broken = !stdenv.lib.versionOlder kernel.version "4.13"; From ffa6c12b29eab05364f2778a250d3060d45cf056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 13 Oct 2018 18:10:45 -0300 Subject: [PATCH 637/992] deepin-wallpapers: init at 1.7.5 --- .../deepin/deepin-wallpapers/default.nix | 41 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-wallpapers/default.nix diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix new file mode 100644 index 000000000000..ed2c795fd9cb --- /dev/null +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, dde-api }: + +stdenv.mkDerivation rec { + name = "deepin-wallpapers-${version}"; + version = "1.7.5"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-wallpapers"; + rev = version; + sha256 = "0mfjkh81ci0gjwmgycrh32by7v9b73nyvyjbqd29ccpb8bpyyakn"; + }; + + nativeBuildInputs = [ dde-api.bin ]; + + postPatch = '' + sed -i -e "s:/usr/lib/deepin-api:${dde-api.bin}/lib/deepin-api:" Makefile + sed -i -e "s:/usr/share/wallpapers:$out/share/wallpapers:" Makefile + ''; + + installPhase = '' + mkdir -p $out/share/wallpapers/deepin + cp -a deepin/* deepin-community/* deepin-private/* $out/share/wallpapers/deepin + mkdir -p $out/var/cache + cp -a image-blur $out/var/cache + + # Suggested by upstream + mkdir -p $out/share/backgrounds/deepin + ln -s ../../wallpapers/deepin/Hummingbird_by_Shu_Le.jpg $out/share/backgrounds/deepin/desktop.jpg + ln -s $(echo -n $out/share/wallpapers/deepin/Hummingbird_by_Shu_Le.jpg | md5sum | cut -d " " -f 1).jpg \ + $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg + ''; + + meta = with stdenv.lib; { + description = "Wallpapers for Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/deepin-wallpapers; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 1ef7177e94d4..225de83a3a5f 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -19,6 +19,7 @@ let inherit (pkgs.gnome3) libgee vte; wnck = pkgs.libwnck3; }; + deepin-wallpapers = callPackage ./deepin-wallpapers { }; dtkcore = callPackage ./dtkcore { }; dtkwm = callPackage ./dtkwm { }; dtkwidget = callPackage ./dtkwidget { }; From 02ef5eb7a64ec00ce1df824a03aa2055bfd9563f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 13 Oct 2018 18:11:55 -0300 Subject: [PATCH 638/992] deepin-desktop-schemas: init at 3.2.18.7 --- .../deepin/deepin-desktop-schemas/default.nix | 43 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-desktop-schemas/default.nix diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix new file mode 100644 index 000000000000..b1a9c52014b8 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, python, deepin-gtk-theme, +deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3 }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-desktop-schemas"; + version = "3.2.18.7"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1siv28wbfjydr3s9k9i5b9fin39yr8ys90f3wi7b8rfm3cr5yy6j"; + }; + + nativeBuildInputs = [ + python + ]; + + buildInputs = [ + gnome3.dconf + deepin-gtk-theme + deepin-icon-theme + deepin-sound-theme + deepin-wallpapers + ]; + + postPatch = '' + # fix default background url + sed -i '/picture-uri/s|/usr/share/backgrounds/default_background.jpg|$out/share/backgrounds/deepin/default.png|' \ + overrides/common/com.deepin.wrap.gnome.desktop.override + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "GSettings deepin desktop-wide schemas"; + homepage = https://github.com/linuxdeepin/deepin-desktop-schemas; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 225de83a3a5f..84f41dc3451b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -7,6 +7,7 @@ let dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; + deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { }; deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; deepin-icon-theme = callPackage ./deepin-icon-theme { }; From 07f8104707c7a2d078b00189ebeb3e9b73a42b32 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sat, 13 Oct 2018 15:32:07 -0700 Subject: [PATCH 639/992] treewide: fix evaluation with `allowAliases = false` --- pkgs/applications/networking/p2p/soulseekqt/default.nix | 4 ++-- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 1b7901e3c463..104131e47752 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -5,7 +5,7 @@ , qtbase, qtmultimedia , libjson, libgpgerror , libX11, libxcb, libXau, libXdmcp, freetype, libbsd -, pythonPackages, squashfsTools, desktop_file_utils +, pythonPackages, squashfsTools, desktop-file-utils }: with stdenv.lib; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { dontBuild = true; - buildInputs = [ pythonPackages.binwalk squashfsTools desktop_file_utils ]; + buildInputs = [ pythonPackages.binwalk squashfsTools desktop-file-utils ]; # avoid usage of appimage's runner option --appimage-extract unpackCmd = '' diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 523f4ed0212c..e1fd8d13285f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -540,7 +540,7 @@ self: super: builtins.intersectAttrs super { --prefix PATH : "${path}" \ --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ - --set NIX_CFLAGS_LINK "-L${opencl-icd}/lib" + --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib" ''; }); } From fa6c8ec2a7fc71f05c2687f3e6411eae34831fdf Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Tue, 9 Oct 2018 22:13:58 +0200 Subject: [PATCH 640/992] nixos/modules: services.syncthing add guiAddress parameter --- nixos/modules/services/networking/syncthing.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index c610b3b66606..cf21aa9eb70f 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -16,6 +16,14 @@ in { available on http://127.0.0.1:8384/. ''; + guiAddress = mkOption { + type = types.string; + default = "127.0.0.1:8384"; + description = '' + Address to serve the GUI. + ''; + }; + systemService = mkOption { type = types.bool; default = true; @@ -132,7 +140,12 @@ in { User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; - ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}"; + ExecStart = '' + ${cfg.package}/bin/syncthing \ + -no-browser \ + -gui-address=${cfg.guiAddress} \ + -home=${cfg.dataDir} + ''; }; }; From 7c61bb615a3bcda46534436fd3136ef6103f3505 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 13 Oct 2018 18:14:56 -0500 Subject: [PATCH 641/992] libbsd: update patches --- pkgs/development/libraries/libbsd/cdefs.patch | 222 ----- .../development/libraries/libbsd/darwin.patch | 758 +++++------------- pkgs/development/libraries/libbsd/default.nix | 11 +- .../libraries/libbsd/features.patch | 26 - .../libraries/libbsd/non-glibc.patch | 74 -- 5 files changed, 209 insertions(+), 882 deletions(-) delete mode 100644 pkgs/development/libraries/libbsd/cdefs.patch delete mode 100644 pkgs/development/libraries/libbsd/features.patch delete mode 100644 pkgs/development/libraries/libbsd/non-glibc.patch diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch deleted file mode 100644 index 81822654aeb4..000000000000 --- a/pkgs/development/libraries/libbsd/cdefs.patch +++ /dev/null @@ -1,222 +0,0 @@ -From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:41:35 +0100 -Subject: Handle systems missing - -This is a non-portable header, and we cannot expect it to be provided by -the system libc (e.g. musl). We just need and rely on declaration that -we have defined ourselves in our own . So we switch to -only ever assume that. - -Fixes: https://bugs.freedesktop.org/105281 ---- - include/bsd/libutil.h | 4 ++++ - include/bsd/md5.h | 4 ++++ - include/bsd/nlist.h | 4 ++++ - include/bsd/readpassphrase.h | 4 ++++ - include/bsd/stdlib.h | 4 ++++ - include/bsd/string.h | 4 ++++ - include/bsd/stringlist.h | 5 +++++ - include/bsd/sys/queue.h | 4 ++++ - include/bsd/sys/tree.h | 4 ++++ - include/bsd/timeconv.h | 4 ++++ - include/bsd/vis.h | 4 ++++ - include/bsd/wchar.h | 4 ++++ - 12 files changed, 49 insertions(+) - -diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h -index 45b3b15..ccca29a 100644 ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -40,7 +40,11 @@ - #define LIBBSD_LIBUTIL_H - - #include -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - #include -diff --git a/include/bsd/md5.h b/include/bsd/md5.h -index 5f3ae46..bf36a30 100644 ---- a/include/bsd/md5.h -+++ b/include/bsd/md5.h -@@ -27,7 +27,11 @@ typedef struct MD5Context { - uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ - } MD5_CTX; - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS -diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h -index cb297e8..8767117 100644 ---- a/include/bsd/nlist.h -+++ b/include/bsd/nlist.h -@@ -27,7 +27,11 @@ - #ifndef LIBBSD_NLIST_H - #define LIBBSD_NLIST_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - struct nlist { - union { -diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h -index 14744b8..5eb8021 100644 ---- a/include/bsd/readpassphrase.h -+++ b/include/bsd/readpassphrase.h -@@ -31,7 +31,11 @@ - #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ - #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS -diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index ebc9638..8d33d1f 100644 ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -42,7 +42,11 @@ - #ifndef LIBBSD_STDLIB_H - #define LIBBSD_STDLIB_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - -diff --git a/include/bsd/string.h b/include/bsd/string.h -index 6798bf6..29097f6 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -33,7 +33,11 @@ - #ifndef LIBBSD_STRING_H - #define LIBBSD_STRING_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS -diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h -index ff30cac..dd71496 100644 ---- a/include/bsd/stringlist.h -+++ b/include/bsd/stringlist.h -@@ -31,7 +31,12 @@ - - #ifndef LIBBSD_STRINGLIST_H - #define LIBBSD_STRINGLIST_H -+ -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - /* -diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h -index 4a94ea7..ac00026 100644 ---- a/include/bsd/sys/queue.h -+++ b/include/bsd/sys/queue.h -@@ -33,7 +33,11 @@ - #ifndef LIBBSD_SYS_QUEUE_H - #define LIBBSD_SYS_QUEUE_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - /* - * This file defines four types of data structures: singly-linked lists, -diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h -index 628bec0..325b382 100644 ---- a/include/bsd/sys/tree.h -+++ b/include/bsd/sys/tree.h -@@ -30,7 +30,11 @@ - #ifndef LIBBSD_SYS_TREE_H - #define LIBBSD_SYS_TREE_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - /* - * This file defines data structures for different types of trees: -diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h -index e2a2c55..a426bd3 100644 ---- a/include/bsd/timeconv.h -+++ b/include/bsd/timeconv.h -@@ -41,7 +41,11 @@ - #ifndef LIBBSD_TIMECONV_H - #define LIBBSD_TIMECONV_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - -diff --git a/include/bsd/vis.h b/include/bsd/vis.h -index 970dfdd..ab5430c 100644 ---- a/include/bsd/vis.h -+++ b/include/bsd/vis.h -@@ -72,7 +72,11 @@ - */ - #define UNVIS_END 1 /* no more characters */ - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - __BEGIN_DECLS - char *vis(char *, int, int, int); -diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h -index 33a500e..7216503 100644 ---- a/include/bsd/wchar.h -+++ b/include/bsd/wchar.h -@@ -40,7 +40,11 @@ - #define LIBBSD_WCHAR_H - - #include -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS --- -cgit v1.1 - diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch index 4bddec6b0ffd..0f9cc9aaf964 100644 --- a/pkgs/development/libraries/libbsd/darwin.patch +++ b/pkgs/development/libraries/libbsd/darwin.patch @@ -1,497 +1,103 @@ diff --git a/configure.ac b/configure.ac -index 88ccd91..0857782 100644 +index 55fcfe6..1e26c93 100644 --- a/configure.ac +++ b/configure.ac -@@ -59,7 +59,7 @@ AS_CASE([$host_os], - ) +@@ -51,15 +51,19 @@ AS_CASE([$host_os], + AC_SEARCH_LIBS([clock_gettime], [rt], [CLOCK_GETTIME_LIBS="-lrt"]) + AC_SUBST([CLOCK_GETTIME_LIBS]) + LIBS="$saved_LIBS" ++ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1]) + ], + [*-musl*], [ + # Upstream refuses to define this, we will do it ourselves then. + AC_DEFINE([__MUSL__], [1], [Define to 1 if we are building for musl]) ++ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1]) + ], +-) ++ [ ++ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1]) ++ ]) # Checks for header files. -AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h]) -+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h]) ++AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h nlist.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE -@@ -146,6 +146,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ - pstat_getproc sysconf]) +@@ -143,7 +147,8 @@ AC_LINK_IFELSE( + + AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ + getauxval getentropy getexecname getline \ +- pstat_getproc sysconf]) ++ pstat_getproc sysconf \ ++ strlcpy strlcat strnstr strmode fpurge]) AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) -+HostOS=`echo "$host" | sed 's/.*-//'` -+os_is_macosx=false -+nonLinuxOS=false -+AC_SUBST(HostOS) -+case ${HostOS} in -+ darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*) -+ os_is_macosx=true -+ nonLinuxOS=true -+ echo HostOS="$HostOS" -+ ;; -+ *) -+ echo host="$host" -+ echo HostOS="$HostOS" -+ os_is_macosx=false -+ nonLinuxOS=false -+ ;; -+esac -+AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue]) -+AM_COND_IF([IS_DARWIN], -+ [AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])]) -+ -+AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue]) -+AM_COND_IF([NON_LINUX], -+ [AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])]) -+ AC_CONFIG_FILES([ - Makefile - include/Makefile -diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h -index 45b3b15..d0d4043 100644 ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -39,7 +39,9 @@ - #ifndef LIBBSD_LIBUTIL_H - #define LIBBSD_LIBUTIL_H - -+#ifdef HAVE_FEATURES_H - #include -+#endif - #include - #include - #include -diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h -index 4b69983..c75151b 100644 ---- a/include/bsd/stdio.h -+++ b/include/bsd/stdio.h -@@ -48,12 +48,16 @@ - __BEGIN_DECLS - const char *fmtcheck(const char *, const char *); - -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) - /* XXX: The function requires cooperation from the system libc to store the - * line buffer in the FILE struct itself. */ - char *fgetln(FILE *fp, size_t *lenp) -- LIBBSD_DEPRECATED("This functions cannot be safely ported, " -- "use getline(3) instead, as it is supported " -- "by GNU and POSIX.1-2008."); -+ __attribute__((deprecated("This functions cannot be safely ported, " -+ "use getline(3) instead, as it is supported " -+ "by GNU and POSIX.1-2008."))); -+#else -+char *fgetln(FILE *fp, size_t *lenp); -+#endif - - /* - * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations, -diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index ebc9638..6cd7943 100644 ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb, - const unsigned char *table, unsigned endbyte); - - void *reallocf(void *ptr, size_t size); --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) -+#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ) -+#if !__GLIBC_PREREQ(2, 26) - void *reallocarray(void *ptr, size_t nmemb, size_t size); - #endif -+#endif - - long long strtonum(const char *nptr, long long minval, long long maxval, - const char **errstr); diff --git a/include/bsd/string.h b/include/bsd/string.h -index 6798bf6..6baaa14 100644 +index f987fee..a1e17ed 100644 --- a/include/bsd/string.h +++ b/include/bsd/string.h -@@ -37,6 +37,12 @@ +@@ -41,10 +41,21 @@ #include __BEGIN_DECLS -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+size_t bsd_strlcpy(char *dst, const char *src, size_t siz); -+size_t bsd_strlcat(char *dst, const char *src, size_t siz); -+char *bsd_strnstr(const char *str, const char *find, size_t str_len); -+void bsd_strmode(mode_t mode, char *str); -+#else ++#if !HAVE_STRLCPY size_t strlcpy(char *dst, const char *src, size_t siz); - size_t strlcat(char *dst, const char *src, size_t siz); - char *strnstr(const char *str, const char *find, size_t str_len); -@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str); - #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) - void explicit_bzero(void *buf, size_t len); - #endif +#endif - __END_DECLS ++ ++#if !HAVE_STRLCAT + size_t strlcat(char *dst, const char *src, size_t siz); ++#endif ++ ++#if !HAVE_STRNSTR + char *strnstr(const char *str, const char *find, size_t str_len); ++#endif ++ ++#if !HAVE_STRMODE + void strmode(mode_t mode, char *str); ++#endif - #endif + #if !defined(__GLIBC__) || \ + (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) diff --git a/src/Makefile.am b/src/Makefile.am -index ad83dbf..0f2a7ee 100644 +index f3cc0fa..3aaecd4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \ - libbsd.map +@@ -56,8 +56,10 @@ libbsd_la_DEPENDENCIES = \ libbsd_la_LIBADD = \ $(CLOCK_GETTIME_LIBS) -+ -+if IS_DARWIN -+libbsd_la_LDFLAGS = \ -+ -Wl \ -+ -version-number $(LIBBSD_ABI) -+else libbsd_la_LDFLAGS = \ - -Wl,--version-script=$(srcdir)/libbsd.map \ +- -Wl,--version-script=$(srcdir)/libbsd.map \ -version-number $(LIBBSD_ABI) ++if BUILD_LINK_VERSION_SCRIPT ++libbsd_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libbsd.map +endif -+ libbsd_la_SOURCES = \ arc4random.c \ -- arc4random.h \ -- arc4random_unix.h \ -- arc4random_openbsd.h \ - arc4random_uniform.c \ - bsd_getopt.c \ -- chacha_private.h \ - closefrom.c \ - dehumanize_number.c \ - err.c \ -@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \ - $(nil) - endif - -+noinst_HEADERS = \ -+ arc4random.h \ -+ arc4random_bsd.h \ -+ arc4random_linux.h \ -+ arc4random_unix.h \ -+ arc4random_osx.h \ -+ arc4random_openbsd.h \ -+ chacha_private.h -+ - libbsd_ctor_a_SOURCES = \ - setproctitle_ctor.c \ - $(nil) -diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h -new file mode 100644 -index 0000000..ece2f85 ---- /dev/null -+++ b/src/arc4random_bsd.h -@@ -0,0 +1,86 @@ -+/* $OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $ */ -+ -+/* -+ * Copyright (c) 1996, David Mazieres -+ * Copyright (c) 2008, Damien Miller -+ * Copyright (c) 2013, Markus Friedl -+ * Copyright (c) 2014, Theo de Raadt -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+/* -+ * Stub functions for portability. -+ */ -+ -+#include -+ -+#include -+#include -+ -+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) -+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) -+ -+/* -+ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if -+ * a program does not link to -lthr. Callbacks registered with pthread_atfork() -+ * appear to fail silently. So, it is not always possible to detect a PID -+ * wraparound. -+ */ -+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) -+ -+static inline void -+_getentropy_fail(void) -+{ -+ raise(SIGKILL); -+} -+ -+static volatile sig_atomic_t _rs_forked; -+ -+static inline void -+_rs_forkhandler(void) -+{ -+ _rs_forked = 1; -+} -+ -+static inline void -+_rs_forkdetect(void) -+{ -+ static pid_t _rs_pid = 0; -+ pid_t pid = getpid(); -+ -+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { -+ _rs_pid = pid; -+ _rs_forked = 0; -+ if (rs) -+ memset(rs, 0, sizeof(*rs)); -+ } -+} -+ -+static inline int -+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) -+{ -+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) -+ return (-1); -+ -+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { -+ munmap(*rsp, sizeof(**rsp)); -+ return (-1); -+ } -+ -+ _ARC4_ATFORK(_rs_forkhandler); -+ return (0); -+} -diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h -new file mode 100644 -index 0000000..d61a8db ---- /dev/null -+++ b/src/arc4random_linux.h -@@ -0,0 +1,86 @@ -+/* $OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $ */ -+ -+/* -+ * Copyright (c) 1996, David Mazieres -+ * Copyright (c) 2008, Damien Miller -+ * Copyright (c) 2013, Markus Friedl -+ * Copyright (c) 2014, Theo de Raadt -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+/* -+ * Stub functions for portability. -+ */ -+ -+#include -+ -+#include -+#include -+ -+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) -+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) -+ -+#ifdef __GLIBC__ -+extern void *__dso_handle; -+extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *); -+#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle) -+#else -+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) -+#endif -+ -+static inline void -+_getentropy_fail(void) -+{ -+ raise(SIGKILL); -+} -+ -+static volatile sig_atomic_t _rs_forked; -+ -+static inline void -+_rs_forkhandler(void) -+{ -+ _rs_forked = 1; -+} -+ -+static inline void -+_rs_forkdetect(void) -+{ -+ static pid_t _rs_pid = 0; -+ pid_t pid = getpid(); -+ -+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { -+ _rs_pid = pid; -+ _rs_forked = 0; -+ if (rs) -+ memset(rs, 0, sizeof(*rs)); -+ } -+} -+ -+static inline int -+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) -+{ -+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) -+ return (-1); -+ -+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { -+ munmap(*rsp, sizeof(**rsp)); -+ return (-1); -+ } -+ -+ _ARC4_ATFORK(_rs_forkhandler); -+ return (0); -+} -diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h -new file mode 100644 -index 0000000..14771a6 ---- /dev/null -+++ b/src/arc4random_osx.h -@@ -0,0 +1,82 @@ -+/* $OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $ */ -+ -+/* -+ * Copyright (c) 1996, David Mazieres -+ * Copyright (c) 2008, Damien Miller -+ * Copyright (c) 2013, Markus Friedl -+ * Copyright (c) 2014, Theo de Raadt -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+/* -+ * Stub functions for portability. -+ */ -+ -+#include -+ -+#include -+#include -+#include -+ -+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) -+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) -+ -+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) -+ -+static inline void -+_getentropy_fail(void) -+{ -+ raise(SIGKILL); -+} -+ -+static volatile sig_atomic_t _rs_forked; -+ -+static inline void -+_rs_forkhandler(void) -+{ -+ _rs_forked = 1; -+} -+ -+static inline void -+_rs_forkdetect(void) -+{ -+ static pid_t _rs_pid = 0; -+ pid_t pid = getpid(); -+ -+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { -+ _rs_pid = pid; -+ _rs_forked = 0; -+ if (rs) -+ memset(rs, 0, sizeof(*rs)); -+ } -+} -+ -+static inline int -+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) -+{ -+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) -+ return (-1); -+ -+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { -+ munmap(*rsp, sizeof(**rsp)); -+ *rsp = NULL; -+ return (-1); -+ } -+ -+ _ARC4_ATFORK(_rs_forkhandler); -+ return (0); -+} -diff --git a/src/fgetln.c b/src/fgetln.c -index 4d1726e..9c73788 100644 ---- a/src/fgetln.c -+++ b/src/fgetln.c -@@ -30,7 +30,9 @@ - #include - #include - -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) - #include "local-link.h" -+#endif - - #ifdef HAVE_GETLINE - struct filebuf { -@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len) - return fb->buf; - } - } -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) - libbsd_link_warning(fgetln, - "This functions cannot be safely ported, use getline(3) " - "instead, as it is supported by GNU and POSIX.1-2008.") -+#endif - #else - #error "Function fgetln() needs to be ported." - #endif + arc4random.h \ diff --git a/src/fpurge.c b/src/fpurge.c -index 462535a..e7eb46f 100644 +index 462535a..a8941db 100644 --- a/src/fpurge.c +++ b/src/fpurge.c -@@ -26,9 +26,11 @@ +@@ -26,9 +26,10 @@ #include #include -+#if HAVE___FPURGE - #include -+#endif +-#include --#ifdef HAVE___FPURGE -+#ifdef HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7 */ + #ifdef HAVE___FPURGE ++#include ++ int fpurge(FILE *fp) { -@@ -42,5 +44,55 @@ fpurge(FILE *fp) +@@ -41,6 +42,36 @@ fpurge(FILE *fp) + return 0; } - #else --#error "Function fpurge() needs to be ported." -+#define fp_ fp -+//#error "Function fpurge() needs to be ported." -+//#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ ++/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ ++#elif HAVE_FPURGE +int +fpurge(FILE *fp) +{ @@ -501,12 +107,13 @@ index 462535a..e7eb46f 100644 + } + + /* Call the system's fpurge function. */ -+# undef fpurge -+# if !HAVE_DECL_FPURGE ++#undef fpurge ++#if !HAVE_DECL_FPURGE + extern int fpurge (FILE *); -+# endif ++#endif + int result = fpurge (fp); -+# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ ++/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ ++#if defined(__sferror) || defined(__DragonFly__) + if (result == 0) + /* Correct the invariants that fpurge broke. + on BSD systems says: @@ -514,69 +121,35 @@ index 462535a..e7eb46f 100644 + If this invariant is not fulfilled and the stream is read-write but + currently reading, subsequent putc or fputc calls will write directly + into the buffer, although they shouldn't be allowed to. */ -+ if ((fp_->_flags & __SRD) != 0) -+ fp_->_w = 0; ++ if ((fp->_flags & __SRD) != 0) ++ fp->_w = 0; +#endif + return result; +} -+//#endif -+#endif -+ -+#ifdef TEST -+int -+main() -+{ -+ static FILE fp_bad; -+ FILE *fp; -+ -+ if (fpurge(&fp_bad) == 0) -+ return 1; -+ -+ fp = fopen("/dev/zero", "r"); -+ if (fpurge(fp) < 0) -+ return 1; -+ -+ fclose(fp); -+ -+ return 0; -+} + #else + #error "Function fpurge() needs to be ported." #endif diff --git a/src/funopen.c b/src/funopen.c -index 1e05c7e..75e61ea 100644 +index 1e05c7e..65ba5a8 100644 --- a/src/funopen.c +++ b/src/funopen.c @@ -143,6 +143,7 @@ funopen(const void *cookie, * they will not add the needed support to implement it. Just ignore this * interface there, as it has never been provided anyway. */ -+#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#elif defined(__MACH__) #else #error "Function funopen() needs to be ported or disabled." #endif -diff --git a/src/getentropy.c b/src/getentropy.c -index 3f11a1e..8a23a07 100644 ---- a/src/getentropy.c -+++ b/src/getentropy.c -@@ -28,9 +28,7 @@ - #include "getentropy_linux.c" - #elif defined(__GNU__) - #include "getentropy_hurd.c" --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) --#include "getentropy_bsd.c" --#elif defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - #include "getentropy_bsd.c" - #elif defined(__sun) - #include "getentropy_solaris.c" diff --git a/src/hash/sha512.h b/src/hash/sha512.h -index 4f368a1..ab22fc1 100644 +index 4f368a1..7632e25 100644 --- a/src/hash/sha512.h +++ b/src/hash/sha512.h @@ -29,7 +29,11 @@ #ifndef _SHA512_H_ #define _SHA512_H_ -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#ifdef __MACH__ +#include +#else #include @@ -585,16 +158,15 @@ index 4f368a1..ab22fc1 100644 #define SHA512_DIGEST_LENGTH 64 diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c -index b3c8d5e..f69013d 100644 +index b3c8d5e..602f54e 100644 --- a/src/hash/sha512c.c +++ b/src/hash/sha512c.c -@@ -25,7 +25,13 @@ +@@ -25,7 +25,12 @@ */ #include -+__FBSDID("$FreeBSD$"); + -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#ifdef __MACH__ +#include +#else #include @@ -602,102 +174,188 @@ index b3c8d5e..f69013d 100644 #include #include +diff --git a/src/local-link.h b/src/local-link.h +index d518dcf..84694a2 100644 +--- a/src/local-link.h ++++ b/src/local-link.h +@@ -27,7 +27,11 @@ + #ifndef LIBBSD_LOCAL_LINK_H + #define LIBBSD_LOCAL_LINK_H + ++#ifdef __MACH__ ++#define libbsd_link_warning(symbol, msg) ++#else + #define libbsd_link_warning(symbol, msg) \ + static const char libbsd_emit_link_warning_##symbol[] \ + __attribute__((used,section(".gnu.warning." #symbol))) = msg; + #endif ++#endif diff --git a/src/nlist.c b/src/nlist.c -index 0932f59..598a329 100644 +index 0932f59..4502048 100644 --- a/src/nlist.c +++ b/src/nlist.c -@@ -27,6 +27,10 @@ - * SUCH DAMAGE. - */ +@@ -41,6 +41,7 @@ + #include + #include -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) -+#if defined(LIBC_SCCS) && !defined(lint) -+static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; -+#endif /* LIBC_SCCS and not lint */ - #include ++#if !HAVE_NLIST_H + #include "local-elf.h" - #include -@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list) + #define SIZE_T_MAX 0xffffffffU +@@ -265,3 +266,4 @@ nlist(const char *name, struct nlist *list) (void)close(fd); return (n); } -+#endif /* _NLIST_DO_ELF */ ++#endif +diff --git a/src/readpassphrase.c b/src/readpassphrase.c +index f9f6195..2bc5fb4 100644 +--- a/src/readpassphrase.c ++++ b/src/readpassphrase.c +@@ -36,6 +36,14 @@ + #define TCSASOFT 0 + #endif + ++#ifndef _SIGMAX ++#define _SIGMAX 64 ++#endif ++ ++#ifndef _NSIG ++#define _NSIG (_SIGMAX + 1) ++#endif ++ + static volatile sig_atomic_t signo[_NSIG]; + + static void handler(int); diff --git a/src/setproctitle.c b/src/setproctitle.c -index 038ac7d..d0ef01b 100644 +index 038ac7d..e9ee09c 100644 --- a/src/setproctitle.c +++ b/src/setproctitle.c -@@ -32,6 +32,11 @@ +@@ -32,6 +32,10 @@ #include #include -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+#define __asm__(x) ++#ifdef __MACH__ +extern char **environ; +#endif + static struct { /* Original value. */ const char *arg0; -@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5"); +@@ -280,16 +284,22 @@ setproctitle_impl(const char *fmt, ...) + *++nul = '\0'; + } + } ++#ifndef __MACH__ + __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5"); ++#endif + + /* The original function introduced in 0.2 was a stub, it only got implemented + * in 0.5, make the implementation available in the old version as an alias * for code linking against that version, and change the default to use the * new version, so that new code depends on the implemented version. */ - #ifdef HAVE_TYPEOF -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+// -+// HACK: even weak aliasing breaks in clang so just comment this out for now -+// -+// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl"))); -+#else +-#ifdef HAVE_TYPEOF ++#ifdef __MACH__ ++void setproctitle_stub(const char *fmt, ...); ++#elif HAVE_TYPEOF extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl"))); -+#endif #else void setproctitle_stub(const char *fmt, ...) __attribute__((alias("setproctitle_impl"))); + #endif ++#ifndef __MACH__ + __asm__(".symver setproctitle_stub,setproctitle@LIBBSD_0.2"); ++#endif diff --git a/src/strlcat.c b/src/strlcat.c -index 14c53a1..e01cb60 100644 +index 14c53a1..5961c17 100644 --- a/src/strlcat.c +++ b/src/strlcat.c -@@ -27,7 +27,11 @@ +@@ -26,6 +26,7 @@ + * Returns strlen(src) + MIN(dsize, strlen(initial dst)). * If retval >= dsize, truncation occurred. */ ++#if !HAVE_STRLCAT size_t -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+bsd_strlcat(char *dst, const char *src, size_t dsize) -+#else strlcat(char *dst, const char *src, size_t dsize) -+#endif { - const char *odst = dst; - const char *osrc = src; +@@ -53,3 +54,4 @@ strlcat(char *dst, const char *src, size_t dsize) + + return(dlen + (src - osrc)); /* count does not include NUL */ + } ++#endif diff --git a/src/strlcpy.c b/src/strlcpy.c -index e9a7fe4..10a855f 100644 +index e9a7fe4..5137acb 100644 --- a/src/strlcpy.c +++ b/src/strlcpy.c -@@ -25,7 +25,11 @@ +@@ -24,6 +24,7 @@ + * chars will be copied. Always NUL terminates (unless dsize == 0). * Returns strlen(src); if retval >= dsize, truncation occurred. */ ++#if !HAVE_STRLCPY size_t -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+bsd_strlcpy(char *dst, const char *src, size_t dsize) -+#else strlcpy(char *dst, const char *src, size_t dsize) -+#endif { - const char *osrc = src; - size_t nleft = dsize; +@@ -48,3 +49,4 @@ strlcpy(char *dst, const char *src, size_t dsize) + + return(src - osrc - 1); /* count does not include NUL */ + } ++#endif diff --git a/src/strmode.c b/src/strmode.c -index e6afde5..c463243 100644 +index e6afde5..da680c9 100644 --- a/src/strmode.c +++ b/src/strmode.c -@@ -33,7 +33,11 @@ +@@ -32,6 +32,7 @@ + #include #include ++#if !HAVE_STRMODE void -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+bsd_strmode(mode_t mode, char *p) -+#else strmode(mode_t mode, char *p) -+#endif { - /* print type */ - switch (mode & S_IFMT) { +@@ -141,3 +142,4 @@ strmode(mode_t mode, char *p) + *p++ = ' '; /* will be a '+' if ACL's implemented */ + *p = '\0'; + } ++#endif +diff --git a/src/unvis.c b/src/unvis.c +index 94e3e7a..fba4c66 100644 +--- a/src/unvis.c ++++ b/src/unvis.c +@@ -565,11 +565,15 @@ strnunvis_openbsd(char *dst, const char *src, size_t dlen) + { + return strnunvisx(dst, dlen, src, 0); + } ++#ifndef __MACH__ + __asm__(".symver strnunvis_openbsd,strnunvis@@LIBBSD_0.2"); ++#endif + + int + strnunvis_netbsd(char *dst, size_t dlen, const char *src) + { + return strnunvisx(dst, dlen, src, 0); + } ++#ifndef __MACH__ + __asm__(".symver strnunvis_netbsd,strnunvis@LIBBSD_0.9.1"); ++#endif +diff --git a/src/vis.c b/src/vis.c +index c2cd2d8..2d84330 100644 +--- a/src/vis.c ++++ b/src/vis.c +@@ -723,14 +723,18 @@ strnvis_openbsd(char *mbdst, const char *mbsrc, size_t dlen, int flags) + { + return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL); + } ++#ifndef __MACH__ + __asm__(".symver strnvis_openbsd,strnvis@@LIBBSD_0.2"); ++#endif + + int + strnvis_netbsd(char *mbdst, size_t dlen, const char *mbsrc, int flags) + { + return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL); + } ++#ifndef __MACH__ + __asm__(".symver strnvis_netbsd,strnvis@LIBBSD_0.9.1"); ++#endif + + int + stravis(char **mbdstp, const char *mbsrc, int flags) diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index b304b73e7e03..dc7213acd638 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -13,16 +13,7 @@ stdenv.mkDerivation rec { # the configure scripts nativeBuildInputs = [ autoreconfHook ]; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch - # Suitable for all, but limited to musl to avoid rebuilds - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490 - ./non-glibc.patch - # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd - ./cdefs.patch - # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404 - ./features.patch - ]; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch; meta = with stdenv.lib; { description = "Common functions found on BSD systems"; diff --git a/pkgs/development/libraries/libbsd/features.patch b/pkgs/development/libraries/libbsd/features.patch deleted file mode 100644 index 66bd1e9232ba..000000000000 --- a/pkgs/development/libraries/libbsd/features.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b20272f5a966333b49fdf2bda797e2a9f0227404 Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:42:52 +0100 -Subject: Remove inclusion from - -This is a non-portable header, and we should not assume it is present. -Let the first system header pull it in if needed. ---- - include/bsd/libutil.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h -index ccca29a..e5f148a 100644 ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -39,7 +39,6 @@ - #ifndef LIBBSD_LIBUTIL_H - #define LIBBSD_LIBUTIL_H - --#include - #ifdef LIBBSD_OVERLAY - #include - #else --- -cgit v1.1 - diff --git a/pkgs/development/libraries/libbsd/non-glibc.patch b/pkgs/development/libraries/libbsd/non-glibc.patch deleted file mode 100644 index f61e0d242943..000000000000 --- a/pkgs/development/libraries/libbsd/non-glibc.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:39:45 +0100 -Subject: Fix function declaration protection for glibc already providing them -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On non-glibc based systems we cannot unconditionally use the -__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead, -if it is undefined, define it to 0. - -We should also always declare these functions on non-glibc based -systems. And on systems with a new enough glibc, which provides these -functions, we should still provide the declarations if _GNU_SOURCE -is *not* defined. - -Reported-by: Jörg Krause ---- - include/bsd/stdlib.h | 3 ++- - include/bsd/string.h | 3 ++- - include/bsd/sys/cdefs.h | 8 ++++++++ - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index 8d33d1f..a5b063c 100644 ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb, - const unsigned char *table, unsigned endbyte); - - void *reallocf(void *ptr, size_t size); --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) -+#if !defined(__GLIBC__) || \ -+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) - void *reallocarray(void *ptr, size_t nmemb, size_t size); - #endif - -diff --git a/include/bsd/string.h b/include/bsd/string.h -index 29097f6..f987fee 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz); - char *strnstr(const char *str, const char *find, size_t str_len); - void strmode(mode_t mode, char *str); - --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) -+#if !defined(__GLIBC__) || \ -+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) - void explicit_bzero(void *buf, size_t len); - #endif - __END_DECLS -diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h -index b4c8f30..d1cc419 100644 ---- a/include/bsd/sys/cdefs.h -+++ b/include/bsd/sys/cdefs.h -@@ -59,6 +59,14 @@ - #endif - - /* -+ * On non-glibc based systems, we cannot unconditionally use the -+ * __GLIBC_PREREQ macro as it gets expanded before evaluation. -+ */ -+#ifndef __GLIBC_PREREQ -+#define __GLIBC_PREREQ(maj, min) 0 -+#endif -+ -+/* - * Some kFreeBSD headers expect those macros to be set for sanity checks. - */ - #ifndef _SYS_CDEFS_H_ --- -cgit v1.1 - From ff444175b3a48994e280e4516c2b32a5f7cbe5fc Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 1 Oct 2018 23:12:46 +0200 Subject: [PATCH 642/992] pythonPackages.peewee: init at 3.7.1 --- .../python-modules/peewee/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/peewee/default.nix diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix new file mode 100644 index 000000000000..09ee7dc92eaa --- /dev/null +++ b/pkgs/development/python-modules/peewee/default.nix @@ -0,0 +1,46 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub +, sqlite +, cython +, apsw +, flask +, withPostgres ? false, psycopg2 +, withMysql ? false, mysql-connector +}: + +buildPythonPackage rec { + + pname = "peewee"; + version = "3.7.1"; + + # pypi release does not provide tests + src = fetchFromGitHub { + owner = "coleifer"; + repo = pname; + rev = version; + sha256 = "0chn8mknzvkmcmysy2291hanf0vg3sfzqgfc5hqx1nnrd6qkiq8r"; + }; + + + checkInputs = [ flask ]; + + checkPhase = '' + rm -r playhouse # avoid using the folder in the cwd + python runtests.py + ''; + + buildInputs = [ + sqlite + cython # compile speedups + ]; + + propagatedBuildInputs = [ + apsw # sqlite performance improvement + ] ++ (lib.optional withPostgres psycopg2) + ++ (lib.optional withMysql mysql-connector); + + meta = with stdenv.lib;{ + description = "a small, expressive orm"; + homepage = http://peewee-orm.com; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2da2892f9beb..ee1bee109a3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3666,6 +3666,8 @@ in { }; }; + peewee = callPackage ../development/python-modules/peewee { }; + peppercorn = buildPythonPackage rec { name = "peppercorn-0.5"; From f20899dd41f8fac6028a6a811da068e2b3a1460e Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 2 Oct 2018 00:17:42 +0200 Subject: [PATCH 643/992] cozy: init at 0.6.3 --- .../audio/cozy-audiobooks/default.nix | 85 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/applications/audio/cozy-audiobooks/default.nix diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix new file mode 100644 index 000000000000..f0a7280b038d --- /dev/null +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchFromGitHub +, ninja +, boost +, meson +, pkgconfig +, wrapGAppsHook +, appstream-glib +, desktop-file-utils +, gtk3 +, gst_all_1 +, gobjectIntrospection +, python3Packages +, file +, cairo +, sqlite +, gettext +, gnome3 +}: + +python3Packages.buildPythonApplication rec { + + format = "other"; # no setup.py + + name = "cozy-${version}"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "geigi"; + repo = "cozy"; + rev = version; + sha256 = "0xs6vzvmx0nvybpjqlrngggv2x8b2ky073slh760iirs1p0dclbc"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig + wrapGAppsHook + appstream-glib + desktop-file-utils + gobjectIntrospection + ]; + + buildInputs = [ + gtk3 + cairo + gettext + gnome3.defaultIconTheme + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-good + gst-plugins-ugly + gst-plugins-base + ]); + + propagatedBuildInputs = with python3Packages; [ + gst-python + pygobject3 + dbus-python + mutagen + peewee + magic + ]; + + postPatch = '' + chmod +x data/meson_post_install.py + patchShebangs data/meson_post_install.py + substituteInPlace cozy/magic/magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + checkPhase = '' + ninja test + ''; + + postInstall = '' + ln -s $out/bin/com.github.geigi.cozy $out/bin/cozy + ''; + + meta = with stdenv.lib; { + description = '' + A modern audio book player for Linux using GTK+ 3 + ''; + homepage = https://cozy.geigi.de/; + maintainers = [ maintainers.makefu ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23b2b7ac91b0..2c118561c8b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -653,6 +653,8 @@ with pkgs; chkcrontab = callPackage ../tools/admin/chkcrontab { }; + cozy = callPackage ../applications/audio/cozy-audiobooks { }; + djmount = callPackage ../tools/filesystems/djmount { }; dgsh = callPackage ../shells/dgsh { }; From 3251dab047d66c16a172f64e9df09dd2e7e6f382 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 17:14:36 -0700 Subject: [PATCH 644/992] libtoxcore: 0.2.3 -> 0.2.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libtoxcore/versions --- pkgs/development/libraries/libtoxcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index b3636eef2621..4a8dfc40d4a1 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -49,7 +49,7 @@ in rec { }; libtoxcore_0_2 = generic { - version = "0.2.3"; - sha256 = "1z8638cmxssc4jvbf64x549m84pz28729xbxc4c4ss1k792x30ya"; + version = "0.2.8"; + sha256 = "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm"; }; } From 8e15e9c45235f015bb7cfbb634fd5f91a03acbb2 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 14 Oct 2018 02:41:33 +0200 Subject: [PATCH 645/992] monero-gui: 0.12.3.0 -> 0.13.0.2 --- pkgs/applications/altcoins/monero-gui/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 49b8db51bcc8..c26df670930b 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -5,20 +5,20 @@ , qtlocation, qtquickcontrols2, qtwebchannel , qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind -, pcsclite, zeromq, cppzmq, pkgconfig +, libsodium, pcsclite, zeromq, cppzmq, pkgconfig }: with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.12.3.0"; + version = "0.13.0.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i"; + sha256 = "02419rqi3zfy6yjyw3b3gvkbxh2ypdfpijiiklc7lyblb9nnjr68"; }; nativeBuildInputs = [ qmake pkgconfig ]; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine qtx11extras qtxmlpatterns monero unbound readline - boost libunwind pcsclite zeromq cppzmq - makeWrapper + boost libunwind libsodium pcsclite zeromq + cppzmq makeWrapper ]; patches = [ From e2f8d7bd447bf06496cf3f8c151ccbb58e08ebbe Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Oct 2018 19:53:19 -0500 Subject: [PATCH 646/992] libbsd: fix build w/musl by adding missing include Patch from void, with prefix added. --- pkgs/development/libraries/libbsd/default.nix | 4 +++- pkgs/development/libraries/libbsd/musl.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libbsd/musl.patch diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index dc7213acd638..a8d1925e5c0d 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { # the configure scripts nativeBuildInputs = [ autoreconfHook ]; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch + # Suitable for all but limited to musl to avoid rebuild + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl.patch; meta = with stdenv.lib; { description = "Common functions found on BSD systems"; diff --git a/pkgs/development/libraries/libbsd/musl.patch b/pkgs/development/libraries/libbsd/musl.patch new file mode 100644 index 000000000000..fc07cfb6e855 --- /dev/null +++ b/pkgs/development/libraries/libbsd/musl.patch @@ -0,0 +1,14 @@ +Source: maxice8 +Upstream: no +Reason: fixes compilation + +--- a/src/flopen.c ++++ b/src/flopen.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include + From 6a1e3aacf3039f782ae599c65f57aaf11fc5038b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 18:16:14 -0700 Subject: [PATCH 647/992] slurm: 18.08.0-1 -> 18.08.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/slurm/versions --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index e016c5860f74..44ae3b894d54 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.0-1"; + version = "18.08.1.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "0mnaynnpz0cyd1lspcln6h6w5d7brcw3yiqsfxqrfhlmygyp21wq"; + sha256 = "1yndxi11vj0di3yf6ky78zcnffk6d3676gf5y7jn7vwxxmzm4h5k"; }; outputs = [ "out" "dev" ]; From d1ab722b26c983da1ff3f56687289b5ebc09a7a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 18:32:22 -0700 Subject: [PATCH 648/992] renpy: 7.0.0 -> 7.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/renpy/versions --- pkgs/development/interpreters/renpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 4dff7e6974ef..22b4f93b136c 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { name = "renpy-${version}"; - version = "7.0.0"; + version = "7.1.1"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "0yrwp5iw4fjg7kbd041qv8gh2p0dnbrnkrgmn0ndk5k10pjij82g"; + sha256 = "1lmahwgy5jyak0bdbh4jlr23x35f87k7jcydkywns3mph6q7r01i"; }; patches = [ From d545e4dd52824f397c8aa6f06b59fbd256646b3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 18:40:40 -0700 Subject: [PATCH 649/992] sbc: 1.3 -> 1.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sbc/versions --- pkgs/development/libraries/sbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index 0dc9c1afd2b4..b9830b65ffb7 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libsndfile }: stdenv.mkDerivation rec { - name = "sbc-1.3"; + name = "sbc-1.4"; src = fetchurl { url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz"; - sha256 = "02ckd2z51z0h85qgv7x8vv8ybp5czm9if1z78411j53gaz7j4476"; + sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si"; }; nativeBuildInputs = [ pkgconfig ]; From f60759ab37b7e856e939424628a40a6ad5865aa2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 19:03:27 -0700 Subject: [PATCH 650/992] rspamd: 1.7.9 -> 1.8.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rspamd/versions --- pkgs/servers/mail/rspamd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index c8da0ea630e1..02e14f3b5aca 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.7.9"; + version = "1.8.0"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "1qfkmcrcswh7k7bvr1ki1n83lnjmfd9h0281qgia0dlam7y81bcy"; + sha256 = "02q1id9kv5d6w1b1ifa2m6qrnbsja787dn0ywwi0yrsaqwk63wk7"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; From ebb8bef904d763aed346017e1f2da83decebf5de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 19:05:14 -0700 Subject: [PATCH 651/992] sslmate: 1.6.0 -> 1.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sslmate/versions --- pkgs/development/tools/sslmate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index 279bce20d142..9261b892cca5 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, perl, makeWrapper, openssl }: stdenv.mkDerivation rec { - name = "sslmate-1.6.0"; + name = "sslmate-1.7.0"; src = fetchurl { url = "https://packages.sslmate.com/other/${name}.tar.gz"; - sha256 = "1ypabdk0nlqjzpmn3m1szjyw7yq20svgbm92sqd5wqmsapyn3a6s"; + sha256 = "0vhppvy5vphipbycfilzxdly7nw12brscz4biawf3bl376yp7ljm"; }; makeFlags = "PREFIX=$(out)"; From 18f2d12a810ee22bd2dcc64c8ca08bc29dc590ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 19:16:16 -0700 Subject: [PATCH 652/992] react-native-debugger: 0.7.20 -> 0.8.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/react-native-debugger/versions --- pkgs/development/tools/react-native-debugger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index a1b9090417c1..3bba4237cf85 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -38,11 +38,11 @@ let ]; in stdenv.mkDerivation rec { name = "react-native-debugger-${version}"; - version = "0.7.20"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "0nd707plj2c96g0dl976dv8b6dlfh12pdqrmxvp0qc2m2j6y9vig"; + sha256 = "180rvcnr3xxg7nb5g4b45l9a67h2dx8ps0l05r6ph3f71kzh4dd9"; }; buildInputs = [ unzip ]; From 2b1d4611d19755cfe62d3a0ee6476deccf10e1bd Mon Sep 17 00:00:00 2001 From: Jonathan Queiroz Date: Mon, 27 Aug 2018 21:25:10 -0300 Subject: [PATCH 653/992] spotifywm-unstable: init at 2016-11-28 --- pkgs/applications/audio/spotifywm/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/audio/spotifywm/default.nix diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix new file mode 100644 index 000000000000..f22340b69412 --- /dev/null +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, spotify, xorg }: +stdenv.mkDerivation rec { + name = "spotifywm-unstable-${version}"; + version = "2016-11-28"; + + src = fetchFromGitHub { + owner = "dasJ"; + repo = "spotifywm"; + rev = "91dd5532ffb7a398d775abe94fe7781904ab406f"; + sha256 = "01z088i83410bpx1vbp7c6cq01r431v55l7340x3izp53lnpp379"; + }; + + buildInputs = [ xorg.libX11 ]; + + propagatedBuildInputs = [ spotify ]; + + installPhase = '' + echo "#!${stdenv.shell}" > spotifywm + echo "LD_PRELOAD="$out/lib/spotifywm.so" ${spotify}/bin/spotify \$*" >> spotifywm + install -Dm644 spotifywm.so $out/lib/spotifywm.so + install -Dm755 spotifywm $out/bin/spotifywm + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/dasJ/spotifywm; + description = "Wrapper around Spotify that correctly sets class name before opening the window"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ jqueiroz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab5508ef7331..abfae478d295 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18826,6 +18826,8 @@ with pkgs; apiKey = config.libspotify.apiKey or null; }; + spotifywm = callPackage ../applications/audio/spotifywm { }; + squeezelite = callPackage ../applications/audio/squeezelite { }; ltunify = callPackage ../tools/misc/ltunify { }; From 1828799f471a9d57392388215f9b80fba28ea13b Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Sat, 13 Oct 2018 20:10:21 -0700 Subject: [PATCH 654/992] easyrsa: add support for darwin --- pkgs/tools/networking/easyrsa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index fcc6c1d86bdf..8205bddc7fe0 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -35,6 +35,6 @@ in stdenv.mkDerivation rec { homepage = https://openvpn.net/; license = licenses.gpl2; maintainers = [ maintainers.offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 726dd7915135ad5fc1098776a822f5695e49ee23 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 14 Oct 2018 11:24:03 +0800 Subject: [PATCH 655/992] firefox-devedition-bin: 63.0b13 -> 63.0b14 --- .../firefox-bin/devedition_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 582da6bd8c94..fcfa88a755f4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "63.0b13"; + version = "63.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ach/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ach/firefox-63.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "34615c8bf9be4bc1f544c32df32d986b44d66f91e5f9a834fa7d7321b951700889e7ba1cf41348df457ffc71dd40e8f52177266299ca3044fc2af4514956a8b2"; + sha512 = "baf8a78f63e7fe6b09ac1d5fc4cab9d51b7f43f5dd747c569aa9dc17380745b306a714ce3c166ebaf48f180a62492e15bfc3f1e4d597bbbb766101a9a984a68f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/af/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/af/firefox-63.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "501cd71d70809bd81f233b5205f06f289046eeab8258b1fc87e652ec2235ec73dd7f783f5d4eb8206f8981ba06f4ef312ea4a28e3a23dbb34a099cbe74bfbc7a"; + sha512 = "556958203022beeb2a091f347bb02dc6815cb8480dc05c92021d8b8290f7eec632baca2e697d476d63f52db5ffb62546f52b696ada1163e39abf4afee1d73792"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/an/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/an/firefox-63.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "e3cb48e42d423843e9e563f94bf28086c6b68306191b1893aa5ddf9e482ab947bc3bb123e36d64b3f10eb9a6750c845799ecaea721858c3de93cb120561f34e4"; + sha512 = "2ba5e5a9d5a4aa80f3fd30e85d2b94aa024d14d13572433fcf148d3211b9400a08c899cae57359b4ba09b0038d5e867e4266fdecb5da5a45ff14d09a38f864fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ar/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ar/firefox-63.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ccea5e826c4701f33b72165a6aa5087e9cd030c763fb291d94deac2a4650d1666b187909a6122f80df2d5182053cc31c63354fbba468709d8bbf9d3581604469"; + sha512 = "866c25745a7ef818e9293bdf3e5c0d64da71afe6f63157a3fa0ef0712cda2d1ffa6407ca2d9d4e240977f01fd71215fd9446f23a850c012f5ce86eccdbc5e3e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/as/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/as/firefox-63.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "5562bdcfe2922203a51e28ed2b03d98b24e401d447acd91b32de25db4553f779bf98530912e1063757d2340e73b7c93092d7b56a208f4b0e899b78c1f1a02f07"; + sha512 = "15bc92f11b42ebe01a1e3c908f9567807c8cfc2abb67a29a6bfa90d59f4835b01ff6b36272b9db1f6e5880fa7d38fbec5edbde7a7444ecae74eb8c429e89c8d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ast/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ast/firefox-63.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "4dae80bb715f931f2b7b85a4031335edecab8eeda9bbf8d5afa850d4c4db6cff1c41827a35d95d0bd3bd06351d835edf12f23f37a2fcd8735778cd898b969746"; + sha512 = "4e8b4f5543dfa4f73ecb4b18a3ffc10ac1a50cb39e67ce5077d78eb95ce7664f261663051bb29354fbef8e8f0ab0213f1abbbb4aa7a9b6d313baaa787bbdcb7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/az/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/az/firefox-63.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "dbea03117bbd76daf7dbe2b0fd5364255c998b9de8f1d5b1731613f676d442abb0a4e2de43eddcc0162f96898aa1bc7b08b72264d87d7625a56d177eb49d6d08"; + sha512 = "211032b7d21542900298ddcf7157a7d40991a6337ee51e7e646327eec8464b28e054a8ad8a42003c998a5010427c6f7618405ea3b95dfd0e484f73614250936c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/be/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/be/firefox-63.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b194bed02d6fdaa0389856e9b838cfb48d2d3a39cec8a6e4a6b80fc5fff9fd6ffaad431c34d546475e8cc126fc3a686619f72a557ad9f2395f5e2db4932443ad"; + sha512 = "985f1f45357ec1579a7aa84bceb2450f5fd8779e509c9ce8a01138f5c4b840ef18195ed1b7309e3d6d436e9002516c2f76a7a5d1081345b5a1893fcee43bd123"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bg/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bg/firefox-63.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "5b6c8ed858b5e412bdf75643f988226a762e8c649f33064e488e1790b1266c8fad5a75eb79110aa1d03f9699a05b0d87494d7a1171894696399c1b74f8ac929d"; + sha512 = "2294ca16c22477953f9bb75c4be3914822c07c19cf7ae776d4108df6c3bc3333bfa72a129645487a5b245cb5c97a3ddfd225079be5380d2a9433e98d165022f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bn-BD/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bn-BD/firefox-63.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a44fbd3c3d0607c5c5193125002bcbe890e7fddb6306e45ea7dafe491b43085d55bcc912e8e94ef9c6bb7c3672e6456806f17a5291b0588742319a69ef93474c"; + sha512 = "99f1fd21abd3f92d73daaaeab5c9987728c7b852505e6b92a67cf59efad7115aa4586e34d37c77e4f5a3011c5a82bbf927e9a918c723221a2b48d64d650d9d3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bn-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bn-IN/firefox-63.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "dda156f8acf3e0790c4ef2195eeac9ccc5895e1d92999f4b8254531c55e1074c313d8acd98182781b35c5d96592227ff29435d1f4c55ba8c39de60de4ea0ae92"; + sha512 = "c1ee3e532fbd6eb047d2de9499ac1010d9ca2d4b4b0c19845b3d248771022d885e4c3fc159d6ae37820186bb4a2031e1049ee8af219fcdcf0873d0b585840258"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/br/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/br/firefox-63.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "8812bd2e2871ead8b507ea1b9625c997cfd21547a0acd1bd2a181c5a88180708b5a9b29d8c162c977fe6dcaec48e0704ea17e49623f0b15b194ff553d5cdad99"; + sha512 = "7e7b0c3fc861aa4628acd0ea6cc1a4d0b5015ffe2b02b8ef716861f1ec97122f1ea4bb60e7bf3c287ad77cbb91836513b6e073f88f8183800a77afaa2693a833"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bs/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bs/firefox-63.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "e016283425dca5e6622bdd3826ad6f720f7ffbfeab4eb3e3f862da2ba2129f3ceb17a2d0b39af514d197519a2e09294f0a4284b8f4d0362598b776e3791a54fc"; + sha512 = "6db4e06f0c4ed652f983415009079b7a92b73d715e4b5b629cb4962c533a9080c1cd5129f2d4f1d59dd9118d0d715ed39f76f976a50b0b2235ca220b5483f7fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ca/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ca/firefox-63.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "cab866b668a3e010e22fd92e29bec5b65404f1690f593e49b9aa03cc2ad22d3707f04451e8f6d86e796f46270c671c370e103296952bb63a59708b627ea6788e"; + sha512 = "cfbc585b9404a9a1aa5a94eb2e8bc4cac923c557c9c2b8f22d084c0b118aa8b93cba4f28850b6e3e435e6456e63f0c7a2c029e9269db5a55a66d597a91b05235"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cak/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cak/firefox-63.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2bc6de3f1e4bb5a99734a04aedc9e4e73b71a588bb92dfbe520ab5df3e4128b683b83d67648f7b39261aa25d20f1b12af875ae92ff4fd628faaa202a268eacb2"; + sha512 = "1e96d1e9b91147dad5244514e87c1aabb1f7e17bde43eca2c9044b8085e12228c943adb540eff283dcd5be78b319beddd0161f0397ec4486109401023ab3c29f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cs/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cs/firefox-63.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "de405fffb62de62c06cb6ae9360adcbf97496addff647a1a738f35a6d04b58eeecf0f2869f1daf5147da1cbc91661a04e6607d7ef2759ed4933dc061ad769cdc"; + sha512 = "0ee029b5ade528f59cf039cf63c4fb03a25ec79c4c8ddaaf9995a10572f7a26f446461d3948023c54d6fc5124200b11e331233100eccbe74c5b2c819358f0474"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cy/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cy/firefox-63.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "107bef8675386b084a74a318aa1526aab541a281cfe38a782a42800cb8d20f009d90d11c08386274d20e0f91f2aa32b09814d64ac759b56c247cc23c4921547c"; + sha512 = "6270844c17a7c0f5e25454083acdaeb668bd76fad90b925762aefcfa3bf281116e47ab5946389e3a0791cc3ff43e1faee022e701421156e1991aac863dfd6ca1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/da/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/da/firefox-63.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "88ff633e4e332e32d1f494f7032d1218ec122046c0d134365e1b7195232c77a06c9c2267f27f5ff2ba115832557159f9bbab4c6d9405c2a051a3b3f31662ae2a"; + sha512 = "2d2b84db47b7ef1023f321a001223b30596df58ca322e6e893797fb1806df24647c5c529063b503869e0c34ad9982902a252f5a6e4151bcdeb97ec5015a2b255"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/de/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/de/firefox-63.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "427f9b2bb38d94ec872b3fee46a234e3d778f468330be582edaf3205fa9721a7608d5611df9c3c0586f325f116c044a1c64f1920e3939ebf40990878b00d24d7"; + sha512 = "602577b05601b303eebd51d6fc922e60cf1706dde4bd7d9d1a9549a8dbd960e726d58b86ecf0607c3984382fa8ce20d5cf5152a84b01484baf9dde235efe948c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/dsb/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/dsb/firefox-63.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "b51741ac82877a212b7ce3f6f58c60b9cd2cc10b4cfd3bee584ad14acd6381f04268c9670e3457048c1bc804fd534e6d271124684e3d5eb19d204b9068b9ca2c"; + sha512 = "e3ada860ad1b25dabe55d7497cabfb495324a57429d7fae70548a40e0bf613b9a8c699f109e2c93faefad774a05fac8ba59e7356f360547f38cb7fe96327f72a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/el/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/el/firefox-63.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "a2e9960b35789d53e74ee55081790962ff5aa0c928b68a04c99c06ed32bd35cf776e3f39f1d8933403f97a3d1c5471f3e9915100c1b20ee7e3613801adee1dcd"; + sha512 = "efd92ecf884798196dc04121ad93a1a152187806f4b33829914a4e2034b8a131d5e58d2b2f455ca65f8983cfb39d6993e0c6ecb335c0246a20411da0d132ff0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-CA/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-CA/firefox-63.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "7aca0601a1e298f745267efada3d9999f57643bde087d182ba053b32f995b19a9ee166297d805b440cd5716b28ebca1b6a1ab234da26fc83ee71148e279338de"; + sha512 = "1933a5c39c8eca1ddad4918fd2f49b820a281d18831b5fed0193dd6a78b6ee3b019c5307d1853fdf14d805c5642b92982e1ef4079a191254c69f8c9c78ec3883"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-GB/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-GB/firefox-63.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "0eafc24598a7f5e7c15e2d49db5326551c215eb0e8a89215df30c3a26b09c44fd2ed632698223ef78e24024196860625aeadfd290c5bb35adea04e84d003614f"; + sha512 = "ccb03d4eb7e81f04dfb700016c0b84be72c2d0fa15d63460f36ef66a619bd2de7e98840f9600e2be0be4bed8f247ec4363b4544ee66a43540ae0ba4f6a00a52e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-US/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-US/firefox-63.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "bfdd31f584b739ad09498b0b540150348c68ccd669383e7afefdb303573b553c4fef74e0d3e587486178f7fc00c9096781172cfcb81b0dfa4d135a4c1a597e80"; + sha512 = "e533cedecae4c0916b18d14a2045d0bd0acc5b2b812a81adf268280505027b034c29f584c71343e10d88d1b021cc6cd22481d1c36b50ac9a8504014db5741138"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-ZA/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-ZA/firefox-63.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "e3989ac6cbdd96e4bcd66c80865249ac501bc833708969d68f2ba07411ef8feebe74cbffe04676dba7979908b794d33af8aff82e79b8e17bbc7a09b344233cb6"; + sha512 = "a2996e9ed146f2ef5da7c837d5341be9c87f65ff8ac42d97a455aea5e00109c702295df393234f19dec6af16d77652d53d94a1822604367530a088e8b3ae6a3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/eo/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/eo/firefox-63.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d2ce6fc32f5fabde2d7748b3b2930d3fce260eb08e49e290539e6f8ccf2c7434324ad99395879e3fbc6f34b97abb6e7b450359045f9344a68dc55c4a8d49dd9a"; + sha512 = "2fddb89b3da67fd871028c1740887582be7414607f7dbacf7fa05984a593b59eaad7a2e96da6dd28941fc17511db2152a4bfd673a7e5c9e11e2c04d56be21a7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-AR/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-AR/firefox-63.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a23f44b93e87781fd4b7f2dbb9084f67410d4713c622be52c4d66f3dd4caf41f135592fe852a21b29ba2364fc3bc8c910d2447dfa102340c0a9260ca53da07e4"; + sha512 = "37cab9ccb5254ca55ba798da4c26617acc75d47a4a8610e8dbcdca3c3494ddc32969a1743a440a2e6935535093b86520df94997bb01bae6185a12ddb041a09c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-CL/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-CL/firefox-63.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "628910a5012f060f98308415965050184c17b4d8cf5cec9ee90c97a59da6f4384f8a571fe9b1107d2596c10e8a9c9ea2102e8b393ef04c6f0125269f8e207b57"; + sha512 = "ca661918dea82892d0e44277ac2513f9104485c897ff1239495f63bf976efa04ebb10e32817522f8a237aad7c85e6678661568ee456a8cf5a99a36b7bd6d6478"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-ES/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-ES/firefox-63.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "a9bfba0b13e057fc05b4fbda7a5da6ea3dbdb014ba7d46dbaf76d193d677bbcaea7cb2c65aa6b174c8c0a967e88411e03d11039bc4942f4f8214770b636c2ea2"; + sha512 = "d2316270848dca3922e5b18264fae1fc8f791a9234cb234ad3c9a80f56c8e13bedd63e73712542509a68f9b7f9482a46fda56ea61478b44b9571151822bc83cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-MX/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-MX/firefox-63.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "b600afd00e3b8d3ad597aadaaff99c0ebdb121829a637b197acb993368a792c88a6219b37e2d10c9ee57e941794cd279837f63ad7c772acbce9cd8a9067a95f4"; + sha512 = "bf032b016c2f9fa2dc79b22fb7ae807ce9c744ae563dcae66f20849f8696d1dbd30404c629acad472e89a4f42a504b6c46750684e45988146747d505c7b81d28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/et/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/et/firefox-63.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "5938b8535f581ee8801ff78a31425f147a6d21c708c11c0a5c65253ebe811f684380249077e7df4f502dfce35edbccd9f9c5418139f1cc2b327d601c91d222ed"; + sha512 = "1d89153f009e29709d20f2a38a2ac34395bc64ded8021897eab06a31fd573962b2166d8367432e30489ec0e5062e3b526f7077ed08b7177aa4744a50da33286d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/eu/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/eu/firefox-63.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "235c1bb90687d250a7abe644149aa0000ede3b90f070593801beaf77133ab90b52697a3a799b9da9abc5d61a5f489e991c5989281fb13a1558d4bbe1fb2a5547"; + sha512 = "e42f0014a0235b9baf6cc0c15731a70cb2ae6d35b477cc12d989cb383b3714aa827292bfe4943163648194f79ccd542ef03378ad119020c59e8251a8161df60b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fa/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fa/firefox-63.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9d29949da55984f261a3b5b74f3cd29222b8c7743da838674ed44f21df3548f940e295cd34f4c9cedb5f26165a1f65e9d9f5263b931ef414c446600f6246cc0c"; + sha512 = "e6d2cd4a97b45519adab8e0b498e06100556614f9ff783030bd5a06acde8dad508b8f4c312fe7bb97ae837d10f4d0ed00ab0add86c7551b97a6c4101829d036e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ff/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ff/firefox-63.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "994ac583be5d6428b7fe575c9a33d0396f0e2cb6fe3cfd256fd069b5c4590787f7606d7c0ff89004cc3adfbcd40a3466a1af72a93cba1f1d072f2dd0e9c25763"; + sha512 = "b44ad961e626c0964aea65673b54ec2555ad322d0ca25b7b1cd934afec17a2809a1c46ebb15d2a22b4ac597c06f2420e940e7f4c980cbd6aca9badf9c39fee3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fi/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fi/firefox-63.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "710ec15475c002f14dec5b63cff6878be3ce9bd36626641d7a9927bbf7f393338541945b77fa309f10f22a67a89b8960e19b5edf6390ccbcd37bcf17a166eb20"; + sha512 = "9b8769687c95f867ccf53184d0012507c7ec6835779563c8ae89556380a44f61532f1d44b2da13e39998cceb4591cc0d57cc7b627ec80467c2ca6b291022255a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fr/firefox-63.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2e7e2d0c3d7db2a2b8967cfff4341d63a17513d4953f8ab1d7822ef71ea3735f0b2c092a56ea7acb1253de1dcbccedf68680d68b25d0e01f923375ee7d92dc6f"; + sha512 = "e9d8fb68d4adcd2cdfe0d3849cc59f3aac13ff488f34459e1f391ce896b5bc302cf48a3bd979770db3fa19650b764bd2980be5f62ea2853a7fe247a62734e996"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fy-NL/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fy-NL/firefox-63.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "feac9d6a241186e8a5d995fc4fc959be09b7d8561b1d36fb885801fd061941d1a882de2d5aa81135f7bb63f9fc332b748486518d690c375162e3e987353c4e71"; + sha512 = "52514c4098e6cb2a109e2530b7c59a0d9338c3c7085c5ee99bf9ed1c0400bbc1c846aa7e3303967c7d2eb7bfec691c4875418bba0aef2bd5133e0f7721edb71f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ga-IE/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ga-IE/firefox-63.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "25a9d4d87eb083d48dee3ddca9ca70b8d1fa30262c002a41eaecf885343164345204d4a3588bff03fe0729b1b3de5352e3223f091fb37f8f490c987ceefd788e"; + sha512 = "d37863818720ebac9d97f09464aae36b02c38ca82bc6a0eeee5bd38dd4e57ab98a5ca340a6dad4504ea230def09984854ef10ed91a4cbbbe0cb18eff1a4af929"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gd/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gd/firefox-63.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "83cc9f13165bf0220c943ce0557ca58224ea9dc66cf054c7d68ef0879340989ff1ad90dbefa34cd1c4b82944c17403465b99c9c0fef3b7e4c944e4681560b71f"; + sha512 = "24baa5cb6a00b40cb6bb53e1981abd0b048ed30c2898f5f7b24c2c3ca41465f5f7fb258b86441bb2a2327a461a2764969f216715a5be4e1744b798501e56c239"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gl/firefox-63.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "b23daf5212d56b386c2fd080e9a56d1b19235b794a27b529c9bcb23984abe1464955bae5ab40f7d358b3ab7fa8ed2d68cb086c323b0d42ab672a8a646ebae8f6"; + sha512 = "7a653d3262c3b433dac0442b03be5c358a357a7905bcb352a7d808c00d68110d4587d1f2155acfc69522374c91b44261b3f2f874ae2f17b06e492f7cd9fb4085"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gn/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gn/firefox-63.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "31e47a2402f48031b502dc40ea12350846c9915bde6ee7f11eccd4de1f427258f2a187c9b1469ed9d47689ec9953826362f4c7e6161651d175723a238db569ac"; + sha512 = "54c135c24001d57a79e8da52548b9589d4d1a5864776976fba20fe9be63f6b2429705e07f816aba438e6d6fabb16cfe309a5b267062a5e3a19ae3b946752ad56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gu-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gu-IN/firefox-63.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8bc66f49f4ab7584128d3574760e16eca026701caab8aa3c28d4a3e9543dde25e6d8f4bb4216549cda80b89e5c39547205e94f11813af1920bb4488b465e8422"; + sha512 = "e86d31256874667c80db2c568c0189dcdb0a5bf4e86390638a49ab8a411b5c4e3d8facd9c6aba181962a61288992d9c5f7506fab168005db93452e7d79533b5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/he/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/he/firefox-63.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "50e316c0acbfca298fc8d02ecc5561797d4557fdd0f2347ee9cb6547d9b4b78076ccc52b114df81479f96c0b122959da088703388f29597c1e802c27b080e09e"; + sha512 = "1544ce91046c2c5dcce685889cfc6aa17032d3cbb8f6ac59eb8859916567922062c38d566d69e0fdaaac81be19eabebcc35d816c455cbc02e2e439ac7613ae63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hi-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hi-IN/firefox-63.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "193ae2c739c39d3933170a1a53aa9e987fed221be59d862a49f8ed916470a4009c46b222b5e92b02a362b07f3abfe85263cd0a7eebd6c45a8915dab2398bd702"; + sha512 = "8780464509cbdbcdd7c7a7e21964881dcbc5e2e6b9289ab4cb262b63e264459ba85e78af89ece752432b352ac0c0132bd8f551500180cd6e0886fcad8d71cdc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hr/firefox-63.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "da7ee45b5b8beba3476aea9949bed3bf22a71f03642855c3c67a32028f94c6ef709b8ab3fbc0b8a4dae7bc95fc977615e6aadf00f2f1002061ea69e327ac1e71"; + sha512 = "5221765d6d4781dce88d9c4904e2b0c29b0328ff029672b1a4caa773a556fca3e871b53da5fb580b9878cd0556f5db629065171c79035709bf0a750d3e14f0fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hsb/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hsb/firefox-63.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e8bc21952b7bf8a41598b7294546136089b21c4515b7a5101b1d2191f6b1d3bae082590b9c921d13c46a459fa2f67cfd3c37ba0b636f027f3e7a67685bfb5c75"; + sha512 = "c4f61ea2530d279df1f96ff29631c43f3cbf23dc023b93579e8434539921ed9705e64f8d4f0a4fde1980384505b237c926b50a15f17eec5bdf2599c9584b1fc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hu/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hu/firefox-63.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "3e73a62b810dcb521c7f5e477ba4a26c70c003c53f59c4ab9984a983df785a871eaaabef57a9873edc22c64ceb572a658c5d4ed4f53e4f02d2bf5a62d0032c5d"; + sha512 = "e06a424d115b32bc5225639d6fcb5251904d49730613da9e308d40f681392b992b4aca1d251d2a68921b2bfd270de1506f5647a59d42e9c1f6305347f0fd6328"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hy-AM/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hy-AM/firefox-63.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "a10ccb8f7d38572ab16dd7ce4495633edbe66dfd668b05008cef4dc0a5dd01df7317d2795daec8f41f06ccca344673072ac1dbc7e56d77e5233577d9a73ce300"; + sha512 = "b856071f3cd1a90ae12b06797c2b3eaa8e019a49890599670e5e3d564029052f27b62a7ac6dc80056cd6f1be6b05bfff44a1341a5685514959c69462d5c68e92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ia/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ia/firefox-63.0b14.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "9240f49fd6d3bc0531acb01f31c4777e911da1ac5bf86ff620d197037d8b814ef9df217e3e4c53152eac32f8504511257818433dc0da86fa2b83963501c37f4b"; + sha512 = "5355629b1db1cacd0fff5b681da7fedb234a19187027925534ec18d59e9e68e84ba2e1f86c0969da5459ead80b2bef14257b6c4fd193e492b7d22c3db7c498bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/id/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/id/firefox-63.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "43556f5c0fda64eb3164ee62d4deb21e5cb6b32fce5820dace98c745b89a5edcb8881cdbbf7dac26f840145a3450f363ec0fdcde0cefa607f090e35fe4dd5c6f"; + sha512 = "59741fe39778528934766b321061dfc7b50853a6c2aed9f1316662aa7bced6a2adc6ecb4598bd7d8e4180e5b446d840b917794c017f897f4800b6722ae6e8192"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/is/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/is/firefox-63.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "a1e3cc5ad9efd33e9053ce1c7495bdb6420dd71aa966cbc4a8ef74fb92993943f5afc6563f8863f6e2efb9f9fc13e56b92771ff209966d7f3b3b28b107686b55"; + sha512 = "1c90d23e59f2a499d98715e8f747ef80361130031345aee44a85bd385a802c13cc55a04374cdd18ba85a2796fc68a749e77a23f1c4d402cb0f28c0a70e9d762c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/it/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/it/firefox-63.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "74ad88540de11314be567d277bb4b8c015eefc6ca676d58ffd844aa7ac84fdc9e01c88c1eea16731bcf7e21b69a4d0a3c52a283c0b8a9c19746f9deb971f3502"; + sha512 = "fae18f485444ca9db42b44759452ccbb814db34a9f5e95b061ffece9492a9dd06fa0d83b898e76e33882c5fb3dd353b343714ab74a7fcc83314e76cfc248fc70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ja/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ja/firefox-63.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d4be7496a7c051007e2c0766cc4efed5def3fca6ddb54db1aa17e4644323b7029cfc57deeb33f80ce0266fa129e303cfbd1eef7cb57565d7e2740c0f98dc23fd"; + sha512 = "5d034246e87efe01eeab0d3b209f968e861cf2c2d6a45d64be733d944c0e2c9788db274c21d470abb603d2522b3fa5705c5f3990ebfc3cc4c9fa5f641a98c07b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ka/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ka/firefox-63.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8b5128e43d6bd626bc0ef52b7f6dc1625bff751fba00ba04dfb3e378274b578be4384dca22b37a2c01b70358b098ba8062f2228219cc3194d84bd7f3a5f8e39d"; + sha512 = "1cc70ae6775038225a83595e74113b3f14650ce0cfb7890945387afe638ca2a8a11ffd9084c395ceeda58b36d15f89a6458236964c6e4893764312fbb85f2893"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kab/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kab/firefox-63.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a6bbfa967cb96f167a595453ccd699f55ff2175366063fb69a28026498334901286e3a1527b36a0cfcdccdb5c7b22d6ab61e39979e261c206b51565b408625b6"; + sha512 = "4df6f0b331410e8669eb450ccf57a959dff94b3b8941baf9e14d033fc43481b62c89351217a65c2e425225b5bc412e29cecc743c75f751e7d4f54817af1bb78a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kk/firefox-63.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "bc1e4b1c2b4a9d098cac8ad7f227f1be756dde3c172d2867297862f1d86ac268d77a3d4ee1b4d685cb8f7fcf0f4ac5eeef6bdb41e802da1b5cbaacfd121c8285"; + sha512 = "dc524414f0da850b15327a47b02f7f1852095aa6878a1015da3807103ac9cdb54a7dc1126a44a0dc02e12edf593eedc3db7e11905079fbda1fb6cc3be94b2a27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/km/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/km/firefox-63.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6600bf27398ac41d447d3c73f03f61b3f631303ecbcd31106c9db824d805e24c0754e8da34a6befd30c72fbf6c4eb059b468924f26fa145bdb1444813b7fd895"; + sha512 = "bb003bb4a67b6ef935ba8c90aedeeac77c813c26bff798927c9056f53fa287fa69bb07fcf998aa1603c78b7f22238ef2dc91442f73c22a2488f7bbc887d315bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kn/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kn/firefox-63.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7d10dfb714e62820f02ea51f453c6ef8671fc6feddae63354d73ab053e584151c32f6490421853f56f048d2540a4537f99e50ceaedefb8330e6d85f6d3a62c6b"; + sha512 = "eba80394d9cabf5cd5de8cbbc1a91176df19e9b25604a0291f17fbf0c84b4a6dd6a4139b19a26d6f1e112cd57acfb3b567e7d16c8ddf9854bc6e8d44b9672e62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ko/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ko/firefox-63.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "6ddb53a1a2f7df7b7578e9c241f0c838ae5b29650fead195d8d2182f7ded0ad7827c938a59320553539b3b0fea4c6694e37b578e8c9733d38622123a46a17bbf"; + sha512 = "77a6c5a9c18534ff6ba70d52760f9989105aa72266ab7ff830d4a8dd21b028d42d209068c7c023b54098c9b22a1118370093bff0c9fdb3cf779cd4058e6756a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lij/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lij/firefox-63.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "dbea98459bc6a0aca38f47c48b72d22a102c7d544aa085d3ef12a8e290b56ea2ef11a95f4cffd9280c20601d85eae129ae31c48a607fad778bcc096165b3c585"; + sha512 = "3e0598765c0e05f233c73a5198bb94fc506dda4f0653a445d2d03968d709b6da875c03bf088efd2dc40e56682f77a33b848b6d29ac5e31e7ff7e5ac5d2824255"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lt/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lt/firefox-63.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "b1813a9cbb879019241e5cfc5439ad79f6bfbc141a8702b5c6ae58d0eddc34e7b9f5ed4428bed3b04d616d6a3b369b9ee56d1fb2458154edd27a4844c5a57fbe"; + sha512 = "ff07d3dd2d594c8abbac8662aaeef6beff0d5465205f84c79e1271d3ed9ee935548444268cf072d26d8574bf48bf69c5b74a3b451c93dfc581e23f7aac5ade1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lv/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lv/firefox-63.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9a2d526c26eae72699bad13d7441589688bca84541e83f1fae4539934c973d86631eb055e48807c19f3f65cc34f3144605ed8ba0dffc1f951f7ad2da551b4cd9"; + sha512 = "235b13b9d3e8c9d8e43265c5af82f7ea0aab3a0113787ab9b5a52aa9707a0a6c443ce6469ea88c34397bbdecceaefc570474ed05c3e9b1efb5576790638bbe71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mai/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mai/firefox-63.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "24f5466284251416f1d54261f074a3e35cc44241b52774a2c0dbe56289cf4ec5bcedc530ae8db33df628265c41031d47ca84de9877d60236c33fd9b8e71c1d97"; + sha512 = "0b9d67be23502e1279f895566e69fbee36452f6848f8dc814fbae23ded7b09a06850bf3b99d42038cb532b4c309f8ce21f7f4bb4f3eb74cdb688278aa23bdc6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mk/firefox-63.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "e1458a97cd0383e93804b7bf069285e18e797050891fac46e7e98dbfae9956e6a22dba38ba4514554a4134018317c2bd59d1fe7875419c3c5120410035db4888"; + sha512 = "da8458afd3b0f244d298ce70ea50f22ae7a5b2070078ecafa1f5b7dc5838430e6ffaafe9c333eaf81e21b11da9e65ba4feca23ea5abcebaefaa7e05f0865a7f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ml/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ml/firefox-63.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "07a71306ff1ebda998beedaf275f393c4aed96b12b1ed5f6c6d55d6c7f1fe8c65343be3d6924c61cc88c21e376c386ba2b837f1765261842a86a748dc672bb0a"; + sha512 = "4ac011104c0d52f418a712321bff63310575209b4e445e5bd53a047b7d3da2c62389862131ece662b7460b1aca57c51bcdad2a5dff2b692a5e1c40b154da2ffd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mr/firefox-63.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b9f9aa5acc722642ed4a27274d60ac054f06d43bd0bbb80c790c9d88afd25675dc8a2fd4d22f04b5085135916c383d5e4b6c612a821274d2bb7941b128d9c331"; + sha512 = "8d37b246a9b9b527e188e557c496df0f2efcdb92ade95ac3e34788ed5b1d4d9a2a748cd8ccba01360cc9e3273e143f63341fa4b87e50c1b30b07c3da884ecabe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ms/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ms/firefox-63.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ad341798073be55ca24190ce3774ffc5e355c4db34fd17bdb5488449893826968ebc47591318f2a0fae9cd6319c6b529ca203cde4ca250790b451f3232740795"; + sha512 = "5d67846ccd9b1e5550ac51f49528340a31ee5218169af5dd93a37e034feca13deae208610d1e2ecf14b515ad618e40db2857bacc043dac0662f9d9c4e1e86816"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/my/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/my/firefox-63.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "d6b631660961d6027ec227a8352c2fb9ea97fd8345908fbc8b8273d29ebb3391af49e89efb8c060013c7ffdfa733e6b0319e6a37cd84907ddcbc441e8b689b63"; + sha512 = "e55d0d24b8cc6ce22f6d16467631e857ebc7d7bee6bb3ecfefa536927cb7f32af08b5f0b9924286c7a2df8ab48c12d8af2751da9fdb3e012d1c031bea01ad39d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nb-NO/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nb-NO/firefox-63.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f809901e3018d02236bb6d6fbfee3aaa98d3332887e83e0e9b94104e11eeb1066a7dd313d3924adec68afa962e89f71f56e164391a4d4b0502469f4146a040be"; + sha512 = "8820195b803b46b4b01ff27c1f2dfb5182b96b329cc7a0c0a22e25f9507d2f2138528beeb4a2e371f432ae2ab67189c0f066da920d81adfa6790e7735d6fb79f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ne-NP/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ne-NP/firefox-63.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "860786fb3bb15792e5c6180fb1d2ad3a44f71ed71aae8d6e4c7799cb3daabd37378656672a3124759ab9c6b5d32793966992fc3de54c7a17de0066d09a3287bd"; + sha512 = "76f9fa940003a7d1596db4e8c231c2e773207a36dc6c2d3ccaa6667211b6015f8d8d5d7fb799ad86f9731184ac338d0f07e1ffa2220c03710dfee84d12937d7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nl/firefox-63.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "dca1ea920a191735011a44522166a2e46e023a7d61dc3e779954dccb9aae5a6c0af9e94221d150ce55351ba14c3de3de5c0beac65117e90ef5cce8107c39da45"; + sha512 = "35c90c990926cec24de48d3748d49285d9238a8a3ec7068c219145619f3370c0f0add66b364fe17f29b0db221b588050c6445399410f568f89bbe8d3d7efa978"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nn-NO/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nn-NO/firefox-63.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "033ef00d2c1ea1e5459c0ce6c3f1cc5e0d136a88a7dac28a2dd9d90ad2e8d036769fbce1993463800bbc96236913cf37ffd0b5f2139ab65547288feabfecdbfc"; + sha512 = "d5d851790e746108d98160d96bfa035af08a9ad27134d377e69f1b08f059afe751a6f516e76a512999420662e0c58cc1b1c06572fe596b86975efede5ee28349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/oc/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/oc/firefox-63.0b14.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "912da545e8fd176b269ab8d28407f00a4790136656b94c74fac4236636879c3fa4019490ddb2600bb897d58fc8171cbf7a2612dd9f8c98ab71c2b145d1a1ace0"; + sha512 = "27f61535766bb7f1008f900147c387d611ed7269b6826af271ddef98fab22b7db73f58c452130bd1d31303ff64f75e663dff4d2bd533589f97d183bc731cd9c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/or/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/or/firefox-63.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "49a2a5403deaf9895f18eca6a1248ad6defaea47d95831f555d05c995c70c519b2bafec8db9273f25068924bc3c80cdcc0dc7eda592449af574fcdb93ec87e73"; + sha512 = "210d2981e4c48f4b9381558ab77e9f55e9cdfa450adcd23b4348e8b7f554fc844d4de8b48283d14b7588c86843d1a2c41acb49df12d167099e42805fae268980"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pa-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pa-IN/firefox-63.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "2b91579e572e7d52e843c6303c5df04d34af0ab371b6cbba98c02c6fc41bb9e5d1a6e116cbbf2c91ed730fb5a19c308e825ac916785b1c447bde3d1d82c81f8f"; + sha512 = "09f5277ab266b671633f11eaa4389f3ca0e3ac2ae9e8b0c5c4cdc8d3d457a6973c213617f1f450bd4b7e598bedf5cb0820f06ae55846b1d47dbe34cbe4209804"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pl/firefox-63.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "d5c5250644ff2815b532c129a55e1d7ffb10302f156c78d6d06be07959504c613deac8e12640ededf66f6e70e2a1e7f81a8513504753386fa83d8fa805a12ee9"; + sha512 = "8f1071a5ef4596355f17e65c1cc06641f224b53486c9be9aa7ad8ba8e240239cef9dbd913c44f1f0136ef27bff152e0def1e3366255bfe555ad87331735a7789"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pt-BR/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pt-BR/firefox-63.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ee1304064ff6503433e4d6523727827f43b5ef8ce14a3a41f936d3c8f8f744594aa2749103c4f2d55687520d5e539795b77d5063e59b11f424729cadf49732df"; + sha512 = "609402cb9f3ae4d94ad33f0189e85681de1d356bb97d73e2b8c682b4e664462ec486a3a757234a7353c08a92ca7b5b3ced349c1c10e40e78950c493c09d3d788"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pt-PT/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pt-PT/firefox-63.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a26f9aa7713589c072d92129533eaa50fe162ed60e862541915da40af2f79337bd0c49ea1589fa38c5742c7f684850ab986d4510557d203e25512437a81fb3b4"; + sha512 = "4d375ce5879b9272396868ab4a70e82e8e1117dcb07d8d1e8780d90d35c77ff6b9c94179ce48233ca9b6e1c559d7c0b339f49066366b15ef2adc563cf358cdd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/rm/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/rm/firefox-63.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "38dc7cef6558f4bd4625f628fa2d048064d94ee0b03d157ec0bcf5577bc1d481c15ce29a0b430a3c7126ff60a374e07bab45c2fb05610d4aa5e1a03aedf0d5b3"; + sha512 = "1583dcaca18fbe88ac598449ad2d352a6857ba80bd7e97d07beb282b270b7277ee58992e622ab6a6fd66d9393dca4653c7e3562c8d7c6a006c7637162eca0e73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ro/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ro/firefox-63.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "7dab5b2679ff891eeb8fb28b5828069b338d1e9c5d679168551556784f5962b71a7c848fc13edf92f736f3349c403fa0a86a485643b1e29a52070fcc9e575d9d"; + sha512 = "79fb6405d9db8f6fe97dd7612574863636edaae54ed879bff5b2b137bec006664684de98e94c37c0d64f37c8b930b075dd47a47491b8377b8b1cfc351aa4b6ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ru/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ru/firefox-63.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "853c0ad182add84b9eb2033b21b3f7421252dfcfde0bedc16380b159173b293f1d478a821480af7ccf7717532fc2566b2ce9426dd52fda9c8ad588685c2ff8d1"; + sha512 = "eb23667f89441c24dc38835e5fb105e24eeb3e7a5d896943e796a92f9bdaacd654b984cef060328d8df6cd659ff6ced32d86bee5c3372c47f3106ce95e5f8898"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/si/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/si/firefox-63.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "dc0cd90a3a540be1abf132cdcd0491a1a58c17f0a32ec398699e2a9fe1e73751e16203310405c0c8f60477662778fc1fdc4e139073eb213232115f9cd0189d5d"; + sha512 = "e867a968620d23742c78f6798870a3e96c38849247fe66e068fd92f04ea78de434b6f4faea9e5bb01fe7dc0dca18285e39310ed354e24fac12a5c86a6378cb63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sk/firefox-63.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "ab9521a26c9cf2794318095829150a49cc3b01e2c88e6e7c604c0a2f45aa0087b997560b1111486743a89d78f8df3d76048afd503f09a41fcd03ae715c6f5254"; + sha512 = "bbfffdef77d2aaab7c2becf876b28fff518ed6eb3a87d96d9faf2c62dc0861a1a33a9260e34a3f4ad2bfe475361234a3401fa091531d1c90b3179fcb0a946aa6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sl/firefox-63.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "f1f5473848cdf05e1fc401254879e8591d2cc660ec5aa94ba64820d0423bbb85385f5be5db957cd4df5e2690557c9c85ab5795ca909fff2c3fd109be0f9e2f75"; + sha512 = "11101ac18a3f473028407d413057a9801afc76a898126b65b73bab057578e6d8f2eb2e9b29cb6be35a5375ac59a11a3bd6918c54a8fc23fb6caf35ff7e667910"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/son/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/son/firefox-63.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "f074e38aae351973fb4ce4fb3e97b0c07cb7f9766961f88d8c992c87670ea79437517ffc7562d6d36e40f30c717a3b36dc1da2d6e5ed59cdec5c20c5e84ac527"; + sha512 = "be40096b63bcb006c587489fa99abd758fe3a24b5f965f9e53b9e2602bfa37a3f07fe6660f7064fdba6861a8e2bac5f3da5b0616968ba4b88d1868d0955cb0bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sq/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sq/firefox-63.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "7e27f79d7ae1d6861a5cc41c2a5c08bc9aa011017af214c443719e292c1e42bdd41f38fdba356ef2954822e47135c5ebf7af35efebdd4b0b6b6f89d1bd7195c1"; + sha512 = "cd6b1f2e826d575865cf51fe78f3872c50571c9bfeb726f4a253dfabe3af3a91ca1fd238d5b5ee73e1a01339c88444fc3dc3a1ba38492d6b99924c597dc96fca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sr/firefox-63.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "84cbe8a1320a99048c0600f7b3078fb96b5fc7b350298d05647d36a9523ead178ee79b1a29c00dc814c9d225b70cf33f708ca6ca845c9316802a4ddeb6310d73"; + sha512 = "f0cf8e489db3cd8b7fc535a0b3a95c67f6f63fc7c76d5b1882e3fa8d17ec18fc751aa91945dcda984ee09547ce161b8b7965186ce0013819eb45fcc2d72c9391"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sv-SE/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sv-SE/firefox-63.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "8a28af04b02558556814dac039ea7bb16f06e4824d9f5536258286d0ad9abd6cd415ce3043aea3eb2be49a2deba54ef215093843ec78b5d145eebc70495a0df2"; + sha512 = "12223fd3031b445d4b413cc48b74131793f3c2d8158e7aa7b2271d6b94645b33956e066b30fd4021dd36fa0e32c08deafd3f5c9c1fcc554b87e364715480a5d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ta/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ta/firefox-63.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c1e46473b31c8f45eaa72f329e28654e214fcdafa7a4bdfa27aa7e4777901c5adf6249ca5dced05f4f027b68ec26a2427b3a577d43ee6d7683ddce304b357f48"; + sha512 = "97095e3ca525aa45f7339b5fdd171acc7e0758c401924cb2721e368513c260e8094162bf2e22daf5f34fd680416dd7fdec3f5e3b65b6fd655be1ffd4a1850de2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/te/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/te/firefox-63.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "df5c5c2bb42027ec729b5eecb1efd82fe6c2703dc39b7cf412109e316b389aac77b0b302809b0f6e9a82ca718d4018745999a96bf6810c58922518a01081a088"; + sha512 = "739142d798738f12758d335b8556f518dc8b2784b9517586215f82d5653059a3cd98539c5784ec3461529156282f6246d93220a7d06208872d9c90eaf08582f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/th/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/th/firefox-63.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0f735b5e4b4e7081826bac7b9d85aa5cb2bffe805ceb5d396d48137869ca414f332677549aec4cb160390c1aa8d2103c7bd614b87fd065d8d80689e90b58f458"; + sha512 = "a138503adb1f0ee2197714fb1e0db4b5bfb004b64205835078cfbd51548a99e0b9d920552130d0646c4f16699b084e4fa88eead584846be9650964fd51ef4882"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/tr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/tr/firefox-63.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "3646e8277d2adcfcadff557ac1537f30859e1bb8413e45deafa46d171341e0b0f8c250d500355104def1023d7f46886244acb5a90e3abc08aaba36530df3b12e"; + sha512 = "ae9f2a6f83816f02a0b0c2240cb8c6eb003b50b3b9cb3c6b959b3c11f6b87effc38f40daf3d4b2b33140fdda3dc99a5f90af582e9d78689ce1cc965f5a88e119"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/uk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/uk/firefox-63.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2f2e5a128e0032a966b520515f3954106d095510915add883d5b4996e99d80ecfd442379bd1070bc45f5424f7be757dcd3ad869274a638807457a4edf9794834"; + sha512 = "b0e650c6149a761f202403d0e4e4c75e976657924bce2c10d592c5669b7a055ff9d6a82f1795b5fae2f57c6d49be4cd6923a36da73e300a5b6d287f442be93b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ur/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ur/firefox-63.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "cfd25e52b91a38769b440b0452ad99089c98f0c99c8d371ba54ab5930eeec5cee9a701c4df216e67b6d8dfafaa269286a70b9ad77b6f8ad45e687b1f5d44d6ba"; + sha512 = "c7d7c61d810042bee0f5befca5c139550bd73efb67785b87b21a002521fde0d415c4aca753fa47471fb7489bcda0f9248426ccaa8a2bf0967f71f5b1d4329df5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/uz/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/uz/firefox-63.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "9ea58c5fa76134916076bed9727afcb6f87935d9bef0631da0060c519c45fdb741c1f1d8df08b572c7848de378c23fc038dcfce446c10d9115c16d272aca89f9"; + sha512 = "6e79e3635b68ff87d616f8626475684b4c18626c9e8a2bccf99987e96124a31751c6c9638725c8882146acd9368a290c51fd5726a9b9903f1b0e9f1ada42e6e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/vi/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/vi/firefox-63.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "87db8282cce46499ec31ca67ec52ec6216f883dbcc725192d97209e59f59dfa29c2fc106c3dfbbaf04ba738feaa902ced14a23cd95ae0f09e58701cc276b7f2f"; + sha512 = "d4137788bc763ea1a2663fb0bb4aec3b7af412cf1e38ccb9fd484f9f486b877a19d86d17fe9af19df12104433705053eb374dd65cb76c6b180526871f0d50290"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/xh/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/xh/firefox-63.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "fb42f2801b529f49c0deec9f8fe5705621fa63bac84ea302c8a0fb83ce76bcb288969a9dfa7e43d90193055fca006595d31689cd3404784dcefee76f1e5439c1"; + sha512 = "614d803676b83df0ded1db004b7f17aa66cef14e6fba2f20504d1629b55ead1daead52fba7eacd66e6519dc41ecd5802f7c1ec49b6ad5b402129528914d0de69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/zh-CN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/zh-CN/firefox-63.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "f3799097631b4f4515ab672abed8edd0aa5ea3168a55b40ed70d5d981bdd4a04810d07a2355c46c54c5eb80500fcf0a071bd22c5f1f7584b96c1e7c3917df0d1"; + sha512 = "741671e9bc6d102873b899e649d733befa3e4ad26b2429f04e87073eaf445a9c571087602a8c347cad0412a9efee7483b9440f794248a2dbc30962c9e4a599f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/zh-TW/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/zh-TW/firefox-63.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "aca754e9f2517db05e9418687e039bcf3b990c3d484b138d7cfc103a57713193eadd50a361909467d2dc6d2c9cc93f11557ec48935fd5fb31e867436f2b4f171"; + sha512 = "615ce8b1f44f02aab20407dd090a7f7aabee0b022b616d33e2d7992563ef8703493967a2762df1457c6e520a886a4f03c0477ee79025ec36a4b345a0aa913362"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ach/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ach/firefox-63.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "689a076a45197afd8371b286422970446a2ab53be9440bb18fbf5787f177aac6eca4d2038247042da8377baf1694a576d0121deb5763db0f3a23ae72febd959d"; + sha512 = "070e6e47174129cfbc530975bf5a59ac055e942a2732379578a30502b109b80c93162d144ead7306a8604c1945723bca0666c26d1250cd17c4404d5164551d06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/af/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/af/firefox-63.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "2f1ec4e19ab51001c79b17b582f1d348eb8e40ba63c2ea4201df1d3cfca72dfaee7b141884674165c33596b295e16c91c26eba9d9808d6285adaeb767a4cb617"; + sha512 = "e808f80625803ef21873fbc52f82569b086e20671011049761ea1e9562c57df677a3bb4baf147442d1c699f7c79e61b89bf3011a47457940dc5497ee03410b91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/an/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/an/firefox-63.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "0b0aa3f8edc3f49c93896e5485cc2223fdff4edb45a437cb0e8197a5779163ea3e660303fecda2a1f8306e7e385410ec5f8891cd7e41b21b0a619d8af9c1d9c2"; + sha512 = "45fb2dabfe3bac2bcd78e659a03140d9e75fe9ff9a458037cb35f7bd2eb81b6c33484b1b6766c72e03705020f25cf98ede7a5946e99ffe59963b054d27ce05e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ar/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ar/firefox-63.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d19ecb3f9f12a572f8a1bd125efa09f4947823b4ddcee12e8467176274cdb5677733935c2967e66d40012fe29c87123ba501c45d1594d0e1afd14460a824e56e"; + sha512 = "7bb953deaef6f5d3c09f8a62a7e2abb285e9f23a8b6a47286cab12b2de9ac5fa911dde47c652110b635cfcc3c28312e348113ae8a791a7e7552cc30d9767f3c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/as/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/as/firefox-63.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "b481962d3d88fc7ea015a7514ab3a0ad4593eb587debbd3afd51485437bef7f5dd3a447ed0d3a57f1c500533bde9026b2185d2137127f159743d8adab8794b19"; + sha512 = "38cba3560bcdf6356c10ee2813743fda65563385510588a5d58703b4ed033d43f6ddf1019f18b29ab803f25cee5cf2263291eb49969d998b26fdd105bcd14312"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ast/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ast/firefox-63.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "b08a438a6298aa4144e8798893f9df8ed25846c0fe5831018f6ecbacae7c84b23448f03a7fa16bc05866d92ee2606d7b43b1fc0ead6745c2491da286d99fb112"; + sha512 = "1d632c4fa3e15145dd58f311bd3f4cb731fab4646f6a54bce4d5d58f53bb58964ddff8aed77cf5c3dcf59a00a9441b0f508bd9a031b79448009fdb37b501e249"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/az/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/az/firefox-63.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "69ee1200a4fac5059e4d91e48e7921952e304fbcc4c560f6ab53f0c13fd57b5c5ec775a07926c01087878a80e7e15369e97062a7c5cfd8db2f47c15ef9da3e98"; + sha512 = "3b4a42141d00480775d96db00376a66b4c65d9702a91fc5390805298f9b94eab260c6433aa8ae9c1c2e79f4706128b2771ed058c1196a40e90dbf1c24be880ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/be/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/be/firefox-63.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "a0e909524a56e80f8cb75021390f7ad7ac035afeec5295b14d3cced450a0bddc223d677fe567d406aa7836ffd5768712b105c5e0db2ab14558a159d6aa359ca0"; + sha512 = "aa4b8a4dbd3721e8162d391108e209c02f50d5d681e31fd2d4877794c9d24c8d2669dcad7720832c6dd6bfefcfce110ea25face288acdd368c5437d77b0e7466"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bg/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bg/firefox-63.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "070cd6775ec08a6c77b92ff9f8c4b2a0439a4326121e47d1afa15db3445aa15e992be465179ddaf0e907455cf3891bd236c0a9e65b13696cf158166a5d6e5ef3"; + sha512 = "b9df5e8149384a09039db582a4548994ffc47344326feb96cd6f6ef228e3a6e222495284ba0cf35f9c130b871ad827dc31022242179c88dbca86c61ff5185aa2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bn-BD/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bn-BD/firefox-63.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "fc27567c007d42d038ae699ab4175e32068f144645eb7f087807aabe5305b5f33c8991f9a4fb43f3489bf3c5245eef29b363a744d595e6517d2f8a72a0074927"; + sha512 = "a58ab41fb6282e64447021ec4b41ef1653ab7ad11d3b2947ed61d6d711061c476cc19d20320aa70fac30ed106869a0f88e8a22ce0e1184d68795a25bb8b4b4dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bn-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bn-IN/firefox-63.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "115651b2c72497b05d92b745edc27851a00054865b930c87448267c1427db6c65178a337387daa2fbbb826c687d8940a08d9cabeb4faecb902f08898b6239934"; + sha512 = "5a690010ceeebeeb9130fadcf04eec5eefb087990ba254e11a5c6f67561bea287783656d1cc9ec7fd1945afdefdb56dbe93eb43a7fad6ae130a56aab64652e24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/br/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/br/firefox-63.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "2072f3b12787d799c378cd727f168807ee6a20b79f42988d08bda2b990c19b227caa57e5c996337489d000e682a53a0d6e7cb33a8f3c6270e32741c414d7ed49"; + sha512 = "d2be7334cc018260c299879c9c9c64da71f62d44f8f0e0262af6140fa0471faa9354d9289c4146e9152e1e8fb7b9791b8169136f4902fabebdec05c15695e15c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bs/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bs/firefox-63.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ddf09c431e74d6bfab7a49a10fde28b20a24f732315a7bda9295d035bcf4cf2c3d049f2a66dba7f9abe9f66fc64bf99549bed2abb7e5a0ac1ba1a9c77457b707"; + sha512 = "9197ed27907f509e1dff0cd4f4fa1d7309ffc1196b937f77ea0623ceb772ba653568b295ef6532ea3599ef7df5a7ce47eee55663df0f811b006ee303bff8ba1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ca/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ca/firefox-63.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "cfd3f91f39b499f3a0125da9c952d68a8e815492b6597535017f824722f25eddd3a8b92817f546ffb4236d2984128d9b179366361f917c5d3e46b8da25da91ab"; + sha512 = "efa6c11c2137f336576abf75b40b91326fc1593aed79cfe78fe84994b275c4f49c9fde8e6f45379333225bb41e50d8815e64297008816b1fd93367ab849955ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cak/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cak/firefox-63.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "d077b44d7dd813a7d17ede21273d7e56bef8378b76ccf73f36f3fa7611186f7d63d266736f59f59301d0fdf26b6063b366ba7e6f1caea16407d3b1d20fc323b0"; + sha512 = "465611898bc9bcaa69a6aabcbd214f8f83fac62759d4bf2a64b9f07e258dd6d5f5c4ceb17682ba9c885f97b53536ba65acbd772f692dd6e40bbfe41ef1b0bf4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cs/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cs/firefox-63.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "66454a7c5055e1550eed48d2ec70c4d921db524d449392a9edbe6e42ea111ab1152b225de3095e9ccb3922e3327eaa3180d01105cd4e9fd7634471472fc18fb1"; + sha512 = "e6c2a3f4412946576cc91a1ecc45e4cf18d2e4547c935f45ff776c736faed9513d777ca443033ed7e99f4a4aee11792651617c658d4d8e020d67ec302c457613"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cy/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cy/firefox-63.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "9c1d3ed7acc8ecdcb9f10d5a3af3ee2cde1331a7fd6c9a4f6f97c26289722c96a8cafc2580b0608a8c7226d5b211d4eee137deb45f1cab9df5c1fe9462ff5062"; + sha512 = "38136e7cbdf7d6b297ea2e183747bbdc79f61d8bee2372bd6f40c1c407e24eaf2f21dbf92f3b96dfd116437e0212ad20eff53ca512c2fe129c395e2d117e26b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/da/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/da/firefox-63.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "5bf78b9b0dff6f4ddce433703549602fb73d98d2dd9b9720acd4fd9c023cda6bb52a92bac16d57ea339e0ffa56b4ce3eb831ffa0974940a12ca72dc250c5de6f"; + sha512 = "0ef2e6e928a04d8560286b01ff735647aaba246d1f2d6880644b7750d1cae89e63858ad98332c6cee99edc051a50f3c560edd4d20d836dbf7f4aa01ff281db4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/de/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/de/firefox-63.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "78ca04e9dae5d05ce20db93f33b312469e6e3da1b936e43daf60d0e7eadd76eefb64a1f171fab674f688accc347d464284c410d81e9a5a407d9fcbb407031bf7"; + sha512 = "0e66e8ba386846eb140cc9f6606b9b0dde49d1827f98345801967b02d87c0f1b6071ed8fe217b41b0412e098b52fdc80751089058f42bcf550a2b5ccd614a6f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/dsb/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/dsb/firefox-63.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b3569c4d4be9fe8dee22b1a3667807b89f2526a0477ac6f99886c2b8e687598eb799328589d951f6ebc1de6b05a3c2493037575d324f322bf39acff24b645c26"; + sha512 = "d37a0a5ee7f9f03ff3385ea1ffe886949d63ae52b2e8e0bf1c49192edf725686be73f63fa9f528a5d4911401927777488dd1b490be36d21b541b5b71850a05b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/el/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/el/firefox-63.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "024f90c38265badd689fba3950b18da9834f03bc0a754910115f34e3bfc232d9728073c058891c592c4292e4148e8459f3515caa1a05acaa1ed2c9dc709e1b48"; + sha512 = "8af83b0c3c498dc157986598d5b5559944089bc27e62b832cf16937be1a3aa7888731fd16bc8a4400c49be012cf217404aff865e8cc8996959b594aa55becff9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-CA/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-CA/firefox-63.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "0317e9d27964f9c9c1b7fd5df85bafdf553703bc493f6f67a52bdf9f893d560b6b5c0479624599d3756ddbbb66a86fe9b88577353b1f01c3cb1c0be4425847ea"; + sha512 = "7ae083c02e5a98bda3d74c6f3c8269bd668b6985c411b5deda5b1618c34721650c881ed32987ab369d7b730c9ab4db38f0d7047c23ed8f513a0ab9cfa8a1ae41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-GB/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-GB/firefox-63.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "a700f4708e585afcef5c84a6c2a2e4d13c87c82d897f1403e9ffd7da62ba6938d8260d6ca65a3d97a4be927085a85e07fdde2cfe0fbeae7d0775fe5e875a69f9"; + sha512 = "281132f7cf22eae25ee953794d6a26f9cf574e8a794d8a9e1e85359fd5e3ea9ce9d74b961babbb0e91bf0bf4dd29bd49cbcc177c5ed80bdbbf8418ef8e837969"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-US/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-US/firefox-63.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "46e4b65651202497bc01e49eda6a3e39196023c83d7c7407dd2a3cabb11cd954f7d2e1056ea0ed032f8eab52dfe9aeb3398f77f6aecc6be377053d4cd7ebe852"; + sha512 = "0ab406c65017d67a05759145305816a05f802c7d71e445abe1b0e91385a1edfdebd2991aec7ed808ab2eb006112c5967dddbcca6e46cd7055caf4b7328d2fb0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-ZA/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-ZA/firefox-63.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "535e2d45789b7486060d00d03fa5dd6d33fb650bfd00344306e1c237d4a4c68cf30176f39b6ecc1cb1f211186dc53d749421a8b72f8b9a0e68261f447bfbc09d"; + sha512 = "e85ec9f241bd282d9803b3d2bd56f96ee54605c64a0cc458861baf8006080f1e9765069368aa7315e800a3d67ece1a07f0d97d7d8ffa2386de7c6c4f284cf214"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/eo/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/eo/firefox-63.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "24c179f95f5475ca9923792808139693c8cfbbcd46e8ce94b7fe5a17e51b7ff26fd4e5acee41e65b2a73c06801768246d21ddf65d0324d56a77df78ad21cbf90"; + sha512 = "208161f8ef28da94564f2ee317dccd8a142770e1656b748737b4d3a474713b683a49c9071515c0ee8de1dd20609a2c72cfbf9ebbadb88aa4a024b74db79479c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-AR/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-AR/firefox-63.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "dd950166b500e45181dc09b76e01651c360b9bc350768125ab963e328d249d6769a8237628bbd4d0ece0a9e1b7c782a59e9a5e0b515a26eef7b2ff906a59e98e"; + sha512 = "4a847c0e6230a3f48363e327adb8b940a7bbc266cec09dc007ad1357be1a219ea0870dbabe227a3771048396bfbfe41114b9109a3de6a69f52dbbf959bf7d428"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-CL/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-CL/firefox-63.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9f68c9746c951259ab156c6e326c62de4bd8db3b0497a5128e3024f2e640f54f1d11495d6a8ff5940e7dd9acdd6f3f0125b85326149f994dce08c96a19deb69c"; + sha512 = "c5a95e4bbec779e250d8cf4ded6623a99fa8088ab67b2d645287249c097e5e645d51524fdf79de408df5c2136efae8718f01c028d15a94991ad87c2ed6469ceb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-ES/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-ES/firefox-63.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "f63b6011aca761312eb5e5c468844b0bde291b0e1ad67a8ad7a0c020ea2e7f2ad43565998ed49f4c618656e9ad5d04d6324f9d22c1ee45bc6af6a560dc863e4a"; + sha512 = "2dc7893b667b8c381c242190a55fee072a911f3f4f11c80983de84b5a9533bad67b05bb4e42a2a5ca12de751703ddccb2be22226ec66919b9125f1df05d0bf05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-MX/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-MX/firefox-63.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "6640a1c96477906749457aa9670559c44327b25cb6526534cdd7be70c84b6687819b0ff433aaa37ce13a7f9895c2899797a3f4e4982969a1869ac1788a1b4bb4"; + sha512 = "9c4667dfb88881dac477df7a87d351ff26b6cb4640f0a92332f5c62dd88efeebce6840fa8ac4d931d8ec17ebb75ace57e1129cab5fd06a65d2e84218bf6a5118"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/et/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/et/firefox-63.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "622842075565b7708bd4c1e06b49a8e15a5a52c768cd8dad0fa6744b1295269c38f5547cb061d4c9096a0309251c29f388b0670d7a773276c232f7124a455b38"; + sha512 = "9b68ddfa1049e6a533a070a07672c160e5199e26552242cdfbb8954f649ded4372396071b302ab359ee6010fd912b590d39e1f1f8971d73c805e6db8ae194952"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/eu/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/eu/firefox-63.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "328840563121cdaa39918ab443b1946e3b6e39a7a1866ce95daaef9f12fe46f8aa18ba4394515ad72eb7ef332cdbcf0b893fd4095368c0ca949039b31f335f80"; + sha512 = "fab38c25d1c35bba77fcef1caf4cabade57d9735d3c09decd824bc9c9982846c0790d279ef3915a7255df86db2129a41db22a2bdcfe98a55c5589e4554d63d5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fa/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fa/firefox-63.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "8d9081a75b7543c2e1c25c67d41cbebedd914f7f21eb1fc970241031120345adc7851305f57ae341b8ae7f7119712dd6a1cd9f6bc9d44d6f7cac5fc6a9591b3c"; + sha512 = "160940c8771a376e2cb2e22bce0a3a5bd9619328c1b2d8596a222414e5962805d8c8e343bb0b969114eaf0218e4e1830470b813bc68972f814097de2fbba56a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ff/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ff/firefox-63.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "c53f07a1bb521ea5f3a3084fa6899c5fc81693bb51ba51d848c9581dabd108c769d0793e72aad7c03b7d017cc75ac084910f2d114f9e2c23e967f731eff85118"; + sha512 = "519438cbb8fed811428060f0e94196a276fcf6fd02bdb4359098b4a9c33635f4d0022ccc6557976672ac39d4097425af91c07789a443e978fd84c1237e8b034a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fi/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fi/firefox-63.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "4c08f8034ee0319f2e0eb75c4bf72620b793601c08fe7bc196bdd99e2d054bb1bda7cf65633546af0d91fdb857ec451f003040d38b6de999293cbfd35d76ecb7"; + sha512 = "defcb3c8039228e9c6d64338d9e2c4eb39e87078d0f66b98c229f9f2205516be97fec53b50f18406ab6a14edd06afa6197ba62cc31612b48196b39f5babf99a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fr/firefox-63.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b4d96844c39cf9ab5ea348adcbea6777446791c39d2832373881e22625a60c72f5261f04e36c44955c7069a9b94cfa46caa719c6495035708328d41cf07c5d10"; + sha512 = "d02c656de8c92f3d8bcbb07ed17308c5753ba08905eca36a4d081fe18fde86443f7a4de939b39feb57def17aca7782756c4a264816ad6fd092252331bab958bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fy-NL/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fy-NL/firefox-63.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "08995d67415319ce82a49b80099669714bfcd1e54a8e2590d38c1ecdd1707eca03a4b885ee608d28881609ba3ac1e1ae8f0a3460588ee713c0c9faf60d01ce50"; + sha512 = "89f1e0b0f908ca0a6238e76895d4f8e70008d987e20b64accc91efb0a9024de0d739d7bb34d608e4b125324e19e93dd044490992bb26a1a25cad1c83d4ebc19c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ga-IE/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ga-IE/firefox-63.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a53f8909fb0e778d821404fc6566a8a5e0e13c46190777900abcbeb86648275272f37a94afbe4c83e4438f4f4f3949b945824e3d8c16734fb444bbcd2354e4f9"; + sha512 = "7d3724d3e824ba80e5342049a1e1cdb2754f25b8c85f2135ae782000dd11caded9afd760533371b46cf2dc30dac0d396fb5c4223100c130c2e390d12ce77fc48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gd/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gd/firefox-63.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a6e9ba4cd2a0c2f032b1f88e0e5966bfc04520ba63606f640386216719ad1c900dc3978e0cc858659912dd89140d26641157b32d5daf7fa0c35dfe2d826dd9ab"; + sha512 = "1ad110a807b0e823d3d99350c72a92c0bb81724faf32587d0809f040a29317bb3286139be6652a74efeca4e1e461d98c36d5cba93d18abf98fef9634e7724ec6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gl/firefox-63.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0f902f3bf54dd76fb6fa5c0622e2ad51b85adc5cdfe4a1baede2cbba66b71856dc1c306d5ef85b49fc3222b52a210a0ac7f54796fe60329e9859d618bc4a200b"; + sha512 = "cfca9987511af0185cdc5594681807af1a6519443c225942c68b3b53f0424ff0cb6173b0686164b681aca08f8d93f81499f6d15dc18ad729c762d8344dd76c12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gn/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gn/firefox-63.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "63f9c95a8b8eab315cb2a531a6573cfac53eabacabebec97d2869fd8ce07b753ab633f4ef7ced7d92784d5682dc87dc40492df78ff37a0f45326668422fe62f4"; + sha512 = "28f18f8c402b41e4145988f93939b329efbe447ebc332ee88b32c3071a786a7bd68aa8be8e6f85073026fe1ff56c09d7c366efc9c155b6bb9edd2d84d36467f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gu-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gu-IN/firefox-63.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "28b79ef84f412f747cc03f8b5622fe8eba7bb5834da6a95ef376348a95cb5d146bbcc1597425f61f898f40fba70a79fa8e0c3e03716addf0e9fb33b523f014c2"; + sha512 = "a8e45a24c09a0285daf2029a4a483c4d2067acb622aad1be2213a4f5f7ecbe6c1f3ec2095edb15060bd37d3c009cab222fa21e0555a93dc2bd1dd6cfdff54e40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/he/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/he/firefox-63.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "65a49ad024813a51692466b4cfa62ac13a53615d4b16e423d6eec0424bfd7c151c07b66c177c348bf2127eb1c623c979658a524085af8938e18e9f353462cf47"; + sha512 = "9414106287db53abf4a57a0e3396a6dc03ebb8f4b5655d23cae019ffda804d8121544d843931082a21969846ac8d13f0f726c275c15ccc84fd7cf7e8c5e3fef9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hi-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hi-IN/firefox-63.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "495fb3e61076679cc5d57da9d542ef80c039d91be15e09a5dc37a26ed48cac1b05b36ff5c91dfb6d912debadec67a0a9914f81796bbf63b07153c47d27536475"; + sha512 = "5b971598c8b2c89150ddd563d9e2001816a4283288f34814abcd8a96520f09c35f9f07068145010f8091496fda33b5200a4ce95be0804d2debd9b34c2ac71a2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hr/firefox-63.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "826e7c4b0b56a0d1d766e0f2eaff0a5b4329ad4d0e01d715d3a50b61cc26aa07042b7ad1d1ea3098a439ebde266fb919e6acdfaaa521ce9a7f3a09640f3419f2"; + sha512 = "7d8ce6ee5d6bc6847481c13ddd1f1002dd7cb6464d5669eea629808bd3d1cd1c28dd653119bdbc131c59588d4c92c1172f7d926a07ded78f8aebc28beb8f0053"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hsb/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hsb/firefox-63.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "816bd4044bc536dde81789303aea5b26d494535e82e330bf189fa42a7a41f6a89a82525680db5551f6906457772a4b3616a349b1a730bd1fc63b9f16869aa59d"; + sha512 = "73d581fcda9b9e8a6a97402f0b9a42245e015b20feea2428000c05fe10a255a7345bbbc8ef6f83097500dd7910e21928175911bccb12a5b841a651ffe0bb77af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hu/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hu/firefox-63.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "1570c8cf2792b39f4e56e7bcc48bcee3e383a7918b908e56dae302a086d3866527de61d75e3e277b3a52de0200d68d4e8cf43303f2837562be23de79f64baae0"; + sha512 = "3f84f4d13b2f474252de73ea7940a70bc2da1d27e3b560c3f448493e1c5b10277a508848ceff8f2bee0fe11ef2196974033a88242b93cb0cd4c34c16996b653a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hy-AM/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hy-AM/firefox-63.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0343efa60301b2fb79f2c34cc04c7aced7b96fc9eb3c2bbd1cd843704c97188b016fb276ad4b1c80623271ae6b610c1177c971c30189d5e6f42b3cc941697eff"; + sha512 = "4a667161aebf1b3888b0e78187d5de9030aba10f1fc90c74960104c38eb1d4474e2109b59e1eb2f4a41309833d0fc6c3c6e0dbda5d2c3428875cac6dec7178e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ia/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ia/firefox-63.0b14.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "963e565dd8e2e96f60b83031532260cf464960528655bb69ff7c554f503b6e635162692c7ad91d9fade88e69fa88c3c7d758db15160b805f9b68356dd7b9f3ba"; + sha512 = "a3efa1a6335c7ba1ba7615f90fce09ca508bc1de4e1483cc26f28c0781c215f71dc119a4fa1df0b17cea62c47ada4e75482e45f359bbcafb5d48b11f8acae7e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/id/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/id/firefox-63.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "63ce005570a8917dc75025249962c68919d3335bd4d9568148be138c51be477383a23a2ee790774cb1426e6a4b8fe4b7057219a11d8dff27e1a88d6106e61ba4"; + sha512 = "f5186a99d31215c07ec6533956b52f263ee6c50cac8421eba039b9a5ffdc431efc075bc9f7cd0cad950e56b9a574f6ae47ddd79f1135e82b602d8bc2ad43e4d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/is/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/is/firefox-63.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "49a219ca5427b8a7553d0b2a490afb6e4e82012cd6f6917735eeac9ae43a38b150ae568300dcae864a228a80f8c8184c76aaba9092b7dd51a617859a700b4be3"; + sha512 = "4c0103edb3041f5b3dd4af8c7a24ef87d372d64cea923f1e911a5ac565c89d734f30d8e17df2a457868e67d470c8609e2e60729974f37fc17c0ffc08ca676c88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/it/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/it/firefox-63.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "dace66b729e7800834271b5dab8a7bf0e12f1d1ed52a4ab4fff5a74f3ee16318d60ed199902f67bed92c541da0e3c92cb1407d5520aeff7b3bcd2f4d0f71e840"; + sha512 = "f00b933c155199ee59639f2e8f790d5995c48b3ff9280f3cfd2a968960e64fedd8bc8a6f90f023898ba966f4a91bd6ef6692e5d66d117f8fb828d08ed4536d4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ja/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ja/firefox-63.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5ac65b01efd765eded53d94f1e97614045cdb350efab9dd576d5aef88e9acd0625437fecda35516726cbf4c47dab96061ce50e04d260a848ca31cb18ec8176c5"; + sha512 = "188e79610192fa583ad20b1db294079187ed8e7ee9bb1e488bb62c3ea3da6a7607876cbfa14158f2f8f39963f18e52d5926b95dd9e0228aa7969e24367b75d9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ka/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ka/firefox-63.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "00da1a788dd8887b2ae2e512a56b3ff05ef7b564f2abc6661fa9b5ba2928a49645aeef4a53978120207dd6d361a3133765c414f6868d2543511f173e96f615d5"; + sha512 = "e14b97d251e1ba190375e8e6a29483515f123b9527963c7c90df6d54a022bde02b4f1d6df1c8ed77c427d01ce81e13132e6c178b5f5035bd4e7ac9c5f5bea6c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kab/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kab/firefox-63.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ccdc2f88de9fbdd87fa639993a5f241bfd3afa68e36923d8f04ed7b70e30c44aa4a7969b402e839f535c3cbf202b89d287364dc5124b08db01fe3a03f4fa21ca"; + sha512 = "7ebe6f342e189dc2ef50e9e0a5672acf30169ea28b080df0106e25fb43ee6916a8bc7cf395f4c16c060672d27e53e551d938eef448adf4d36110a045c0b87094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kk/firefox-63.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "105e96a68895ed65a7e32155f248daf03c7389a3eeab42ffc2ac9bdd82122f0f8257ac2bdba4d0a60c6591db18564850c0615cccd6a7cedfe42f51938b9c5b64"; + sha512 = "277c44da1ae25755970483abf6eea4303898feb9f0dda099d5245f6b24ed638a565a616515521fc565153504fe86c4d832a780c1799569d4764c7f9ace9cfcb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/km/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/km/firefox-63.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "234b65b2c053be05846845219bb3c7e2fbe74b5e0062f361a7d5d0d27a9f14d9235b88e0af734587035597baadb1933c2e762c75436325c362de0e0377d1d0de"; + sha512 = "41b351181cc9ca4a77b1ce3d33c27a2e89fdbb8a6132c231cc17959c61b8295503e09e8f828a458f47df49c52166680c07d34a07460daec82b0897b5b6abcbc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kn/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kn/firefox-63.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "763a405e942190c5314b44ace507e6d019a875e8252bc25af1ec0294265e9729fcf1d3732b22e74c3327b6fb4599f58d97599a1d46eb8762a49136fac23a57a6"; + sha512 = "40242adb26067a9502876399c2e1b53c170c7f8b0accbe03e85ecc69f9ba9d377f643d54386184e0f7a612417e45586949c5c47c93cf0e192b5f81adcf391ba3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ko/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ko/firefox-63.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "076c5b2fe53b32a63238ef2c61026e9fae925725da7fc75e117edb48b4df91f2cc7b7730b82695ca7689f460518218e9a7ff32484dad63931f9d45eb6990a9cb"; + sha512 = "3880d95e5e5fdc1da8e36c58ce16350f9a3eaee4e6d400370b375c4ed77e1eaec950acd483de560dc66634cf0931bcc83b3454c89575029197402be18976cf2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lij/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lij/firefox-63.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "a1d756abb22516279e5473642abb1922feae9ee5604127a47f298850f620ff610ad4e0e3785ec386e28d3bc94e2dd7f09a070f40d7e3de910471b7bc694ecc75"; + sha512 = "6bfa9b6569d188f8544cfcb7d20e17f1a2827e5bf10db63fe2b10e64c1993df2f7026a957fbd9df5815ffda67698a095253ae623d20d2dd0db4e9cee9329dad2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lt/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lt/firefox-63.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "9566c7bda61b662d371c11d899daa67a6110bb0202aee4fa7c32398a7238d0a3453f5c0b9c5f20b5b7c6d225c16883220b0739e06ab42ac5c7dae53a581e29c0"; + sha512 = "c8cedf4026472dfe887bdafdd15ef6cf1593bcbb1121ffb8dac5ab5d6ef230c463a8afc36df408ef81f5a3dedcef8367bd8a07deb0c6fb47f34f89f34553affc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lv/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lv/firefox-63.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e31862b260634f32fbc61a75bbdc550ee4310d7d53a1f3e810cc5c9a8c8b64b00b6dcf53c229219988b88e44e832d5d197ae544685b79eccd34c3f5fbb40036b"; + sha512 = "c903182cdf3cfd403304e47dc28603749fdf760e4a1b18b23a7723fee73d3c6835390bc868ecd445abaf3267bb69c188499f52c27942a63147b99068a1ec80da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mai/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mai/firefox-63.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "c347401f25574a5fc7dac814e61c2699b53ead432eaa48001df4c83184e1f609a34e7c6843a1d03c60756bed7176fc05bce0fd56c3b4586d2543c31f7e0fb809"; + sha512 = "56b586ba243bf31499504e38f4025b3ca760a409c8b9d6c9edce120ce92eb697fe2b00fb69552dde0937174e8ae90c19d3cb1671bc91a38a0c9a930137c1c954"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mk/firefox-63.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "c50615219573dbf30b60349e85138dc788fab5e162524b0fa5b78f0fd69060dc910e7c7960061f016d13e3c8880ce801c7fcb69a5da5f634567d5460f2bb2ce9"; + sha512 = "9f3e97f154553e6969dce0403e05305da31e3363ce84dddd48bf5156ec2c86e7ee2ff2ceab3400e4c7cf0820318b981cd01383a77402f2856dae44b42138c52e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ml/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ml/firefox-63.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "a879ffa00eeac859a2bd265aeb44971afd0119c43ef81552d1dfc477465e0d0b947b9acad7bbe6bc4cfac3c7405c5635cc181fa3bd393d3d4d7891fbd78cc29c"; + sha512 = "ed3c06e17d2ff131b45ba66c66834b69f733356a7c95a1bc6f1c4f8f987dbff1dc1aabc2439bcd01e6d6a27f45919584a09fbd2fe61563008870e90f9dc3d970"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mr/firefox-63.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "0ab05a8aba2ba9b3faf6cdf764db59d7e85593ac13cf4be1981d18a6bfdd0817bb411210ea3810d6c59c1046a76c8e4147f67647da4f047175b71aa5cb1b7ab1"; + sha512 = "2c14e0ce6ffd02722e9d41492b1dbc9a5af909a49199a685733a351b1f3638702a9234c6ce35c5bf25dcb2c3155d7496c10fd6d38b45cdb5ea7fe066176378ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ms/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ms/firefox-63.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "6669fdb2e0a73f295220327248e954ab0c80c762766535ab63cd1d1625de55439865632b7b9243fcc2663abd7acb83833dcc0cd8afed5aee0393fca7142a68e3"; + sha512 = "23f6e5eae45c273efdf7f4758a56e5883e3063cfb2ee223ca775149a8dffdb9fb614e5ccc22be07e7d6ff3ec83534adcf6511131c6a4b2464ac02c520fe0dcc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/my/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/my/firefox-63.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "d2a48eebdec336da92588a7bbc318844058b8735e229a0059dcabbed16b47b2887dc042bea37ad1ea6be95ee55356a1093ea5b077289de8b0c9e5c14c199dd65"; + sha512 = "f0589827713b4466ad07dcdb7d289f5b7ffec184b8f259ebf6718deddd242a8269301b13974360c5e10a4dc96eb17bcb3255e1c4f10fabe8e8cbb66e8557d8ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nb-NO/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nb-NO/firefox-63.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "28febae6395caae9156f5e4168ed030767a6daf259bb96d3779a35da58d0a72e96b5530c57cd8d0570c4eec3d142772839f14d52a542418f2ca52db2b1641895"; + sha512 = "de31966866491c5a91be0bfa8fec3f0c5bbf6add028caeafdf1f7479e7e37f20d58e7988facefaf40ff9e524dda554db8f425821a2cc056a0eab1b19e8cc2773"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ne-NP/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ne-NP/firefox-63.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "519617b868bca07510faaa8e21bd705718d3ac23aeebaf4a4513e0346597662dd2cc5f6480a71ae1c93d9399b61f908d2090ea7c5ed5e0a30beb3efa2e4d143b"; + sha512 = "1d9c1fbb917315a22a28fc6fbfc9813a6e2cfc66bc774f20128c2b4949c5c96425e74f26f0872ab91858e339af70e5f3c0dea73aa01f2491d757bbab9d5ba434"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nl/firefox-63.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "20a19189579d2e45be4659a77bee320a62fd6df2b48a8ecfc273f507674c3ce495b56cc4a1d22b0c923e2759475f7e25eaf363f361c729abcca0906d5faaf87f"; + sha512 = "f3639b1bd361d86f2b134de404319ef6fab9f44d7150e8070a5fa2ea2e8cfea708a7426781ec4e177f4ba4355815f0e7c55479fea2e9e4a7ace4c53cd90005ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nn-NO/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nn-NO/firefox-63.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7efa4e6a168e6cfd2de234d3868d02083d88dd4928d721481dc57605bedc7d947b3aa097935291d6c18ba0898baeea8f325830ed6588c0b90408588fc2956d98"; + sha512 = "4e4a678741561a2268292643563688cdaf15e188190bbf760952ea7c566f410092347800537cb7b80753a474e031e9066365d162d21225e8257440412e99f9ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/oc/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/oc/firefox-63.0b14.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "216c24840bdac20d43c992d2347b4301d13f72d4425292ac30c9f8414d5cfd991830c5dca09db829c16882dc3ee62a7e389eb0c0d202cf4a01b6ad1cfcdbf7b2"; + sha512 = "f4525312cbbe3048f1d671517f552739a5ceacb52b672e212848a13ffdbf736ab475adadf1cca02a26068ad0a9edc0dab5e6dba19c1831647be16781a56390b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/or/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/or/firefox-63.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "17c770c27d32ef8cf4f5255240b8d307f8c483d299b0d9d97a40f18accfa11788efee1e210055711e7c892ac7c03c14fa5ee0e6f4cff399f89ca37f8a56bdbb1"; + sha512 = "fbcd1297fe658b0743a5a791a05204e4bb7f4951a3250f494e48daf8da31432ba56de05232e68f6d3a0f6cdc4a7cf205a0088d56cb3fe08add03a27b05770a92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pa-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pa-IN/firefox-63.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "665b931bf1bf79e356fc29c5bfcec44ceceb6fb9a462148fcce3f6edb711a21043e9b5e9043321188238dfe9aa0d92955aadd1a28e080917f571e5ec02dd1c49"; + sha512 = "2dd10ff59acf1f362405842913eb14490d40947bef3ca2a793813ab99fe3d908dcb5cef5dfa2854399b37f11aa4cb3025383a73dad0c95e008122f87d73e5787"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pl/firefox-63.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "2331674e5dbadcaab35991f7863493957ff054c008917200d33f8c1770f3db33ce9373965d48ef230ef45f1ba43c8de798d3a60f1c77ba2da2281fc16c352ba1"; + sha512 = "50d5283440925c946088f97e779b84070c7ac4f8710c43aad42ad85879446ef8b9d4e070299cb64b35435421db8b1b4b1848b43e8aa1e3b88be453d4c84c0a9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pt-BR/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pt-BR/firefox-63.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e0f487145013ed40f0708a44d90ad78e859472e48f2f77153065d04fe7b06ad2b862624092ce822fc8f20bab9c55dab4d70a0070d8a64c130104d41d821edf88"; + sha512 = "51a561e1aff7c3f9d80a8da2343c168d7d12130d94b77c4a4f8ef5daba928082e3668bd87c7502877443d6f5d51e7e03ae8c2a993e91806048ccc40b59e4ef31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pt-PT/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pt-PT/firefox-63.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2426bb2da07fc96e7083c1d52f1cf593503b9f07372484075170f1b9591caaa5dad8a7b74b573cf09eee4e76bccedb367f427fac98470cb31b12fff7efcc95a8"; + sha512 = "837d627728c6ae2f1f717c379505a5f2d9b709368448c8344d156da6c9e87282f9821655ecbf4d4639d81c310777e29043126c01d4196a31358456d31489714b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/rm/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/rm/firefox-63.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "587d112fd2da7c05a482804aeabcac701414eb1d48092b9d3020a3658a5bfa5de3e8314879eaf7fc59321a54b79b820f34c54d342395469d8324e6f677ada9b0"; + sha512 = "f783fd68377303a315e8ca4ca971c7a302d4e1c62b7e3a289ded882ed972156131bf2a48ed7b904ebacef64e44f9dd6d14608b9edb90726a4081e241881d301e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ro/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ro/firefox-63.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9e08891a07b5a3d2e1043f0713383124ddac0e7266e1dd6f3218f5d3c90bab787d00b1e1bc2dde01cf5f777734931708d601133392f87452156444c25dbe7d5e"; + sha512 = "df0be20c8dbf5cb352c20ebeef479bc1a9bc4f60bb8b54b4d81bf0e1dbcc83dcbfdfad5cedb42713ebba888860639a8e3669cc2c159254fee3885d07f8cb1625"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ru/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ru/firefox-63.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d1dea1d65f29301048e185b5cf5845b8ce32bfe8c6bcb2a1be571a505e9755b5bcbce507c30054ddf021700f460e1f5e3cbef65c463727866b3962cc4e6e5dac"; + sha512 = "bedb4e28f62ecd75fc93af2c8ccfadec755ec500a5aedd0a8136f69c23e39c5cb64ea509e9b3551453754a3feae7dd123564aadf8dc13e9179c199177b82be5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/si/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/si/firefox-63.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "d0f30cc64b7300c437d581c367006f5ddd9a3fba453f9e1d86928d77da6fc104467c090c6dd4d5c897f3d9324812efdd09f8e8c9fd8561f6e066c8218ae486f6"; + sha512 = "02bac6fcb481ae02feff97ae7f83fbadb170e9ae133ee4f557882e004c21707f82e5e4db24ea6d67170f4ed88f7f0a271292eefb98853b0f96b0c894f88abd27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sk/firefox-63.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a001ab086a7ff80a429c133871c3257ac29e0ddfe0ad480f1f7e06c095aaae5c7637b0a40b6712ffc5d51eff12aa77a8cb7e734ab2ebc35c7ac8f3e3e07275ca"; + sha512 = "d4669ddfb2675b3cd47a617e122079546ee4a35cb10ffc69ccaea76e3108155f3e209b2654744de356f68d789394a82b12b4a0c1ef54c358441e0887c584911f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sl/firefox-63.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "a3bdf74b5d7e9e5b0f3934a6c9b11c336ed99b34727e32c9263e31106dfc77bbf9cd0e11b2289f6a94261d6f6ec641e5f8b1e22dee0b2aad1e220d7dd1f0860d"; + sha512 = "7e58faa6d6a72d0a750d9a5375931a69b82ddb0ed1ed28c154d93accb3f8db2f0b4416de18352e36b4d5182b634ba1ffabd44fe6a89905f06755288c5c3361c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/son/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/son/firefox-63.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "3eb55a9e6f0bde7d236357ed19db896a7999409d07995997e7b464083c730ab3fd21c80f92f61babeff03520b209aec06a55c6f5764ec858de9402e4f436c848"; + sha512 = "f4472e1cdc43a1a9d36d06306bd12259f3d63f6282c0ab51787d33af58546554442de80064775f4f55e37a3b492c33a6ca41acadadc85d4036b874d001a9f49d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sq/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sq/firefox-63.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "24b5dde86cfba7463556572772fd142d1610a66776d6e021307484ae8087285c1a578c4e6849668fa345292acc889efad22bb1243418406c6b28d7768f94e4d4"; + sha512 = "3e3d4b7eba47980b83e9abaae4d59afbb879273e55c942e8320c22a67fec924744cdec93e679c4d789596fd3227695865d446a8604580f18b3125c88f50f26e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sr/firefox-63.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "863f5ca12705d5ce5c75ee4da9951bc4f8d232596857ed6354ad29c5e28e15b7e610a6c282b8607145c37be6f365cfc8e0ebe2f8ce9a8410b39f44a4b6f30985"; + sha512 = "4670270b2fb252c9fd75cb22e79c68ece97e6bafcbb042eed842b12fff2d7224042b273c1106390a0f2ec4a246923877cda50c93313be2aa736a54f0ba127c21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sv-SE/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sv-SE/firefox-63.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "a1179cf0010cb1d8f84e06292c932ea1b6d91b7278ced351e920b752e6105e6bce8d2792640c382ccd4a495fd4f58cadbb5dd5d35e8bd90a791050b05b8e975a"; + sha512 = "30e7f709d3c9efd5f559082b00222dc6cb1b3e8376e977239bb5d76d9793092729d49255599e537c86fe615eb0713ca8c3f9a36a78c6d41ab1bc676ba46cc9b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ta/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ta/firefox-63.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "f46dee416a015612f973577a77ccd151bec500ebd52d05467a8e8ced85dd698edab13d2d38ee2bfcd16ebda7c2970c7f2eb22726bb06c355965216da32acfbda"; + sha512 = "313a8d22b9870ee916a571a9d591517ecc162c8d37fea2d3efce4e839bb0dfd5ba3f960796b3e2279f1c115d68296d31bb05434fdd2335164c0c211dc2a1638d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/te/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/te/firefox-63.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "303b4a892479f8ae8d0628e58522929fc184d7179733b38fe45f154cdff14ff1e9675bfd6a16e1d1975ce8787b930f6ac1794390d2c4ef1a9009927735d37ab5"; + sha512 = "4cf19ea59dd841de4494f4d458075ce42d9d97471215b7ba2f7a84eec79d1258c5cd341ee013ddc422e060f1aef902dc93216aac15aad04c9b28466feaed89af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/th/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/th/firefox-63.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "e9ceb65512d95c6d3e8d5fc77f428e7047fed84664be1ce77376d4e8e73ac31c23c8b2008bd73d87f3dc463708bce6631be885e23385790ee35b9d32cab69164"; + sha512 = "cf873be3f9d72655093719937242a69f0b0644396e3332fabec20eb696a1310f88481b2f412ab45835c5ebf40821b298ba2371b20db101621710d7f522e19cfd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/tr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/tr/firefox-63.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2996a1f32dac40cb2e327cdbf89b8b28b13e210c5d7a4fc4d8e9ab13f8d6e6a29992f240e9791d7fc7d1bafa8fe86a905ea216fc1c14eacf4649ba9f95f8601a"; + sha512 = "598d4308933d01459cecb91e3edd2bd428a70d7f40905f03e04009ab0f890537310b8ad93393340937e7eccce2d78ef15915530ef2f27dff46885f95b23d702a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/uk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/uk/firefox-63.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "30514c8de52e33a021c94261fce16a9e7606cd511a1fb492cb817d4f57d2230fa6ff94317112fce230b8e4a4b3fb7db17961c4080c55269c398bcfdca036357f"; + sha512 = "b5099c35b12c6ce96ee04b49c0b8e38b6304274ecaec1897008cf74af1809fb0a3deb5acd4a5cdfb27d949ba06a669d3eae450b59721afe9441aedb8c6728822"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ur/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ur/firefox-63.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "60460b758f82d306494c601a6fa708ae203ff712bd4a14128114ffb90bed91fcfd482dd43556841871c0a352e92abaaf8c75cc24d3b79022f5847d17c2341083"; + sha512 = "f1f5435ddc19aa2ea3199982a2eb83cff78f016473837e375ab0ab9b3985ea7f727c9b5a94137a76c08c3c1fe4af0d8f127b479d4bb9778bdc807cb46147dd87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/uz/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/uz/firefox-63.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "cd5e6c09f778dafa923ddbf01f24e1143f1c8719b2af5d2a4a697ce9dc6998a2893d7019762f1c87c80a190ffb42469e27eade981bf3d35f0e3428421fda2645"; + sha512 = "019a84aa64fc11eb0266d33f67e19623f75960f5272a4b46ce9985349a15a4e16be7c84f3bd7293617cd4c778d62ec8d745b99ee707fee30f3a3627717793587"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/vi/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/vi/firefox-63.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "ff892cc4b533aabb1821ded5d2157a594c7e0581ce59cab600c4d083d563aacc7c67ba58ac2133bccf31997a81e649eab87417485d7c9de1f93b3846df4df8f4"; + sha512 = "32ffe1615af1522970a00608a4689360ca21d51b3003d2ab41cf317a27043c72db483ad427af982925034c40cd84684c973d4faaba81ea503cd28503afb6055e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/xh/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/xh/firefox-63.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "db3786087ea3aed24f04b4fdc94717260fae98c288f0df17cc753df572b092b25bcbbe08de765f76b84ac9e7f1d39bcbcc2cbb1372b3c76775cf2a55f45cc32f"; + sha512 = "bc88e7f0cf213377d77a3d8ba2b7a391a57c69ea1ed8c5253da5191cd0742b97b0de1566c971d5a9870156cd98af9e3c8ad9a1b175e1079e7a023f002a72af20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/zh-CN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/zh-CN/firefox-63.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "f803c7b7b593b66baf6995ca9e2ac51613b668b878c26bfb1280ec4263e4ca1e4300bf4abf41b327b90736d78be0a823431a7e3c0c121347cd13d88ecf12da97"; + sha512 = "1c2c9177fdb47271b7388e9cb445de61e2e21739a558788f0012c3ab8f9da5a64fc5d833ce4f8d8a7326807daa3147420b88d8d78aeecc827a8596adfcd60b0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/zh-TW/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/zh-TW/firefox-63.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "27836c549263ec7ed275a9a65a3707e8b04f2cd6ce87fe29c796ecd6639a4dd95749157004e370876df058da3d452804633bbe34517dab186a54b964ab655181"; + sha512 = "5d7066183b5f8dd41f00fe89f5423109d6d1a8df6d51934c49e2c50c627fe3492294ba992a92d1f07b0ca96811a0d27842418b416618d059981a8dff21452391"; } ]; } From 00d7ce7ef1a8e90a108f3c39278e3ac2ea587ffb Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 14 Oct 2018 11:24:12 +0800 Subject: [PATCH 656/992] firefox-beta-bin: 63.0b13 -> 63.0b14 --- .../browsers/firefox-bin/beta_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index a2b01c888419..6633c6d22d93 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "63.0b13"; + version = "63.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ach/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ach/firefox-63.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "f07014570689a2f4f55771d199340193a3059ae121e7d5825e818fc6e5245bce15cde80de1f7c35bb13a595e898b79481b20f7b80abe63181cb46b6f47da4076"; + sha512 = "23bf5d5195c7678ec4bdcb1c4caa46e2681031213cce0239509e4999c81ad196c8c3cc77720f83154ff4f60ac161c01d0f8fb0c22655777325f67ee7cf31b4a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/af/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/af/firefox-63.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "76606553f77a5a0deb6e50908b39824242175b044ab1562b1276ba97c8bf0d24154edd46e67c13afdba06df6e65725e291d4d25f1cd9177265f747bf729ed7db"; + sha512 = "7e8983fd49deae14281a400ad15146ab27abd9e2f7b3cb060734f2538519541bfe0c20411df35baa836f62a176955edc005755b4359eb66a661e73c75e72a04f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/an/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/an/firefox-63.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "fa29b6af86d37befb227359254d680d2ce7eed7cbd4ff511be222ef112fca6b477fe3dd5c78696bcd71402aa4e99051ef3a0b6326ac959dc3262c9b8193e69b6"; + sha512 = "3542bceed63d08bb955cb089fc29c3d49b0f60ee5dcaed70bee27f1b340b3e34706e64079a5496c4c11cd99ff8ade790a7105b22f9a13a2aad8a0dfca80690b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ar/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ar/firefox-63.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "1921963fd0a8b515c351d30d9b7683f7984e619e77df0f9bdbcae85b0a0c1e4a9475be238cac6049d61135677af26868fc91ae76ec2ba81535116c95665afc4a"; + sha512 = "010a259bc60e823417411ac9cfc35597fc7a5ba997ae30d2f5359194720e7dafacac152def59cb755ea658d581d2a19e434c5863cc837c43d478454837910811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/as/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/as/firefox-63.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "083b1f189b5b25f788d5bb8aa4367743a701e760e3ffa9c3d7bef8d221dccab9ebbb5c4486349f156bcf3cc44b90aae215fb76ea22c18b0401f69988915ee8ac"; + sha512 = "a78ded1af77b7ef20c319022d94275a8843995bbb279b3570f7d389692287af5f7e50f1a5bc3da46ab60300f5f9fe43396d577170c7bdf950bb38e2433a97b1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ast/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ast/firefox-63.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "c1a7dfcf12d8b4fd4a7c6b657436073c41a10cd4ffc1e131482b83242d8a023cc89920bae085a3d7e334e5f8a87be8e2c01967d3d5e76f687c6528af09dd2adb"; + sha512 = "97891240277fb80a206c5bea6e9e2edf98adae043bd68b421ff92339c8857084a5261b91bb672485fdda4ccea31a5b37230a94d760fe35390dc9736e8dff4163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/az/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/az/firefox-63.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "febe74dfeece3c7fddf3d24e682f4c991eecd511702217c3e18941edb9ec6a5120b95da72bd7b7f5f146f74174a0f4624ff112c56e3d6d9cb1ff5e8e349a294d"; + sha512 = "fb31a2b02c901f1b52b8a46b80c6118a2689fb4567f64c9ce963dbca2c106983a1e1fe56bd428e3aec381f85136f4914e1c57692bd4a021a5204059232bb74e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/be/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/be/firefox-63.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0ef2883de7eeb54eacd376cf00bdcfaf399f1a7761f2a26ce8756d70673f9074d0f919ca0253795db7643161aaf780461f238ae1065506376ce6511f0134444e"; + sha512 = "2efdeae4f09e12b99528f6370e3486630224e0d5baf19df62e79a890f03c2d512c81dc60963d537c128f3749d7d9fa73f2bd44e65563261f4c3850e75a7f3eee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bg/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bg/firefox-63.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "df39cacd1c8b40c863fa4d64bf1eba8016f5789b1a09f5d3dc0947795e11b51dd67fa61dc666ab22d00c2d21c3eb3891cbef5e6ccfd6f419ba5ca47d8b98d588"; + sha512 = "066ea34c198e13ed78c4b48c6b4d751c3fda1d42d9470a7295982d9510e23d17ec0a937a49b5403bdfcfe8bcddde16438dba0879759ec362f26a4583b435b448"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bn-BD/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bn-BD/firefox-63.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "8398e8048bf7f15a234e6bc311561aae170d97715f73f9d8fd1dd5441562158970eae4628cd16a67992edd14f7a38bb5c7c32e6e9b554b0d234d2b012c80f76a"; + sha512 = "3d25f71604d83984c0c86eb9fa27fa3bfc35631087cac1bae4ba2a773b6c870ed2bf81167633757108b631a18506255a0bc8e9dd4160b8cb35960efd987c9bb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bn-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bn-IN/firefox-63.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "56cb6e80aaa4e9d98c8baad5bd8082e580d9d43e86e461939c41eda37fb19b95b55c693ef2b3e2d1cca486b307b0a9cf50367f66844bf8ab04c36e69b8d97ecd"; + sha512 = "be90418ef58e6005086919dc89ba6168654a6bfde2dc87001a8092174e2b38d8695a70d7d1afdd75307db332785b5248e4b2d38facb6f9a7884d6483c8ab6c2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/br/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/br/firefox-63.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "408693dd3d83be1c61bdb0618eb690477c6249e1ab3b7a2ab5dea03e29fa3574894d3ea1bfa3c5d9f3c853b5385f456aadf0a95a2972f39cf559a5a599cdf2c9"; + sha512 = "b8dfee8bafd5b1ae7edb061c04b66ba63cd2421da54780499b947b4cf13721cc8cf7ed1ea06409a6a30dc831bedbbc648ac3a123d994ad676061edd10e7e1478"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bs/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bs/firefox-63.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "afb9bc011ba0a95b2a87372de281024a1327d28b586e1465c7533b615357668ab5f89d1b6497e63b682dbc891da78f70fda4a70935380747ad8013a8492467c2"; + sha512 = "402898f9b309d56ffba067d7cf607b56b01d7df80fc8eb60fd04f6d659e4e473b3c2553238bc63a4372059d7841eded51f4f80de602104a6a52ec34cd2a6eedc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ca/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ca/firefox-63.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "3faa14062e22dcbde97a66541e5d070d1a02b3471cabd3105a5ca546df6e34e7bfeba5af1c106b3f0db11d33343ff7df2d3fb39e8b55ea3cba22a172e93eec6a"; + sha512 = "233640ecd9dc6847ee9a538563fb3668a851aad7ac0216c09a31c62151c31cd6afa3ce84c36558aea39ead48a85d4270f0a4bc64701d699ead668f687c0e8e28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cak/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cak/firefox-63.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "d1ea0e03595edf8c8a55b8bf60596aa866f6d228a28ca68f28b33bbee09016800b7ddde07ede3b1131f5502f57fceb4c088d977f2da0669b9b8771668aa77fb6"; + sha512 = "e326c1e011f9a58b40a026853c2d1d34ef45090a2f86d69aab46d358c2e3a42367424bba49d4c93fe92cf27c8bcc4d802084b28432b550b3c1e3098f37b72fd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cs/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cs/firefox-63.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f3e8a43371919735279f934d207ccb78d568dbc17fe678a36c50d04371f55dae97c3a7ebb1f6afe16f884cab65d02bdad4e7cd59d1b34d59295bd90965159673"; + sha512 = "efc79e7384761d996a9ac636dccfcab32f4d14cdff218eb3c0161957b8a659ced0ebddd2ed0bc9dcc915ebb863ee8054b1f8bc6f16666f42421e4982682f97d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cy/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cy/firefox-63.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "9e053f5b2dd82cdc81577fc17b115c0e1630612b70e16d2286f4fcf7eb56298d88a927f42b387f298997f33bcc56e2b85b08761220193b486bab0a8d76a85de1"; + sha512 = "89d06350b5fe8c83bc23b69620c7b6707d2e35981031783ad41cec728e41b842f990d7acfe2ba9e0298f0955f11f54d7c6551752e9f51e5b563a553001fc27fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/da/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/da/firefox-63.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8bda7cd63969acb27aba21113d8d44f833a7b8bbf5fea9af43b905edbd4e4db6a33830d4954af2635e684f04f9bdc35d4f4eb08f2433443c65704d8d482b7a38"; + sha512 = "103c34d736307f91e4e4343ad0b5f3ebbcc1efbca660782768ca20bc7a2cdada2fa40382f46ee57d70499529819f000eebc3e5d62c53ee5bd5f15437a18be6ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/de/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/de/firefox-63.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "640bc5d6195c7cc8291d890b707ac68dc2bdd7d5c1af1476482a3ebe8af738ffec60d8d01eedb11120393e3dc636d7c84403a28df579d1af4235e0d2831f3411"; + sha512 = "6a5e6e92fcc85846b3c92d34694e30672399d9a2821a9107f5a00942bd90e0e351ac6de435709149647cf94943c5f07fad834f7925682f0c0668f4c29b4644e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/dsb/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/dsb/firefox-63.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "55734d9efd54b0b67a7d8e3fb5b51cbe426e32b801037042d83e72ab7c2f039a42f9be4f15facf29b30e2b7e94ec568ba05e21f90714c5d42f9f96c6594185f9"; + sha512 = "bbe625995bf300b561fe55210f396d4131bbcadc33c707051b226115cde5982f52520cd815a857542535e5787df210d612493deef50df5e361108db27ee86478"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/el/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/el/firefox-63.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c8f088dd546dd551c0400269a3cff29a79e9f125fb6a7f8faa558efa6331b5f34a389282e2a69a35f16dbea37826a411b9091eb0dbb5a2b2885bc84f493ec5d0"; + sha512 = "6b5ea1e59bca7b531728c70ecb644969a33955fa1975b7c9d03b550389f8fcb24de45d041df59e44d5a4cd66c8caa98725d2349d5b6c45da8f9cba917528d1a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-CA/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-CA/firefox-63.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "2d093cacb7be796934b1f83f96bfe0c8c453fff180e5e10cb467123d6dc12620751e0074679220e874163fea1ae49447ea0ab4a4abaae710a891860b9731c42d"; + sha512 = "ffbf1ea4c01004c435d12ae5b0309f3a60df116df371255d53e252cc3d3e220b154b9f32fc81c6868dd20108ac9d35cb79e4b2402cb62948408288d9cff774a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-GB/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-GB/firefox-63.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a791aec86b3ed14efb08d70159950bc5019f34b052dc773ea829ba37352fbf692c6e37df4b47fe256af5b6977390f0b47d82473778f489af3f43031eb83a3636"; + sha512 = "7649d91b6d454992d457a3152f066c8c76375bca41ed6101fb5f2dc700f5c5a9adb0c560b5abc5a8e21135e5d2abe577d286e64e77a11fc4d14f0a95a367e371"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-US/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-US/firefox-63.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "b815f79b53694e370d4a7cae85a2222b9ba245f9d84db424bf8c25b5b4b3bb95e3895cb3d5ba10a1d33b9e0459ac57c158d75fa757c8b923df5d3ae253289e4b"; + sha512 = "068297ed38ee0ebe823069a823a46a3b871528b36815324a7ef514967e2e640f9277373cf1841df5ee64a24d3909bf317ab6d6e70670c4067a2d1a8caaa4f0ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-ZA/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-ZA/firefox-63.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "7769ddef410d868ef5eb8c9c2b205bc1083a3224eb260734363653867bb1efbc2b524444401dc6ed2e65e2dcd8849e6ae05b3ff8143a2eb06b266bad7e43552f"; + sha512 = "5f50d62bc6fba7dc71169e5f7c2dd66c0a654c150d29b51a33333147e536eba671b0778ed66e08ef49d8399f3b77a34f31b90cc5ff47e8d6a779bad29d402974"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/eo/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/eo/firefox-63.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "78845601a316d7d0902031a0909ccaa53e1c36afe1607150b28ab6e0067dbf4c84c6b08aec6b334ecf04d714514b02a9b62852dcba22b54652d0fbde99223210"; + sha512 = "341bdf9ec2185e353c27e8037dfeb427c189214964766b4191e1b2b85cfd713a8ec7cd000d2f52d347a605fd41608a574a56f1334ceb8c1cf11fb51ab2e4c7c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-AR/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-AR/firefox-63.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "54e0a9200b55e10a5a480d0df47884b2c5c6f3f8f11c61bb645a1196d00dd6c121ee9710e6b2ccc5050c659c90cf36c9489a9045800cd566d64628f7e2affb97"; + sha512 = "6c92fc52e6b63e9fc14161d20e90d58551f7b062682fc12fb40491fead1c042f21bb0e4cd241f6bbc63df865bc28b60177508275b46f340d9438707431c74a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-CL/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-CL/firefox-63.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "b9f22d8318097134f70a22cdb21ce47300ee17cfc319dbb7872bc4ca5e3e7537fe255fb2db67ba347fc2ebf3ab2cbc8a6ff5b797385a0603f5a651a8cb820154"; + sha512 = "85ab9fbf84396f15c7d3fa350b9da367aa3e13550a4f936f6578333216c828913635c18f19eda04c31ff8ecd511330aaa9b3499aa86c5113981e91de5ce3ffa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-ES/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-ES/firefox-63.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "14cd21583ed2c74da7d75eca039bcec68689e369c4851062c5fa205488b577e29222fd6a025e5264d0423061d1c11d617339359a2cbcec927c453181df6b0c59"; + sha512 = "78fb7a9d8bba35aeb3ca6c4a28ee92cebefdbcf84a1d169bcdde659d9dcbf4f7770e0a0a5f448b38a9cfa4f8dbe780fd324ccb904d0a16bd44ce82ce1c51942b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-MX/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-MX/firefox-63.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "770cf8416d344ca603acde18841fb21ab1c8946e7a5a150876c47783de79bb43b85e8b366e55a4ce105b3ddf43f46272ee165deed6bb497471b74d849b858e55"; + sha512 = "e354e8cb44f9ca53df613d40b3c80f3e1c29900d3a1b7c72ffe886d4160e76c7b692ba9e047616e1526aadae8e72050752b4bf310d73f19beebf6533a2f3a160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/et/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/et/firefox-63.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7402a094d60729cb28b71cb6d3774201fb6331fdc77321cf4705fbfa330a418c92bca2b5a7a3a2901b843d8bdb55045e339b0d87753148ecab699588bb1923c8"; + sha512 = "68ba92cc0e8d26177884f921239dcbfb43642cf145a8445b22e3f2d0d8b34a2755c68bfd00ba3a05763b9606d27b4a13b8bcd91553e4f6aebf3920bb64eb5a59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/eu/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/eu/firefox-63.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "485ab61f0e85bd8a391560f4f2cac43ab35b81c7fdf957c36ac21f7b25f9538f1d118041f44742b978fd0619a977d8ec69553890d8bdef73c88944228f63022d"; + sha512 = "d140d0fdae10e801203e490b4ad6816393e88a55f1caa1b4e76e11cfa4eb48360f43331ff7c544061a24d9c9f0df91a3ddb39c0926eabd8a2a85a16aa95ca8bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fa/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fa/firefox-63.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "3f82d765e55611f1204068f2a62cb8a51f8db0940dee4d184fd2de69dc2336a1b6ad6132ad6e0188fb82028daafd244a2c478799e648c74d8efc8c46b6309e62"; + sha512 = "f9895dafc082cb31f74f6f467b59be3e161ebab65a191cd2bd8432e67615280c9d37db3b57d949290c3abf1d50911370d12fb40ac77f1f178608124f1d298071"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ff/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ff/firefox-63.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "33a5c4fa3436bd719fa2e02fdb23f9aaa33303f57db7ab27e86fe86d44065ea5218ccbfa13b410b9de0525c0c882e67ed6c6bc7b6546501edaed635460e26f12"; + sha512 = "051ea2a565519497f481f2270290eddbd4f698e6bb9a9777ba49bc751b3069b04961ed67314512727404bcb23d8411be967261b3be54b2f8be2a2f4379688ef9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fi/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fi/firefox-63.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "43d44d212bbb8d1f964abaa553b26fe5ac1c14c5cc2bd535697a03a28671984559925eeb66e0301db4b5f4cca615e77edfba5d443655205a5648de8dde6552ae"; + sha512 = "813c556ebe83639558f2af959cece13e3940ddd51826fdc0afaf7ce4142f78d07e6454dffe76d57e78dbf7e0479a64024b3720529eb032260509e51f72ac4372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fr/firefox-63.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "8d68e0667444cb5451382adf002dbd52f2cc755f0da0e91d5476c1cb88e62b0c1d14d8f796bd45940cbce01c2a180cde1ca087558a3e0985137f9f2db8ff4ef0"; + sha512 = "b63c2db2f5c115aaf2dc4f784d0ee194ab5647e493e64f315557023241d93c7228e4a94f8a7ab9521956a1ad8d811c5b8b7adcb34bf241a0eb2ff28e87472700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fy-NL/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fy-NL/firefox-63.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "332a3219011cf0662ef0c560f86a7480fb270bf0ab9c6643ecd53f28b95cd7a8118a08638fd9b9197b2f6353bf3acf05656501ae67106cbde008edee87a8ba3d"; + sha512 = "eef5fa19a954138a97c7f14371bf53b66eecab4e932b559cb241d885414db578d90ddbb835450589cde6ac97937c9946c7abfe37f2808c7141b46730f899980a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ga-IE/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ga-IE/firefox-63.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "55eca096ca6a8bdf779d6ded920bbddee406a0f925b293b9c5c346e5542b1349811248014d908edfbf757c6510ca2ad561e97fa5b4557804f15a62da45afa97c"; + sha512 = "5e5ba8b843dcf7d9beb2f27482bc7269d4b3488aadfae0f55fb2cb88d78ef11734255b557699539fa91a772c44c27366faf5d004221b523636d101d6c11a6be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gd/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gd/firefox-63.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f70cc87ecccb1357a33fc0e8e5a94a5fce1c4150d9f80946faaee7e6280bfb821a403b522dc6c1579f36fe91697e02dbaf79c1c83b3e1858007fcf7570e8c6bb"; + sha512 = "f69b169d9e1fc361ef762c2c6e23e6974e525b984d05d61364aaa1e08d7f71ecec333bed1e5f6e923ed19e6f733add637b6915ba28d6751273f75bea02f6a285"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gl/firefox-63.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "bc5fa19ee0f1b907bec355f2fd0dff4f5ff8797c8ee77ba4c9085119ba25b270c664b488c66600c85ae30c12acfdd9e8cf1d84d785743a62b85030f3739cff36"; + sha512 = "dabbd994076fffa9e4b265724dd43123e58dbed9f2bf6875e3cee296361be6e90d293e03d7a7dc36a0c7b5e06358970d0d2da9ce59445e6dd8cba853cc7d6625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gn/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gn/firefox-63.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "6009359591c9d0656eaa2c371c73d9a7141ef99d1533db04003ae3d7fcc31e33694cb0e2d29fbedaa63689a3556c40b281a6723fd7a28764ff77fd2ff624d9a1"; + sha512 = "daad08e31d848a8944e36de81e01bc2d25614033ff89dfc7e9a4124e2c7c9193752c4be08240778c05a317c27e2c7b924f45c91b20de46e54ce28d030b4aeb96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gu-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gu-IN/firefox-63.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2f3d315c8424fdb5823343885a115faaf57732977fe535526220125d38b0daa3faaec89c196cf5e153190575dd0162988a26a7d483e96f367c1dc7d1753ca676"; + sha512 = "e7f674c1588c1674f28e7f76f8a413f20b8f50a290297f045f24db0a0911e65f7069ca53a985aeabe86fb69ee8ff26e8897eaca6a36de47adb42ebcc36a8a4f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/he/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/he/firefox-63.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "34577bb7b26c0c8fd8d12a278e55d89bc291e5c3aec101325a664125dffb4a33fbaa7decb9f75751ea3e83d06cff755db7012776ef1948789b2005edc4838505"; + sha512 = "236f84d6ad9588d3ef8accbde3361cf89bc27e72d16bd5702925f929a7da46108671e2ec15a4daac553868433e3758d280dac5bd6e4c60676f55a22575114a01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hi-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hi-IN/firefox-63.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a4319f07f092d10afbefdb316d3ccb550dbfe81f886458797a23a8ef9633e04269d2c8839f6e440e91cba48554eb604d491fff685bc3773114c5c413ca760149"; + sha512 = "a8865c86b1a86fe1c60ddd42ec848b1be92f686571777fbf7b874902cc07458bf5e0e5739e6afbe399b499baa38e92414653d469e9d64b26dab15fcab89ae2fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hr/firefox-63.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "69503b9c45edbe65c8e21477583bfcde353b588bfb0ba2686fa4e73f279f050a62a0ef5c93cea60e05e777175993302740b3e1907013c648bebfc318c05b72d5"; + sha512 = "0a55d784b892c4d7704da36e8d4d173d96b594fb452e61c7b090b4d1634d4f32be21490501bad131b98bcb3648d36a08f1e6a944e6ea20f606136b4bd8b063b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hsb/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hsb/firefox-63.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8a45b429b0f338f13b59fde3b98455a9c57312030bde04d1ed1478c0fa393d0523b6aae94a8127de429d47c52ad997aee1e49bfb3fda051386365c2f772a0d5e"; + sha512 = "74a645a86ad9af1a9dcb9fd8c98970deb1f5cb435e3a648f420e66d85235a7348f392f34c0f1a6467965c877b1a12e0bf67dab6e979bb1df82057d059fdeff21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hu/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hu/firefox-63.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7001c9ee64a1052d117e5bb649dfcf287982f55e5262baccfb7c9492c7535e975d831a92321fdc65775dc31b5abcc1bd2bf7240d7eea701bd2548f95ef646660"; + sha512 = "b4f6ec7eb9fbf8da6e1f9bd99c54c84557c29596fab6f9f75211d72632ce644cf2a103c02a4ee67196e161a2ec9127c569ed0fd47bf7d037c01c301c91bc14e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hy-AM/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hy-AM/firefox-63.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "1fdf9cd98aec5cde88511fc3a79ff43c85185ac2c6008da6b432aa870eb3a9643814cea6bf402a17dacc7f2ad2c84a95e19a2f85180eb87e8a365e64a0e6a532"; + sha512 = "8c8e175aa2f2ae57f525d4b1391eb919b847598019b1e1f2dbe27da40512293075bd87574df5490fbbbd13bcaf5bda5017d980d815475a82b3c0df4dbcc28301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ia/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ia/firefox-63.0b14.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "6ffb602151ac4c9d9caa8b529caceca673521379fae298a9d1daf9049e0d4005a52adf079036b340d9a4099444404e9fed522011a953bedd2000fc7d42c0e03f"; + sha512 = "9ab9458e038d48871f6c978e50ba419dd94be472f06aa42fd781b8a75a28be20d365c7828aaa674bd818b32198dfd5a075f2481caa5a7e201e7e94a10e7d2763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/id/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/id/firefox-63.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "bc95099398a49a8417a8cbd7745fd3d07788d6f1f4ccbfb70cad2e705ce45386e7ead17a1864755497576c3055a0ce05007c5a33e82db2e1b8e41995e68b9c87"; + sha512 = "0f0ba70673b6aa030d4fe415097822c3259ff7e76a0a4163fada661886a7a422ade8defb6d47ff8c49833892ea0ed224af2c2d0a95ba6bb3a25a89a990b39ce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/is/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/is/firefox-63.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "09d898308d707dfa60ffb05ff816ad10f9d5acec5956f634b344f345c19ef47621512da73b27ec59db822f6c66ebf478ea83e43d6c1c40f5dca32f824542607b"; + sha512 = "ef5065a080d382ed3046e0f2c3f5dc09ae88fbb295d457ac659eb506f5ee171a0f6554ea83e486e98f41e3e4fab0a2e47247e9d72d67636ace34844262446330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/it/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/it/firefox-63.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "7373941b6f58e72a99bceaa18ac36922ac07f6af3b7b0bb669c223644f52b0253912c4ba199094d7d1faacb410f445f0e13a9793b0ad4810acc387692e9d5262"; + sha512 = "ff46ec69b6778e9f17e0829d007e11d8e9f33dc83469beaaf0c7d99b4157d612f4c749ba0b4080c1f6384b0b0e56d2ee10df6a6e9e220935009a3c09a65ec570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ja/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ja/firefox-63.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "07680a13fba7016b030aa70430094250fd75332675402a051501c1c7588869dcf0adb52c1c74366ad12291bee5f43c0748637afa465cec5ba9a9675779e4b0f5"; + sha512 = "f1df613339e61bacd632f986511f0b933857e7a24207aebcdb068d2290f52f1224907347263fb2aa121d14894a0f49bcb3b87e8737338c95a701dac5a4c858a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ka/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ka/firefox-63.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "0a2a7903ce148d8643a51f0dcc30121245a05fe36928a318a12fdea3708cae991978782565384ff4131f0551c1deefd83b3c636eb461b69eba468e4781f2f03c"; + sha512 = "94c378806ac9b3c80801f344323efa0a3680f9f7319193d176032b36f36a879c9528fcb010168ac8e7b2f2c72a78e7f30eb9f0d88c2db4d9d4e57b99219e48d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kab/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kab/firefox-63.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "3d6151e50dc676d694bbd88cf3947ac6bacae371ff534fc8d5cd20a0a670056f7b3bbbb490bb44904668058660c6d3937b713a5818d5d69bcdf68706780ac9da"; + sha512 = "cc69f5fda4840fb6e23bca315eac82614e0987aedbd54c01cd685cb09a9737eabf75b2074457cfa44880283701b0f178c903922be948ee94638b88c1102ad11d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kk/firefox-63.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7984af247c9e825dd25c37d50443f310ad5b2575a98bf06abbb734511b1b9705196260f82e40f8fdb7c9298cbdfc314f4a4d3516f6bfc99c5f0ada945160ae11"; + sha512 = "20d3d3a2fa0ac8a8226e242076a431072324fd9cbab2a0e15901d6f2bee3532878e8453a2460e6ce1b0d211ce409c9659098a2b02c303ca171a1857fb8469395"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/km/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/km/firefox-63.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "e0e565783f069f2484c70e74f1fc6c0a4625d8d6b2fc80bf87f757a04ef9f3b86581354b84b64bafb356f01f5daf602bda845f376153b753f2144230cd17ddc1"; + sha512 = "1ab989e25b9bd016b65b45c3361f7bb3cbabfd3246ae9395101b1316a77123a09d07c780355279f79219dfd42e3b053f88ef3a33596eea07e6eec0ea3306a886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kn/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kn/firefox-63.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "28e9d308d29a8400506a497a2b2bbb3a8462646c7c0039015d74e2405971bd17c53357e994ec24bf61593e64443c90308034637e25b52b61c05c1870b8cd35ca"; + sha512 = "a8cbc0b97e8c5ddba7ea34cdd2d23b4251fff3196b8709c22a0f4627709d63827db36119d707b5e1b985a5efe3ca157365e29e090fab971b5b399f5c65cb1059"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ko/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ko/firefox-63.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "de5cb0e68eedc4dc3893ddd92ae1380ed13a3c629af353a84210bf606fec6afc6a14c34408e84a9671a489a73bc1e041055dedff66d903a832878b918ac22814"; + sha512 = "f1a81822c8e4b2881bbe149e709450084be843d71f4397584e1c4c1c665752a1e5f1928e4e7c1562b6c9a7a4a2f394376753c61d8ed71c65e2d9acbbe3817f4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lij/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lij/firefox-63.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "bdf96509b64cd3d6fcc6fe573409ba95252d9ce8b903279ec866a796b2f84da09d1a8361fbded06f5ba7a632b4e5b9dab5d278fd5307f09274a2a6f1921db524"; + sha512 = "e8e4743ec730f999a5944a0ce33244a38d4721a9993fa37bbd2544e7d1599c4005e79bbeeee4f3cbed5385c5fcc40db14db7b07d0e68816b85b0a5d7e64feedb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lt/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lt/firefox-63.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7533b8894aebce270fe279d38ada97f2daf1e21f412386e59f4fbc8da1b833d8c0999102870ad3ef77274240ba4428ff44a3e19ce66e7d8502cd09fd9b09c38f"; + sha512 = "c32ca1a2394dcb6d022319f204101803292cad9bd8210bef6c55210c4b52fd7bda257172e751554a652b6c904d53675f0927c0e10a05d0ed13eb2e1bf41d66eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lv/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lv/firefox-63.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "207e76a7168535e019e302996fe90e187652e78d114119a01b85247bdc2c35c8f99a1ec7ce4aea50206ef3515f24b21823271d5ac708ce48d66dd98ef65995e4"; + sha512 = "79c2414ffd2b386bdc232adde3f79de6b3163833b91b42e6a2cb5698536378ced2fb2c87d74af7b5bb00767076a66e8cd7b994dd014a0aade07d4a635a038692"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mai/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mai/firefox-63.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "eb53a363dc68e5ff0913a264eac23fd55966d779a421fd73adb8ca48343b31a72fe4281a25875c4bf75df1e600cdf8cb15ac2444933cfbb4239ea097fd337c8c"; + sha512 = "0c5ae8842de2fdbec65204d409cb64e96264865b06931c0d83e3d7ea17892b68ae19344807510a660db0f7508c4a12cc846156cf07c19ff99579fdfbdbbc3789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mk/firefox-63.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "cae33d4b6712fd95891da966e3382c6bd3d9cb643a1a8e38a56de719f066f01b0219a158faeddf8a001021b489cef85369243ff51279261bd456f70c6da759a5"; + sha512 = "5d4dea8c824a27f9a1c4611f4d147d3ad6dcf58ff855239609dcd3b0f5b63dbec68127b6d9004b956db9992768ae9f18c4162ffea37c430342de010de3f9720e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ml/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ml/firefox-63.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "d6752487843849640e2104c285ec6c0981cde2905b25c2cf93a9b4602322fd3f232043832e933cdfaad8552a137398b2bb70fed7846a57c67703372bb6e710c9"; + sha512 = "69dadd70e72b441ca0d769de082e5d8bdb30728c0ec94fd173e9cdd18207a06cb819a3e0fc5a473878debc223d7c61a6cea4b9fb05c1e430d9c3335e7643ef18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mr/firefox-63.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "120f02bf41cee52f8a0d0244622c02df18e3870a389428aa2fd2d3f3b3ca4763c3a1e2c93b68f2eb2efc57abc308838128410abcdd6edcba7089458771eb4386"; + sha512 = "4192cc3e34c83e4af33851de30ec113af55fdd3c68e7808a14e506861ccfca63909eb550c263a6b5297d37518ad82741e9ff36d155d27e0eb2189e7215c22492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ms/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ms/firefox-63.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "813c1912d70069c36de7c54a6797a635c7838d2befa50e9cce21b718ab4f00443ba53f714b8a6447aeb1b1b72e02f4c66f31436f17be7b1f6e9eb4bcdbbcdd13"; + sha512 = "11bab8f2f33f277e5720dbf298a22c6f175645c3f4f8452e62eff8614fdb0959a25f5069db208521f2878cd3222744c81c6aa33dda0da883bd4b938b9a3fda78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/my/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/my/firefox-63.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bb112178b58424654e0f384733d52a2f99a3769f4314b62a911db7bc67d4c08b0a75c9281fe853d774535cd74a14816e78bffd4df00ea50534b95c113d79e212"; + sha512 = "3ef85a1a63026f878cf75ad2d48f1008495cc24d52a884eaacabdb13039c5f212c9b0c2fd28c8dc5bd48102bdadd98aec7c975e53f8abc028747c6c90dafeeee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nb-NO/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nb-NO/firefox-63.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e9116f7ed4a375c35ffe574194b846c336c1603946115eff03fc0a79556a7ff4ccee5bd2853f925aa08e4f7c40b596644bce09b3930a0c541a00c134f2f68da5"; + sha512 = "b91108f3e30085becf9bac0e743d5e84129f8713f31a3fddefdb05433b269b16b05db3d4751928010f135ca975d4979e6ae0c8a2ab465be09908987ad79fff63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ne-NP/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ne-NP/firefox-63.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "688515bfebcc238c16861eb2044dd6f715e08f61eadc28eed5bc639138e32b94db74e4e9f06833bbc81cd681473dd3e8c3c3a3c5cea58a476eccef7eb40ecb81"; + sha512 = "dfe613dc9a749805202c762de75de6d16571e37a9f74594bd3011c8c62388cae10b4556031094e8e3dfe7cc6773cdaa03532e99da80499b24ffb4d98a3bc6ee0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nl/firefox-63.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "23fde17dd874441f13c73439f9ddccbc08485d21325fd92ff4201ef61b969e5db30b1228bbfd0f6f32ac8a596c19e44e8edb8fbd28e910b41b2b272afee8e19e"; + sha512 = "cbc5dd229cc5f33350625fbf6667354a21c8ac63b2afb0c256b7c507a2ecd9a089e577e28280f34a91416d1dad3aa5b2b787b104e26703e8db947e9c05e7e6c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nn-NO/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nn-NO/firefox-63.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "f90ba4addda86e2b8fead3e1d2ea3105204e5173b85ac0ede40a2d69b5b9a3a2c29f0b75015eb93210909c61df8f73ca8bf9c428767019355ed98f402be5d7ed"; + sha512 = "827b51031897e41a796f212c9377d8119b9d1d0da9b7974170ada0d7ee27111bd55223797dcbbe272ef576780c6b80e8b8057d4bb461f1679f487a24baf3ba54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/oc/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/oc/firefox-63.0b14.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "af7672a5cdea2e0d834e510711db4d1a2de541c44e97ee501af113d5dc102b2c5bffac86bdd363d2b541107ff1d121a182b14e90e9a68a8792977a3e73361023"; + sha512 = "6ad998087dac027dc02b0157fe11b4b7ce9d2f2f3c923853cd1181557417e91e43e499b83730a5201060b31e30c996fdbd8a3b7c29b263f68c377c34662e8783"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/or/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/or/firefox-63.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "49cedc91af113cfad9a15d6933bef8c1bc9c6d0174cb1d6f57aded210296db6a248561c4ecedcc44dbd605922761e220404c335b0e7206402a4ff6d039b5b9c4"; + sha512 = "8da84ebe54eba9df2b4754bbae8911570f0dff51d41e07b331ff4c0cb6929ec7835c166f0d0dbad1987ee0692d88dd41d3fc86b749b5b5144b52b2530b822379"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pa-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pa-IN/firefox-63.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "48fffe7aac458bf9879c6471733d7d0d4fd43b3609aa3ba04647721e7dc60be609009136d42e58d760a4ff298ee83c2e624529cd1b08daacfe60d7bfec7f1f43"; + sha512 = "6ddf92d42e02778060e3ad6c9faf08187ddd0926fc85f8904f10b5d20bc57a243b61db0ae42c57d264c345d1b5bee51c7e6e62e207c8bd8edc170d84d673e87b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pl/firefox-63.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "a7c613e88606be20d514be2e2dbd2a09f94fc500541ded40ba73b5e4c66dcd01ea5f7a96a55059f0714d321f712655c67ca86a0a328783a2a9aa9ca9d2802b57"; + sha512 = "aa7ea0983b12ecff3ba235615ff2df5323fa979b02486506af9de83cb4eee679c90751ad43ba60d71ef8d30c39882e69793f266e79d45070157b097d7d12db1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pt-BR/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pt-BR/firefox-63.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "6ab1c44c2a04f14a89385a2708916dfaa4f8d095a56c1bb1dc06c4e59a23f5faa356b1e86d26a905523855aa11d332a9f290291953e6fb9517cc73318935e0ee"; + sha512 = "e28af3020417ef5d42b1f48b18310fb78c6ea33332ad2714c69d8979b4269327b76e1c7e9c55534800d8a3c4937bddf95273097ddcd4270e67bb23366b641584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pt-PT/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pt-PT/firefox-63.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "965e5973a197f1122adf63b39e9dbdf1e2cf88653c7eb3eeb77ec498a1bff5abe54ecb3b76d2e39e267fb78ad13417e376e0ef5aba2ebee7ab21f0f4735a006e"; + sha512 = "efae38a659b0d15fe1b1af9fb4d860df2796705df3c11aa51369c6844fcf24aaa342ff5a897b5d2f3be36a929f3fa748646e99db6bff70876e43387f45769b14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/rm/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/rm/firefox-63.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "e2eadf2a965e62b9fad998d3897eec6f888c95fd52e149ee85a2557ec5c7fb85f77dbe77817e919f868cd4f50d374a4557815cbdc6dd7219ba9260ee25c804bf"; + sha512 = "1b382086b6e2acab4298ebd6f80cc2585878c30f48a264e9501dfe4bb503818ed84d87e4e520f646a727ebe6180ca3a639267297ee4b463d5661cc61294f91e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ro/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ro/firefox-63.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "d5f848de1c19d1bfd9a10e14c356002524e07692be8383ea7d31f3f30b623b2503b986ea33f7c1cfcb03886652b551d58b1fbc50e37f02975548e03f490def07"; + sha512 = "6eff37c77266ac61e9fd28bfdc7a674bd9ca26e30c1cc4697e0e48946e788b632291891fabe11d602727db931af1fdb56467f20c362aab555afd6ca9cb9eb690"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ru/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ru/firefox-63.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "d85f76ef591e0349083681bbd24d2f7fb4dc2a7483a21665c1f9b71396a29573e7aeafc431422bba271c63eaa4dc11b9cc87036338cb62084cc5e13b4b187c2c"; + sha512 = "bac168bc68b214100078b88d66c2c88de66e23f0e456bbddeaa371a5a64a44c831281f4443edcbba49af34c6a1a5677e43d8a5c56d69ebe63614d8b3badd9799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/si/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/si/firefox-63.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "e44299e24ab160ae39acbc1b3b6ccac1e8eeb30d99a2a60fa39ab7bb1dd1c7296383040542cd81da8fe8fc5a778eadc10d90ade11346bc8886b714762f8d2ae0"; + sha512 = "2a0c42e62eaf8e23ea423fbd9f8995fd4c42c8c65141a537c51c8157861a8d9ad38912ca864824d52f961e752695739610bc626862153b091b9bbb1e83086265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sk/firefox-63.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "20c1a9437398ab3f0509850e23fbc8dec319fabdb139d0e953f3e0782df3f355fbc48701a08f13ead7689b094fa1f7df2308e8e47b2095d55ab5dcfa93f701fe"; + sha512 = "5839b61e1bb4a74340d3068c13111ada01f38d60fedd9e64e78770ac92340f025f1cc92e562686a12b65fe1f17ba170ed925ea2e53cd4b70e0d2f5a1253623da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sl/firefox-63.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "ca4433207bf6321b822e273977c3c432a322c66b9132cbd91fa0993eb142997f304aedf5c96e4e62b2fb7b2530942d9f48bd40a329d10266efe9af8c062de89d"; + sha512 = "2787536b263be9b7e0fa9f9bd91286b544d83468bc7cbab64ebb6c3c4e3d8ac7018e7ffa877c8a6b35718cffe190dd9ca96c3e3855029eec636dccf25636d3b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/son/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/son/firefox-63.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "4534137bbc75738b4246d899ca5e16489a025b37315fa81e6bf0bc71edf4736749e90c953fa7dc7c829f1494f18d7c94ee84b6bfaf70ee3ccfd11b8d7636323b"; + sha512 = "835bc4e3710394916c23ad066969364cb3ede5bd671ec2d96cbeaa448158f0048d4a33d54a98add87a0471253932f1dfa2cae05094d04bcd859846e6027903d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sq/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sq/firefox-63.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "b2bf90fac89b89f3d61aebc26978120531d757c8500d2ade97e9c48f2168c64cb8da1be6d6c3c8ddffd23fbc463d54123e322b04febecfccb7bd4327620aac99"; + sha512 = "ec44a791fd197df0f878e69592aa00eb8425515e072628ae857ac15101d08620023dba0f30eeda14baa8c6bfacf343c22e3e8c344576b413e32cca218d6e1001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sr/firefox-63.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "4c28ba897cdfa60f548f52ee4cd98444010204a59efb7fcd8bdc5b6318a9f001500cdef11c7b7ea7637168adf6491ba269c30996ddcf526b5e1a2dde1388d6d0"; + sha512 = "6913e130cbc2e982a39e88656e15793e2583ef4686132588e5b1b101af1e4aab53124732b64b46eac2d2df43376b2a65fac961c6120d05158a44e3217c315805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sv-SE/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sv-SE/firefox-63.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "04db58a9c1f80d4fd77a32f663ca95aea107b61c90fff8307b077c666af1369536e668c60c89ab8ae92b7b6a585a41c35f487c92e96484f0ce0c138525614e87"; + sha512 = "8469bbbe04052d1fc120a2748997376f397359bafdad36690bd7c498c401c4934b278e1d1e57d39c1869fbd4f3a195247aa6a339f49e8b17f9399c21253901b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ta/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ta/firefox-63.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "5a2efde48546042d640de3cc76f6e7918ccc8b34df3c53935505b321d23611d86999b1c3ef00c08af003cf7991b7b00909ee5825251c9a13521e1477bd9242fb"; + sha512 = "048dec7d7c0e2959176ac19f215cf585b12168d7a83f117a35fdc82afe8d001b7df7f84da628976d1e43dae2e6f28fed06701bd1c9a44b0fffe9c2d893f64d52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/te/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/te/firefox-63.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "cefe7a27d4a246549dd19f6c95d99cfc21ccd8b7b48b57425b51ff081cbfee4e35ee06350d7b90f40ed60029883ec7ad3d0a9ad64bfd851996bb301279a688b6"; + sha512 = "63bcefa4ef757bde099b7661e21d241b2ee88a9b8632567b8f2e8150f70ccbe21b89c4fb6d59a7488ebb372130bc93406408b33ff8bbb54c555538cd77744c9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/th/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/th/firefox-63.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "68a997083d7c8fde45746ac55c8994f54d87b5ffe48c3aa1fb83460ac5bb61bd13d5b9f1d33e2ec6e6c2b9c965ed7ea8f1642b3145edd8a4977206c38da42044"; + sha512 = "ce360ddefbaa522c5f4bfecb7e5deb61c342b0adc59a69d1fffd953dde013ab999430b9f0dbfb7ceae94e9684896d83c9222bd3460a5eb7afba9eba26447dc0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/tr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/tr/firefox-63.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "02718cabffcf3585faad05e07697ba1b832d2af7fe9c99adefd4d68b2ff19773884467fe3f9c6fe6cc0e8ca47056f500f4b76b184f7fa8fd899e9e26c024f013"; + sha512 = "eb0c148b071a7d654ffabf62ecb1236f9294421bff913648c95fb729547f6388be2f8f0c8f771e5dbec2c446dc4b6c1db962a5abb46019c2cc0f8eb8a775b402"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/uk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/uk/firefox-63.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "202043343fe98673ad33d032267a5696d0554348c709cb2e356136a6becd5a0e2c1147d07fd752afb80384cf13a56296b859c4b771ab993d5a3feebe5415fecf"; + sha512 = "a0023efdb0ff31515f51b4150ee35ae834d6f0ae976d0209ee23c93dfcd70db58c5c94ebb8f8e319690701d2364ab5fd5db03ed7a151fd33875787c0478e5eb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ur/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ur/firefox-63.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "834849bea96f7176bd4b897a1877b56447674bd32ed0bb5b15715fb5d37fa1bbcb8d10af459bf08d7def3f973489aa33e6fb359be81f69a5492c5aecc20c57da"; + sha512 = "b850af8723d3d32fde0b938fb4f7a8734cbddbbae34881deef09bd537d27275d553c107bde3aa97c3123324f8bd0f63e7dadacb9f85b38859bd30a5085bb1511"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/uz/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/uz/firefox-63.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "b360d917901e693c29f49bbb349d10bc4129bffbd8f105b2b9e9e6169dc13edd0d453368a831bf1be21b5d856766bccc4536f50727b5f7b7a6f6d2fa287bc803"; + sha512 = "57bf9bf93df74d3b8549aa706604d9c49c3157ebe9f23fc4fc0a221f9c00d2e60570055135fe4534ad5f364529e6918110997d5ff2872bd7e8a78021a0df32da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/vi/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/vi/firefox-63.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "279807df6ac7d0a19d8010311973b5e623ec91909d952120f565656fcf78f3a549b3eeaac3fd27ed1e30554a7b57c4a129757f37bb8971fed7785867277d14c0"; + sha512 = "067ce92c82925b7b5e9bb74aa98d59b4d7828e47780790634941f6e08334822bbd0751d783d7ae4a0ab1058f33676ef94fe15db7626e4b0aff6c514e972689a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/xh/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/xh/firefox-63.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "313dfce1b88243761718b313b0753e09def7cfef69c1f65088872543ce31c6957739dec51113b301c5c788d1b89aa173d750c3b214dba6413fc5522378ac333c"; + sha512 = "cc6b9af7acf4d5d075cd53f1bbcf433a379fcaa3326f483a88ba7c44022aab53d4c53a2620b94189b2034c5009d2cc93c1fce2e0143c0d3ca0469bc00edbe8a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/zh-CN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/zh-CN/firefox-63.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1351106b16c20d80eacea77e26ab6235b00d16f33a94577184f61ce926675bdc9bd662dbcc39cadaca18c9ade0ba786690b12aea752520c671157f5525f581fc"; + sha512 = "20d87043704c605855962db40da5b66514a0920b396f815e4ea091769c6564e9226f6ea016415f1f99ec914450a9b364741c32bdc84a12976902451e41b16463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/zh-TW/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/zh-TW/firefox-63.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "da9808a83c45d5a233aa1649a7bcb7d88fc3fafe59d93d9a872de2902b8b0c7f80be073f905bc2dee587b53bb5d010e66f2926d2c35d50a9237884d3d03fb6b9"; + sha512 = "d868cf388f5748e282eb6f276d318babf7e44ce8540fe6a13aedc04a7cee8adc85597e5b95f72780fbcf17ef54cd3b3127742e18ded91f0d6b08a4b9491c3d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ach/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ach/firefox-63.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "98f43a0ec582e6753f12a079f07a4e55f8e699b9a8624a632e141b09afc8484901ab3cbea5609d7cf2107fd90da3d10308245a28ef3d93e07d35cbad68200bd6"; + sha512 = "1d874e55ca2994701c7a52807ec518e46cfbf16626b174e0f3e6cbe8827a885e3517ff709db5fc66c98c3859384d87cf839f7e72655a0d8d769f4db9cc39e666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/af/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/af/firefox-63.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "b8ab0b90538b7b8ced483b2771c8340228d23d39f28413f82468626553aeb81169c629fb9f1a1b4e17ac312b8bcc984ecfe711e4a85af8afb02ec485ae589a64"; + sha512 = "91d5d2a53d8d85e59e9ad4ca9dc0eaa931091f6f267506aad095c77b71be59826cba00de1814d2e78eb95c869ff0c8bda02676aef290b4a8332df0d066fe94a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/an/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/an/firefox-63.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "43b923b7b99c4aa1a3efda001c60b9570f15ccb648d70dba5f7ae57c282a1923d310ec48b3424a641d8508d05a18a1da76fd7203d947c9383695d91d2b7e2da2"; + sha512 = "3abfce359bfe5cd385417d2fc30a4af9bd705602b3d902d51030a12ca6ee9086ee7b741a07def056a0e37c767a5e38f293f0d52a48c8f6f60458e74ee73cd300"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ar/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ar/firefox-63.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "562a1a314a598f442acbc92a0d752e48136dfb10303e0dd51bb3ab0a2c2774e5f5eb3f932d9a880fe37674be3288f5406ab4a0251aca2ef1bb3d23f5e0ab303f"; + sha512 = "d79566a5c6889421e66f189c86dab9e32c377270b2fd70e1e128810dd391c651cd66283045c8b0888520f7f42f4d98f03274fc06dda0a1dde23c3e3f50ad91e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/as/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/as/firefox-63.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "acb3076508c51621d11ad6c0a8031e6aa9f26fb376fbdc0b1eaedbdeed5e84e61682e5f1d45511567e1159125bede12be12f0e0f7c716a1addca8affe12cdb00"; + sha512 = "6bb45e54027839ceb0f8ece8a5a3d49ced35bd4f391385a69f5c26f191e87e9f06f9f59c2471ec156aa38a23cae38dc3996967946d12e88bd98743e15d888edd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ast/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ast/firefox-63.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "c262869d7a4aea66cfea24911cae4e43de2a17a371167f4d78f3353f598187a1e6102708346afde86166f360e9d42842016f65a272d9106ef54938e21048a83b"; + sha512 = "3707d12351e2c7f1d4c793593ae2773625c4342d53a5bb32fd1a1f52d85c504eb662beb995894a5b2eca67753d1db1988a247317cb60252b95dc1262618582e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/az/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/az/firefox-63.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a9da5d539e4ebe59b1d21b21bd018413e935cd7eadeb60c437f3a5e972851b1087a2269d31b414a17fc712c1f9cf180287b8a69d7b3d4faf34a61b555d1d109d"; + sha512 = "d18c2cde2cf0964d8a52a68a3f4e2c9ee8c6239ea7c642ec2ef12bf2024dbc15c125a9ce2c49223c826114714c22a27bb831b3f5dcef0680646212cdae6849f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/be/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/be/firefox-63.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "661f58b200c1d18c4b837aec8b2ec334270a06d68ceb48b4d6cf6762ee8fc94c6c871cc9bb956ca67c2759da3450c08fd2870bf32f88798396ccf3c24ecd7fe9"; + sha512 = "2085451b2deee6741ea6e724ffcfd373118dc309018e66efec6364eda48b05d06836819d86a23d623ed584de547e9c55bdc11ce5a2c4e1d44d64c442d3bef929"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bg/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bg/firefox-63.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "f8517bcfebede31aaab3c20c10be22b2dd4e9ee56ab37fd8c0c362933f375189ad41df04a2452b83759555211a9699998143aae224f688473fd4da8d258e8566"; + sha512 = "2736a45bb91407cf262973337afbf8d2612890b82dba65f1d9c83007550809464a60d3b74bc33cde23a23afba0e2cad905ee96123dbe791d14cb4ada7f87e1de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bn-BD/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bn-BD/firefox-63.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "98eba90fd685eb3e5a22f68027464735e6eae764ab5063fc3b49cb2a0888839eb7fed41978ef9edbf2729a66278368313a61363c7b0a9abddb68d7a93a22fff5"; + sha512 = "7ba928225062999981206972559f6c52f9367d714d38ea0d7fa086e2f1d9d990b336ebfd0b7d1b08fc06cbb386f89dc5c95d8e136a393c7568a0b9198c0fa6df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bn-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bn-IN/firefox-63.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "e916abc4c8e0f547f0f510a2919637029d9531dc275e8330164d0092864d5912697c89ea23100c1c411632a6f4238554e83162aaaa50f23d85534838e05d9b87"; + sha512 = "92c33e5139b130fd9e3e83614443ccc2a189b19cb61949a381e259dcaf0dabd66b3b127446abd1117079cbf4c584c1de0398dacb1612285db56f5a4f0072cc90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/br/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/br/firefox-63.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "db5c9c663c0b12654602ceb5b73033cc97c0d45e3ec6b5d755b94ce3daf7743417777fdcadd8263b1272f7503ea6ace25358285fa22a8fcb7d4bf50038bb2727"; + sha512 = "bc34bde0506218c0e4251b22b1849d05b9d49ccbdaa8df650f56ebf87f04172b8adbf2204709f182b286212bdce08ef9448e8818dd2622bccc3cd9496c48e111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bs/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bs/firefox-63.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4216655dc3ffeb28fba06405b5854114e0ed5cdf014e3bdbc3873083a27b336e5348b326b85f09d690bc6345589889738f5ec92b0c1776cf93bda76310d3e117"; + sha512 = "8fdf9e385f94357aa7a08147585d02e7d293d7c6155afff3da92ee37475afee222439f4d93198bd24c02d7f8109bd6842426c65725f19aedec9b38c8aa088627"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ca/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ca/firefox-63.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "164b57623737c0ad20f5f470b39293872aaca3018db55f181fce19a40c11650111ebce4b54b5fcbeea7292455f9d5ac7f5d3c1460c50c1b577b935a7c8738d9a"; + sha512 = "f95d32c4dd652b35102cea1f9791713a4dbf40cf985c33268ed35f3e5abec87a46d304cebb961f8a80d97e4e26ee907266502f9e6d1f72741a018a29e48544f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cak/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cak/firefox-63.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e7e03b8a6f70978528d9d0671ae0dc73f78f6af998bb1ca6c84dad5186559087bda0aeb1c870c377eb009e7ad6f14490dd959cd28beb564731c43b9f699ebc6d"; + sha512 = "b4909593c8c99530b791dd40381e891f4ee61c0473a0fcf44e0c5e5ed76e4424930747ac7f479b21d977e245b0b53b2e692a43931a5d72ad16b65f37f8726967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cs/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cs/firefox-63.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b0c17ae3f61f6829b7d578968eb1166ce4043d33b81935e1c5ca51353a0bfe64ae2c326ba555008a30c59f34af72ab8ef8460e204caea203a6b174f2e3b92993"; + sha512 = "43f40720b91f6de7323fcf866b032ebbfa34640ae9786198f87f0e662c1e33d7910812e3c4bf45fcf929d9e2d669f7ec4d8f10cfe47d1fc82c5654b4bf2b40b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cy/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cy/firefox-63.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "88e93d54fadfa6149c8de03e82b898ab4c319cf66c0aa1f6a16b24f73815031a943d0c91d9b382e97c29ac0bcb83f09cc391e01b7bd3120e8f2c9328e85da4ab"; + sha512 = "a9905e192147a4bde8b97f26a63f08d982fbb05fce96482084ffad7ef8aa54355cb79859ec8e095ce49497e2c24ada38fadbd77e0e31ac70a5fb6632bc7d31de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/da/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/da/firefox-63.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "1ff1029bf7486c6ec3516ed7e57d22d0dab95bcd8b21aa5e60d32c630ff88c15eaa484892e35a473d962b89f49b281bd25b6d16db3a6446fc9959fd64d75aab9"; + sha512 = "d1275cac1c2c1e98df38d745b6d1673b341198d87db6bd767ea8e2fb4f525df874b3dcf9c000e4ebe196bbd2a0707af6ac3fbf28f4b21dedab78cdb89d6342da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/de/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/de/firefox-63.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6523e7ed4aa0ef502f2a64653c7d06909b67c6a8f173295783c97e97b39f9c00b36b1f06038352bb2a247a156e4a1310ff0fed5b688a5f2b84efbad1d1406362"; + sha512 = "d40af9cc9212d83a260d42e1c4e9dc1102253cea3090f8aa232ffcf97b5fe417252b1360f126c97c44d9f333187b896883cc3a8de77ced1020805d7bcf1980db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/dsb/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/dsb/firefox-63.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "34aae423aa61bbe02f31b07513cdd4734d94dca42cfd64dd3db7f3e55529316815a266d578af1771135a264e69b8869373df061370e4046a2046ca1e0f75b74a"; + sha512 = "2e2dd4c1f5c2f53f3df2510f88a1e73f320025871b3b1e4e08f3553c51a1f41b8974f17754d705c2939d84442af4b4e6e0f2f09b35674bad0fe14dd57415d191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/el/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/el/firefox-63.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "542ec3370d58e4ee767013c3511e7e04e76d84926f12986d9e9611dd337c1a649de3e8bb95365bb92f339a95058f8cbc9194d3f22f54f96504cda24860c1fcc9"; + sha512 = "6fa7e9d22e7c379325de750725b25e31ccf814bf391dc4f7ec30c226d64345c52d07542d05d4d096f1feb6d75da37fcb3028a5cefce7a4a7bcb72cdfe940cc1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-CA/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-CA/firefox-63.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "bc11f690284b11100608002f3e1402f758d9d1cb981390f14d16c841ef605451b7cd043928ffad60c3505423bd89f7d3dbb268abeb8f1835aeb1d2ce185286de"; + sha512 = "0887354d8e3a990cb3a2a1267b6e6e60084aec7bea75f4839a41834023f327077f36164dae5317da47fd333223488b903c77258d73fc1077bf411e1eca860b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-GB/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-GB/firefox-63.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "9fbf9ca0c1da0a80b77c975a980acf7afb2ac7f99c3f69a1d8cce88c8651957e1e203ac97fff9a67965a36d85f09c7a80e970d043e0affa2f273615d8fb9aedb"; + sha512 = "53ce519552bfaeba90c00e108a7af36bbffa8f6ca1f580abadbf441ee29a40bd93d31ac65ba3c875e04299646237ed4a51736653552d607436ae177d5682c84a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-US/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-US/firefox-63.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "25d9a0510fea951dfaa432117adf90591bba6dfb021fb18bdcd8849e71f59e8ba3ce9067e8291dd0d7769f1d2c8e5ac803c1d76d52e98e8ea7233ad5daadc45c"; + sha512 = "1c23a2e28c7c14da5f2c0fd30525ec38c1169e8433991123c8bc97145354c8d1ecbbf6df0430b89e981222011e27b0c5b723af093ce640c8881e0b9e5b231939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-ZA/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-ZA/firefox-63.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "c8a6ea2aab2bfec44dd0d13d3f8f8f3e17377f54889f9b13ad1e6529bfc8b27a4f08fd287964edb5f63e8bba00ab961e413fa23b37cc05e46e050d11622a324b"; + sha512 = "9439499f577858237dbc39c6cdc20a87276cda77d45e14ba5ea7f090cabe6813d7fdd8b77a32dee6a98fb880f421562a861e98aefa619fc44b0c4aab8b522b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/eo/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/eo/firefox-63.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1335b46db5961afa02401f4f318c52aae40c00611688f2eb32506f10faf24046d2d495f4c3e8579d7271e0728e5608aa7af461ee3c3e3940a2c5532ae52bc270"; + sha512 = "a04051d0bf181a02a04e2c36b8f05b38d7f3eb6188c5977ed965776120a692d8fbb1d3d2ceb38da8768d201f27c1b36995f68b002a9261fce8786d34aa2265e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-AR/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-AR/firefox-63.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "db631bc0fa67e2440ff068f009f1cd59f8f0004341911af9372a09c89f8882ddd82fb7cc350bf609b81ffb7ed23fa0a0aaafc91ac3aa0a7e03c9a52b10eafaca"; + sha512 = "2230ee909e8cdcc10d40939eb6eaeb5c8289c697e2d0a5e4a25a9b1345fc6b49c9528e974212ca3a5aea3e54c8c8948ae56a2232bf0d207e82658ca2dfdd82c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-CL/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-CL/firefox-63.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e65a58b49ae8c24466f9762276fd3f006dbae2ec4c200ec298d787bc4aaeb742cd17e5dcda24226327377082cb4aa5f4b37966e94d30bbd920bc1f8b7210fd6b"; + sha512 = "26e7a24204190fb43a972038c1036e93e2fcfb68be804a8189b0006ef8a15094e152659206b1fa9b7f0cb5f9409aa4dd769fd675fbebbc90f323d28b0f3d58d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-ES/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-ES/firefox-63.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0d4dc421d87aa50bfb43be4d80405741901d6ee69ce0537dff064077f5713afd692cdd1405c1504e8ed3bca1affd672985f8dafce63a398d8ed8758a259c6c1d"; + sha512 = "9a86d804c199c530dd7d41d4ae0d72604f85061a594c5cbbe1de2daf4860c4e36831efe00ccdfb6b5440c88575a6d4bc2d786396f13999453729861ee723cc9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-MX/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-MX/firefox-63.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "798b502fe83e7ea9d0e32786e618009d7631018b303f31489754e2b04b5c89ddd8dca48a0472f8b4785da5aaf2a2a4454428d5794c6e1f8e2ee8d08c655d2137"; + sha512 = "181c0a83a5bd7d7fc2e80948704f2a466057518c5a748a54e43bbbc0fb8aab37bd7a1c83892af60ee359243633fb8317c42552121b4e0ee476c5bc7fe115c0d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/et/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/et/firefox-63.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "4e32583343514637080a7d41366949d415a8caf6abb2d220f55fb0623fa2df08eb51f8e1205e38fcb0635052eda52c1175728a63dc06ab555e1d26ef22035b1e"; + sha512 = "6734e4572f50cc7cef74dcf63994ac5ac2d17cb0c2a2110a99cf0d5c38cb3075f72fa21561ed9ec98dd860c39262bf282c3a82083e436d1b160a3d15dfce3a51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/eu/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/eu/firefox-63.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "4619ff888774f2da4c0a745d08462c6b584e49f6bed7cf4a9f38f1e69c0553eb40f461491858bbba9d26835bf86493459c273ced320f5292306863d7e1b4900c"; + sha512 = "85382c13dc0a828155142805b83543371487162821c1677e5411d8570dc8e1393479116a0e7bb62abcd6e0abe477f0671ba2c2c600bbf855ed32ed86f1aa744b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fa/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fa/firefox-63.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "d47c39364157f96bca30c84795ab216a3d12677f39a43fa3a411b2d6c1a58ff60204242266b4ffd0b48474417d791ae6cb01ff657d3b66a01932a632a23e4a68"; + sha512 = "a2c071e374c3dea2da8dfb4e1d7a001ee30bc33c3702d5e352427596dc03b36b734767fd3bd72fc4e3323f99ff88b475a1d7deaa8d14c47921986b4e3b6e9454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ff/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ff/firefox-63.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "b816e4d844112785a33a8519833dbc1ac5b4832b6186946b0e0866e53c47936bffb385f464ff04659f03db8938c25f330de75e3940c644e8e19fb5d9cc30f1cd"; + sha512 = "3f92ae32d51baa4dcdc13322aef8653da33fa0bfb970c3a58e5cb4297d90f8162f2020902b3f3bc566b7e5a07a317c8eb51a7f9c737a27bf043e56cee258d523"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fi/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fi/firefox-63.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "e6420db4cd448e62ce975f4090365749bccdaaff39b881e7c40eb75686799851f264ee3e9c9b2d69ce833b59ce5d1cba2a2fba4017e03495b23b7501a87e046b"; + sha512 = "eaec68e83af4a68e8dd1e7ac63097811c4c1a84fc577ec8c4ed9cdce72785fd2d99e4e534257f34a4ad53254e81a6c56711cca9f85cabf1fa8eddcd26ed0946d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fr/firefox-63.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "1ad0a3de8e08007ea64a0476bed1c202e35f938f31152a18a4bf043f78c0e3e9a172c9be73a578a69c1d873ba702116a484b921f9e0de48c0e00d551e973417f"; + sha512 = "b0264932f94862f6b4629f1c853e6207120234dc030a298f7d5dd975f9fdcc357cd9b8bf38f46221e090b1f63aa7092c3c5005b3f569a937e8d6ac69a941d4bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fy-NL/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fy-NL/firefox-63.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "3b082ee567267ebe7e846cc928607c832c96c9a4d996e098c0fcc887bc4cf52d696fe1dffcae9a06a927b45d2f29d4137c55cc99f2ddb95b79dc2c61ba561912"; + sha512 = "a557244b523d64db01ff42209e48fc5ca21f603916339e61fbadbd74a59477b9adff021a0f47759d5104eded00a12f4b008644279c19cab7a45cfa9a9a3494d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ga-IE/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ga-IE/firefox-63.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "1bddad6efd191825751252c6c543286614e5c52c2fe514c3cb5835953f28b11eb642abe72460d55fbbcd937fa93a57cbe6dc8cfdc3fe179961922402f81e90d6"; + sha512 = "11619898aa4163d6ee42e178e58b3d25ef8c9263312a1c62cb9e2c0b9516150ef9990a971594f8b1f1421231c4a03c3337d2aadc292150d384c085a1c012cb96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gd/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gd/firefox-63.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "55d1dffb686b0f0c9072171b1dbb6059ae31a88f77252d922ca0f52e8210e724a1e951a1049ff5f5395eb247ddc3d93ef6e865b50b94fa8226394a1c32768e66"; + sha512 = "642ac490b5171afa96f3363919e6b5bf4e16ec65671b36fcc543f7e160bb0d595bf271606b25ebf1bcfdda5fc3b3ec5a088a766d52fc6b72b72a1bc5d107ebb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gl/firefox-63.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "11ebfffae756c46685091c63245e8bde2068c192f335d37585629a646a78478e76eea84d01b4dca85b6fbc0d53c09477ce59a29a3ce4219593c24cddbdf3cbbb"; + sha512 = "bad1ba5729895d622c0a452af5a0b34b24fd332a386cf27d71505ce1e9a0cd164671b0ed6b4c4c7befb1aeaef75f3142f73ade1dd384580dc71a3eb382f221a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gn/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gn/firefox-63.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "9f2ce62956775b7b75014d62a6af3caa6e55cad0bce6b69a5bf41f83c89db0a7d6446c8b13d84b0bcb59e14f11a92c998e489339fd15c1c92c7ae2273ae4219c"; + sha512 = "d8b89350f75d4cd6f33e2eaae4c3098462ae319f4a7df6674239992bebfbc961b9e60a2cebec99488e1391fe68b218663822e8c1b773f63c6fccf36fd57fea46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gu-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gu-IN/firefox-63.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "185c6a2daf7ea7c221c2de73aa113d81ab0b28b085e2098943e1d315be52ddb43deb90ce1fc53a94bfac20562923e7aa90ebbe959c0d66bd9035674eb2e146f6"; + sha512 = "835550054ecad1bd4aef10f18b805d9bf1726cf7ccbdeca04696c73a684777cc51defb1e9ff7fc67a1f37ee99a0b5adb553078cc7a83e95ad6d87ce338c9bef3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/he/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/he/firefox-63.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "8b40e3c315ae5b6f90c396a68bcb08781c4161715f9b4ba1fa7d1c6b584b8093942e9da3dde7232a0e97847eb3749ae9225e0a136c5ac6c3e95eea0710ad0ede"; + sha512 = "cb6836604f5159d13f883678287c340ef01118980014ba9e72ad4c17d86e10349a5b44be1ad0c0ec14e789a1b24e47580236e0d298d816a2fec0c5c02ca0f19c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hi-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hi-IN/firefox-63.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "bcdd3223262d192e07e68e51cc610654387f4c3c05b21652740c11fea1010aa6e5dc564974daac1801bd50d0b0f78f0e8173b3cd2b0ef8a0719251bcc83e66b8"; + sha512 = "119ae4627c1945b00acfbf03b43e97b1b94ba4d80ce71e277a6e23ef5953bf775e575236cb16ce4d4e298007f02fbb1676fc0526ae44564c87c8212769811587"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hr/firefox-63.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "4075cd52c92433515fd97ad2b04878d21711d52fcf388ae19477ddad63a7a1d88fe62983f47fcad844ee8be1881e1fa353e18865b8c0c02c57d43b2be6250c48"; + sha512 = "aae23b11eea3a49054c0ce4e9e9ea9c1200d9414599a6e9e993912a3b64b5c94c2819f1f9f4b65d6ac8bdd2cfc0ff125047cdceae286324db33174c3d6e7bedd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hsb/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hsb/firefox-63.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "2534c74303a9e40de6e32ed3552c575a38a2be612237e9daeca2334c4f3354698d640c62f7bb170b38bc8267735e75ff2c7dc61bbe1b9e0a7b4adfeda891a1a9"; + sha512 = "aa88612f31e96a0babbd08ca4c43db75a869cfac1020176bcdf00125a7dddd0736935a453e277b6408a59d3b21636a3c60cd9e40bbe9098c2da31aae54d790bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hu/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hu/firefox-63.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "002b67ca863b1da0e68c39cb05b11b956f4f8a47968b88541b73b45bf795235d1b851bfb3c06200a71c7205806d637c8da315303f8050e56f5560d1066d2eb97"; + sha512 = "25668686e42ca15bdd7dbe95380c95b907262ae72c3758fb0993e077326c183e1af79af4bc9d33b7e7d8dfb142d92618b1ead67a834d01e9cbb3fb346f139b8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hy-AM/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hy-AM/firefox-63.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "2ee7f78a9a8eae99792be88885b9d10f596473e9fc03d935d4d16b927cfb5e6305a037edfd5d4cef1e253a46a9d7b2c2c3bca3f86e557302e326f1002ba12ba7"; + sha512 = "9beb520fc3da468a73d0df7fb8ea937f05107191167fff8ffff2242d4db6677d4ad1d4d248170ab55a6b31365b5bf965b17e0a52d4c3c748cb0fe62f7eec85e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ia/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ia/firefox-63.0b14.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "c901603efeb9b40a0eae5c6c52973dacd218cd4a31f94a597f3cd20338dae8dc2a10c0b991e4367a72e8ee473d000e972ca6aabf2dbc4ea16f0d4dac4b2edad7"; + sha512 = "14f5bc56ea03912ce445cdbfea2840fac886bf048587db3230bb03e2f6999050e532b27011c1d83995e74885fc0cf870990773df564fa3232337a13b4951d1a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/id/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/id/firefox-63.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "8c215c9bdd711f9165a99dd5276b73036590234be62f42c93587598d0d6423ee26d312fb015f176de4afe799ffdacdf860f0d00b3006f0229c1dec84d2af9f7f"; + sha512 = "57816fefb3fb9024473723c1e53dd769356d08f7cee6fd18f3a618707d7c474b71ece7e0da9b61f9dfc8d870db046d29a6905330248cf4021e538cfd93684761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/is/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/is/firefox-63.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "39af62503e8de0c74630e4c877c920553902661deff8a2271252a0b15ab3f544d4c843f53e6ef3a6f386dfbf047d2ecf47d29b3b91a683dae181f1bd5c175791"; + sha512 = "8ba70aab5a6407a5c4d4ee301b0f5d91c02cc446b1543abfc9ada2063a53d6c9335b6523c6a35abe45cea142cbce92c86f0100a036ffe69932b587cb16caefbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/it/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/it/firefox-63.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "50e8f50ae82f3cd13799884367968bc3e1d1b01f029bad18a2ee1f658c1c45a98782b831172d9bc65c2c97da29478767429a299851a7f498b534c121ab493d13"; + sha512 = "ce9cae447999f616bdedc37c45ab1bba851ba8f983a4b8b9b1670d080521172fbec753377c7577818144fe297c9a7f81b9ac3cff5f42a216b089d40b035a9cbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ja/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ja/firefox-63.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "01d52a8d525bae042f78f865284412bac2861f8804e214725671a25d2d4128671bdda564e73b9342520939426f7c1c68349637cc5a85030f1a559a5af940507a"; + sha512 = "0792d7a73fa37b69be10f65e99184c6bfb7de72c493a06d2a808583dc091f414c686b9274335b532d6e371024c069d20200d0454dbb4c4568e46cf6c0fba2bf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ka/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ka/firefox-63.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "dbad627cfb3eb60b4c7ff47f54faf75df232fae7919073641a394e6c882035af32e8bef25084115b25959fbbbfbf30753f32a2868838e87c7905fee109ad5037"; + sha512 = "59fc959730efd2e78399984a3d0ed18d653e92bc2edf8a37b055ff715e66672d8f938b128fcb9f5a5c932ea8d265a509f1c16cbed7f054449a4f4f2fd51c42ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kab/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kab/firefox-63.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ae48811af05c1ac602270e8e6acc230dbf2e497567fafe9c7b402897f4e5cfb34c3645f14e63f463cb784e56bd49aba1b8ab692b9500a5241b5f91bb3a89e239"; + sha512 = "575d9b2e082d5729f09587434965b383049375771029c188f0476e34bd21e10fdfa20d766cb934c567602f6f38d883c848c8110f6a42f9f62ad258c478ec0f5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kk/firefox-63.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "70077e5aa220d6e67c819e98f230894277d8ee9446885397bd2bdfc886f1075907639ead92007dac2c74cc0ff7baac75c921b7c6ddf56120d87f66714e1e9388"; + sha512 = "712438e519188f19bb9786c72a795c030214dfe02995419934e58276a4b5b22413daf0ed0c21da4849c347c222f7d22b3bd9a95e9cf9aee6b5e94e7b950ce801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/km/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/km/firefox-63.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "25e487b8dea02fa31211cf9b8e143911293f14485ec167e5524be0ff61db8cd9cdc86d2e4ccba58e63f14a82439dd11f6e25b9c9b591d0915c8119cabab81551"; + sha512 = "8bf978cd1d226dfb74e9da959da105d6cf995c1028c1cd2bbcdf09c93ee300de6eb58eadfea690fb629ac93bd49f85cbf81b9bd49390af6c6e54048e0191b8be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kn/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kn/firefox-63.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9a947d844a81c3f6e2f62ee5a9dc0129afac82d9c6e77e59232ff3e140b3552b146a702a4be49fec64edeb3f506f4ee86c4c85345315f76171cfbf72c3f269da"; + sha512 = "47c20810081469552659ae2d845c292db2dc447c1974dd768544f2444020127df85d3320d7cb25225b8dbedb4e3015009de9eb7b5aaa1e7a4298302f527db32b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ko/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ko/firefox-63.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c56662d013ac5ebe4cd6bb64785ea165321aee492dd37fb5c7368c4932c4f871d2bd33128d3201dd9c3e73fbabe4319190eb1701332891f62bbb48fd5c5776a8"; + sha512 = "4c4feff0c959291112f30b952232d50fa78e4d05e715fcd6c34e26d26ee7629545ae46791d04a8672aab3bdb19024295c94a6fbf2b8b818346107378016cb72b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lij/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lij/firefox-63.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "c1f6944f4f52e4e6b6f84a69050b5692a2982a30a9ae7ddb747ecc2f183d9be225428675ac1ed1553efd573f71bd3350efd9d247d16ae0c3d80044000b0cbbf2"; + sha512 = "980910788cd4d38db52374cc399e90315b0829e741c211ce0d225289c8e763bd45df45b09ef4ee0228484a7a33c3ccc9d05015ede42eb427b2336ce09747649f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lt/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lt/firefox-63.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "5be16d895d58829791afed1c9fec00a2c84c849729cdf5b0a0e51ab06fc55deeee24bf98107f4e75ca8616f936676630455cfefc9034d6f53167247438e956a9"; + sha512 = "cd2f42c3ac9daf3fa4ea83467926ba9b08f718847eb22847be933d561c485791f1befbe04600a87bf0c5bc9016864c46c85add776f5e6c0a1586437fb57a9532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lv/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lv/firefox-63.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "f75d0186d228a03137aa9174122109c42e9aee19a1ffb0e810f53b8f0af9f72d1a81ad86468db3bdcf0401ade5407764253ae1176457f1823afa8d1f2e44db11"; + sha512 = "6f1f8fc6aeb632a9b64b86c38ca38ed1baff443ca2594506e7b899c422a9bb38d02ede49bfbde255ef2ff6d0bec55d4f42d05693459b4391521a2bb5971ed6de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mai/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mai/firefox-63.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "e010c961c9e6dc4d7c8b29a2acda5aaaa7c0e4f2ef2bcbcc9b3a29e8b1a80f375c877b8f925cfe0a35e018fea2acd3acb67394547943f2dd1818a2138db7b83a"; + sha512 = "f44f549ac0119c680fcc345bcca64f5cfc6211184ba4cd02970268bcb26a9ba574fd402b4f6c0f979d0585ab53b63997adee54b3ad681637323abfeb13c5b0cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mk/firefox-63.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "91d984cab9a39cbdb9bb5a6971ed107b0de33ebec913db1c8c48c459abefaecada9267d1b7211626c4617edaf85c1f827e92e0f8fb2af42dd67a09792e4cdfff"; + sha512 = "b1b2b02937e7eb609dacc7fa5328028b91ada27ed0402354db6e9824afc6d0a51fbc54a65ef9e779ee202b6f900950393ec057c1486036a6976894f35d0a79ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ml/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ml/firefox-63.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "868cf98a5cb99e9a5879d13a7de79f62178ec8dccbe7b36ef7392f5313fc93b4252e08fa9e2926b51a1f885c86e2198712523e9d144da36d4c0e84ecb2b7a563"; + sha512 = "04446201bddec281e7f47512490aeec2f408c73f6f075a0ca354c012266bb96f5b5bd1d226e75cae470229b4b2b3ab6aa2b2fe48040a10d576f6a4647dd0ba45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mr/firefox-63.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "07e3df41fb1f8e4ae97ae02b3d559fc5e1ac133478913b0bb3767bf5f528aae34d241a1aa8b1de876d20d244afe5ce5ec88d9663bc6b4d81a6c89a72b5435a92"; + sha512 = "09099db984cc27c86a0c86a0d45edaf6e4028cb5d946fac90022e65e18736e1d048137e3728338ddcd465075ae77a863e39648c08a173da366071168aa35bff8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ms/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ms/firefox-63.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "c07bb19e1cd42a6b7125140ebba6b76801ce6120075e5dd1c93dcafa78cede7e2f905c1cafa2d16272278468019808334d6428039b94816fbefe358e5c20a54d"; + sha512 = "0bdfd73251227b87ce233bb482d2b690cf462ff0ace68533a1c69689894c109500e8fbf76e51a20ce086d59a0cdd717b0605bfdf906fb964abf9d2c2d4ec1d96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/my/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/my/firefox-63.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "3153f92490938d546c7f7b8497c08a5a71c78a847948f1853fe2faeb5c077311b8e42175f639bc27d0ea4bb72343e0a35fc2ccbd1cf04e5e556619eb11282ce3"; + sha512 = "a6c55d4c646fe6579901b29eef484c5584c4f35115d3820280ef45d5d45a2e95e6f9dd5167663df2cea9276eaa4d3bbd05cb9550cfa3e9b3d3f1741cb1e3796b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nb-NO/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nb-NO/firefox-63.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e4a63f4a19d28e248f97b4f6791873f6bdefd61f80cf8476a555864ed5ba6ff2001e69c02a2a271c8b78c28e1c78adc7c766b8e1bc2791111127eceef777c30e"; + sha512 = "934276a4b149df5d511652c8a0e159a5f9bfb1d903e09d6ea171e89463d00fab344944b90751d28f4352ec09147f6ba02fa018311e4d0bf47994f3be2ea4fe87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ne-NP/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ne-NP/firefox-63.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "abadef6736bd802c81e1a741e77291600dd7f90cd12d623a3c39392515c23191c1a3d5f1f9771b62c6d8a7add46dadf5722dc9d0dc47d8a4e15227879875c6d1"; + sha512 = "8e1cdc427310c5f8e26d321f4b741908e3413461fe7ad54b7a18ca9e3d93800fed87a907e0e4c5f689c4becdba3066ce22f03269cd668e98ed30efe577d9f3f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nl/firefox-63.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a3654dfaf19fe2a30445e9f0e8007739e446a78c3f630ec42d28d802698fb41fcfe7c8977b9d05dbbb9bf5eab264ab73b70993825f285473c941c10293df1863"; + sha512 = "de83fd739c30a7cd23eafb0ca2e0abfd55c1ba84d0fad159f99489d948205b4cf5cbc71f929b4e1ce1caa03f70b67465564986fdac1c0ab0e0a21df99849c5f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nn-NO/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nn-NO/firefox-63.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "06817e98fa2f89f7fc513f8b439ea12d2d7cce4b24384cc5c442d61b6d974261d6cca5f3ac06db267be22988a87a9e672ef948a78bfd3cf92e83a3f11620543a"; + sha512 = "588be3d59eeb3413f18b642c392af4431141597598ad8e9d9625231c0831f62b06d591a997a68711d042715f939d57ef4bb7df481f3b512dbaac0e29ad46d55b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/oc/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/oc/firefox-63.0b14.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "67b3baeaf105149491bb98f7a7e1d38a056116ad331ce56e39263172240f89a76c6a0b7e322069c9f23f11cd0486cf51d7847b70bb28801fd8abf0d669326c07"; + sha512 = "c261aaedfcb393c76ea74b0c0ad69a8df90530f9f39d49e69d6639cad3d9255090180880fc70e650b5301d7d1480517aaf630502fb6a750fe9fef23d4e25fefd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/or/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/or/firefox-63.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "447a66d8938c9fee0ff2c8c0b2e7c5539e55ee7151e46ddba3e6ba09499138e0fc1f6ae8cd954463c65a58ecdf69bc65996bad02580b16e5a5e963c6ff268f88"; + sha512 = "bf743378ace07a33ce50752ae804a4fededaef212d38d102f3374f53a7ff794a777397f50e202e952dafd04aef88b0175f34af69b1265b347aac8c48f923dc54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pa-IN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pa-IN/firefox-63.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "5f3cbd069ce774d5055b39e9a6a97fc421e47f4e49e05d0505a2386d017a76dc25d14b7bbb19a53ac4d5a5baa858257633a4d2f8c4f5f4965587da4dcc7a7c67"; + sha512 = "61dfa74084c99644a38ccbb81ee0ea634fc067a27c6ddcfccf57d9b29ddbb0315e48dd17305417ad580f3864cb3be65e57776e34b7771d21f55510104e5d58ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pl/firefox-63.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "b07d5d238eccae9447cb2fba17b4dfbf8c11e983bd57e75460d4219be2cf9883fe26efae3319491baec68539840c3bd0a707e5c7b74c3449b950b2e1e1aa7c48"; + sha512 = "43fc4a57484f67ee3e93373c0bf67a6b2c1989fd3f366d98970d68f94c1ec6514a45cab77e06c54f61a31a6ae0d629ab37157373cc56bae1752158db4e4bc648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pt-BR/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pt-BR/firefox-63.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "0ae1543d6e0b49353963a2e7ccc271ada1ab79018975895c838c83da3bccc01c9f5c420b186086eb2204dedf2cdc9a8321bc164963e6e45bf1f919b32bbc798e"; + sha512 = "303dcbe422e52be5276d98e062e4a9b46eae0ba36797f9ed1566899ef5c2dace22244b5449ceb042aaa75f72138d19e3f8c0b920541f36fd5df7aeb52d0bace5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pt-PT/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pt-PT/firefox-63.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "5100ffba1866e21c83254e8bb49ad7f18167500d03f034d2b9db298130ee8804317692a1fbf177c39f997b4c9d1fbec0112836fd1930137f740c779069050dea"; + sha512 = "75e73332122afd1e86060c57d0c0987fcebce290d0591b5661571514523d746dbfb43a55ba1ea95f66c91f3c045f7b944e14f8d65a372104a9390e334ff900cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/rm/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/rm/firefox-63.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "2c4efea31a1c091a417b35d3007db737baec62f9b19174b7f8254ac0277909f3c5751613effee4b344b3ea2da2bb04408eb337870efbcc339e44e7327a023eb2"; + sha512 = "2b6f03107cb7e1724a48854e88536809b7e235e04e7cbd7454ca8f2c952b83ed2a004e25f637f22690f4c9c73eb12fcb35980fc1e7cf4f53aaa061ff8a6066b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ro/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ro/firefox-63.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "a2db9d68c20467cae286929d168bdcf2992d95cbe8c7cd8cce792110c8fd66e0bb8d1e1f5a0d671d6de4b220afd88d326f2ca842f6ae89ba4117d8b3e30750ea"; + sha512 = "aa6e8cc7181ebfc77c5ead071871dc0fcaec2a64bdc2aed4ef22ad43ad81b18aebc4acd600aca7ac83f5acfe1fab07154a9f15bd4e189bc787935d3d0777c291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ru/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ru/firefox-63.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "01caeb7ea42435fa560866f8acbbbf1a3ef34e2a97a5616dfc0e017469b86e730076591121eb1ae4e8542a5d9dc297f1b8081e9815ca2f191245362c7bab409f"; + sha512 = "c48abdd9531a39d3f63f8db2d3bd6aaf85c0f4d22d0297aa16734eb67d81d653aa6862ec7d48557e29c768f0431fed57ed2a83577719d8411dd0410d4465d35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/si/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/si/firefox-63.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "879a4adf470d5dba2e3b99a8415aa34bd491cd7392bc138d5a98cac9cbfbc53ad23aacc947f14775cbd438f5af7a28abf2c9072847a42e53a9ad6d43a5e01082"; + sha512 = "7d2c1faf418662c762a227c04b3b23bf0e7614001c94535a8bbc75d2b95e540de8f1ed059aafc224118550fca350d459cb74d398b0cbded1aaa5a46ac6198bb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sk/firefox-63.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "52abceea5248ea7fdf70e9d7f6ffcbfe903ef09fa91458930d1fd9a39717621491b65b198fc72bb6e39d5dc189fd4a7aea59482cbfc851df76a3e53904ec784b"; + sha512 = "d63443f220ba1c099385410e458033a0132110f26b511fa1b9d5f157dede1aadbd958019cc25e47f70cd0b30f7c6f0482427a5591a8b0c714efc46851f787091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sl/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sl/firefox-63.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b6e55f76896463fb6b9e964dbac60be2dae5aa60bb59be2a22f4742249539ce35791c408e7b5258f35e9d24c1732d0a8900e8855e7866d401e636ab7c603fe77"; + sha512 = "c52dd6462fd950c0a120cdfb721234300b84812b10fde3436f35c583728e5a6d05153eb30f9bd55722b48fc047fe096f8a2e63870a33b25c67e73477355b7c40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/son/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/son/firefox-63.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "2a27edaf71212ce13e2b841db8892fbe6bab969767833475abbb1e63b075d3811e00d95f39008a1a0a198f98059d8148b78939657f7ed0837d438dcc7e9f460c"; + sha512 = "4a4a4a26e17f8d49eff0192d25afb02b11573dd4970a1b7ed6033695f4ff92ea7d0b417cbdea8e8677b8572c23d84878d52752b603ae3abec23a87436b13b9ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sq/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sq/firefox-63.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "e347bdc355e4dcfe7e2fc85d0ac6e2bdc72d51d697820b00cf5e6f30ee4a4117765430fa1f0a40ad647a87e4c9ca0721be1fa345c6c31dd9da403ac576091779"; + sha512 = "c663e5c4cabdb0328fff7847e510081c8800ea4f05228874cfc97dec3d88bdb539eb0998bd355cc5e229c8763819c3611d207c2f1dbaecb2be8d4f418f9b2f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sr/firefox-63.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b32eb6ba5290674d81893419f38279d0761d0a45a68204f3fec0625db09ae53e959c02276a852d7cbc59dc8bccef149ed024246c343836e57750ab73ed739a43"; + sha512 = "bc19998a6e0f25d9cf96b22dd4ad8d131cb230d578a46b255478d658af83fe5ed5d2199adbe8118f18059734e644fe3658313df08978c25a785c0c61087e3344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sv-SE/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sv-SE/firefox-63.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b5244288fcc8dbcbfe705e20b754214f26bc0c28b929ebfc946a5ee93230094486cb06313eb130d5782a874369b4690edb9f40ef960cdf367363db3bdac2467d"; + sha512 = "317fb7ad0a8974b691a713a37a7a4d9acb9e22a9f0d542afe64cfe9ab5ddf5f584b8607af5deefbb46d5c8fe1161124fa73f02aa8df1fb8b77080b36d5aa6393"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ta/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ta/firefox-63.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "ac680424cf44999fd33473f96a82f9ab5b05fa2ec415370694449aa5513423f4d7a416026047d04660d2273c3953c60a72e8f31120a88bcf77f9c9ddfcbfa209"; + sha512 = "8a65324441eba950e4312eb9850d0033f3c9add390804141791a2ff39c43fcc042f2fc97073ed20dcd2223e67360c7bbcceb105f8999bd79c1b857c71f3288b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/te/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/te/firefox-63.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ef821bac5631cddfa1cd5c6ecd5bc10b3e6085d94c2d2a1f86c4a557ceec8d0081c41fdd46b83bd3f03412bc9dd4ff66988ccc2a4447b134e3a7115d02714558"; + sha512 = "665a95603538b594c4fe6d7b3607a83184e69720400022605215e229b4f103766b02083499f4c0c3c0d30255f478db81c4d0bc6ed93c0991cb7ead7a102c8dd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/th/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/th/firefox-63.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ee5733a21ff7ef0d58ff1b5dd056ff2b97de2f6a90c733b3244235e9d51aa3d14cf16f2b6738d53e33ae9bf641197ef129571ee297401663286d93303e6fd6c8"; + sha512 = "ad7aa47085404415b7bf99142480c5a4d2b2688a98b2d9ba904e383da0e25138f9e8992787a4cfdbe3830ba2f7ef777676e0700d4611a6e17bf0be76c8991bed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/tr/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/tr/firefox-63.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "49ffe5b0ac9b2987d330b8c34dafa352a5c2d327cd7af652ccaadc85c45d63d5bd4222cb4fbccc513f13f2797a7525a0456f30de0603f65581001ed629e0bc8a"; + sha512 = "4c777f58eec33a68e1c10088250be80d018f54ca47d22d16db37f6e26a294e4bc7ba6551b1674468df2e8db4bc0f4c531b19efb8faa254782a2a34d606e59297"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/uk/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/uk/firefox-63.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bf6eacd5877f6d157d35f532878f6806eb2bbc6946fb3dcd79c7ca608e649da3f86428182d596242c7c57d3daeaaafdba62a4cb62bd6eb3df57f7788dbfaf0c7"; + sha512 = "bc7801da3a0d7374dcc11a44c967d8752027bf8f8c921dd6ce1c52bbd6a198ac0fcc61f7fe23985ab7088bd2b7fa4218e3ddbe0e2429a35f7492a788fe9c299e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ur/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ur/firefox-63.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "07d175fa078d9be7effc148380b737e2611c301c2af833c9b475388d2b3715a2207ed20f2d4f583a921196199e10816674428c68e7410e7e237f74243fc0641a"; + sha512 = "6e6e0d4ccab43555b769942e26f9a60509270e7f90350997237cd00d717219f41b5993dfb1b7a55ef1a0c3bf5e4dea1e25336ce604482f19d1fcdcf0a07eeca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/uz/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/uz/firefox-63.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b9a52df09d30406fc21f82e683ce8704df9ce69816f52288ce8d04f72a18842d2cec8fc560bf9fb4e18d513150a14c3b93d3fd15b3dcacfa304f4026666f2a4e"; + sha512 = "f25f9f16af30b9301319de38659f2d046c5a03d7d9c027a9aab5477d5a65fe46218721deff5d635023ba87bd4c493bdbc3002707c120e0879abe72c87a9f08fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/vi/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/vi/firefox-63.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "2f255254ce614dd77c8a5f250a83020b5649dc7f8a6b2f4007c857bf7528ee7b959425ca54b1878261cdc26ed5c51fb0539aa05551f2591909ca0728d0415bf2"; + sha512 = "8a8bb70b56db334606dba006ca4863f7c09d9ba546ceec2e5fafa5eeb6944e66e795ef4837933be871a4f5b5d63f8c2f918136667b955eeadab11163aaaab6a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/xh/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/xh/firefox-63.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "79ae1a6c8ed23b37764be436a0d6cce60c14d91bebd44c8644adf8800f894b475383132f37620893f994aa6620146f08f48d8c2721ba54ff2ddd9ce063918f63"; + sha512 = "3cbf6c26c1831f8e7926bae33c380f84f278c1717516e08bb2cac98805d5c4bfcc67d8cd37ce2116224b010d1f6198063e4741c4ad82b9526e4c042ac40b1941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/zh-CN/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/zh-CN/firefox-63.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "6f99f8239f5ed00003ce61d82e82c9df5ea6f30b68b6c5b51f26e153e3b2f5ec26c38b09e9b05bd12e9ebf9e1156d59ac102a9258017a1359cd66763945c38d8"; + sha512 = "5288f4186b731c82ce1bb3edca0321ccfbca69882f0e2fc728c7d3effed36cc4a4c01f79d51fc52be8cc1509c4d516de9d6cbfa9add416c36a6c90543fab1e67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/zh-TW/firefox-63.0b13.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/zh-TW/firefox-63.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9a61516afb0fe59775794dabfe0a9a7bae2a71472453bac321468391541d3d052817d5f7650d1b2d1a554af57434c11845d5591bc9e7e79336b8a57706aa133b"; + sha512 = "9cd0537802f9e1465a9cb55a5929757631b14c2b61b8ba701b8408a274ba35de95a7df1d1b2af22ee2a3db9ef9d106b93ee6698eb411ff67bb0f7b9a56cfd454"; } ]; } From a041dd92fe79588fca073a82ff157d52651b5365 Mon Sep 17 00:00:00 2001 From: ft Date: Sat, 13 Oct 2018 20:30:24 -0700 Subject: [PATCH 657/992] sil-fonts: added andika, charis, doulos --- maintainers/maintainer-list.nix | 5 +++++ pkgs/data/fonts/andika/default.nix | 31 ++++++++++++++++++++++++++ pkgs/data/fonts/charis-sil/default.nix | 31 ++++++++++++++++++++++++++ pkgs/data/fonts/doulos-sil/default.nix | 31 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 5 files changed, 104 insertions(+) create mode 100644 pkgs/data/fonts/andika/default.nix create mode 100644 pkgs/data/fonts/charis-sil/default.nix create mode 100644 pkgs/data/fonts/doulos-sil/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3a50eb2819b8..cfbd3784ede5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1377,6 +1377,11 @@ github = "expipiplus1"; name = "Joe Hermaszewski"; }; + f--t = { + email = "git@f-t.me"; + github = "f--t"; + name = "f--t"; + }; f-breidenstein = { email = "mail@felixbreidenstein.de"; github = "f-breidenstein"; diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix new file mode 100644 index 000000000000..4b6965563a3a --- /dev/null +++ b/pkgs/data/fonts/andika/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchzip}: + +let + version = "5.000"; +in + fetchzip rec { + name = "andika-${version}"; + + url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + ''; + + sha256 = "1jy9vpcprpd1k48p20wh6jhyn909ibia8lr5i747p41l0s8a7lqy"; + + meta = with stdenv.lib; { + homepage = https://software.sil.org/andika; + description = "A family designed especially for literacy use taking into account the needs of beginning readers"; + longDescription = '' + Andika is a sans serif, Unicode-compliant font designed especially for literacy use, taking into account the needs of beginning readers. The focus is on clear, easy-to-perceive letterforms that will not be readily confused with one another. + + A sans serif font is preferred by some literacy personnel for teaching people to read. Its forms are simpler and less cluttered than those of most serif fonts. For years, literacy workers have had to make do with fonts that were not really suitable for beginning readers and writers. In some cases, literacy specialists have had to tediously assemble letters from a variety of fonts in order to get all of the characters they need for their particular language project, resulting in confusing and unattractive publications. Andika addresses those issues. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; + } diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix new file mode 100644 index 000000000000..995e03372fb4 --- /dev/null +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchzip}: + +let + version = "5.000"; +in + fetchzip rec { + name = "charis-sil-${version}"; + + url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + ''; + + sha256 = "1a220s8n0flvcdkazqf5g10v6r55s2an308slvvarynpj6l7x27n"; + + meta = with stdenv.lib; { + homepage = https://software.sil.org/charis; + description = "A family of highly readable fonts for broad multilingual use"; + longDescription = '' + This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents. + + The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; + } diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix new file mode 100644 index 000000000000..324f6f63e556 --- /dev/null +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchzip}: + +let + version = "5.000"; +in + fetchzip rec { + name = "doulos-sil-${version}"; + + url = "https://software.sil.org/downloads/r/doulos/DoulosSIL-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + ''; + + sha256 = "04a9cr7jbw7d8llcj8xsqp9rp8w6gcgbd9sdwvi02kz7jhqa0vad"; + + meta = with stdenv.lib; { + homepage = https://software.sil.org/doulos; + description = "A font that provides complete support for the International Phonetic Alphabet"; + longDescription = '' + This Doulos SIL font is essentially the same design as the SIL Doulos font first released by SIL in 1992. The design has been changed from the original in that it has been scaled down to be a better match with contemporary digital fonts, such as Times New Roman®. This current release is a regular typeface, with no bold or italic version available or planned. It is intended for use alongside other Times-like fonts where a range of styles (italic, bold) are not needed. Therefore, just one font is included in the Doulos SIL release: Doulos SIL Regular. + + The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f5659ccb864..ea8ec731bb80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14946,6 +14946,8 @@ with pkgs; andagii = callPackage ../data/fonts/andagii { }; + andika = callPackage ../data/fonts/andika { }; + android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { }; anonymousPro = callPackage ../data/fonts/anonymous-pro { }; @@ -14978,6 +14980,8 @@ with pkgs; carlito = callPackage ../data/fonts/carlito {}; + charis-sil = callPackage ../data/fonts/charis-sil { }; + comfortaa = callPackage ../data/fonts/comfortaa {}; comic-neue = callPackage ../data/fonts/comic-neue { }; @@ -15036,6 +15040,8 @@ with pkgs; documentation-highlighter = callPackage ../misc/documentation-highlighter { }; + doulos-sil = callPackage ../data/fonts/doulos-sil { }; + cabin = callPackage ../data/fonts/cabin { }; camingo-code = callPackage ../data/fonts/camingo-code { }; From b524b7d087a6533bf6f9399611ba5622d3f431a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 21:34:47 -0700 Subject: [PATCH 658/992] postgis: 2.4.5 -> 2.5.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/postgis/versions --- pkgs/development/libraries/postgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 0da66acbde2a..04fdeea1fa0b 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -42,8 +42,8 @@ let - version = "2.4.5"; - sha256 = "0saxj3w7j9yb9sa1ig3ccxvh2pk0bj47hp7m6199p1a1fpfjgrrg"; + version = "2.5.0"; + sha256 = "1m9n1shhqhjrhbq6fd9fyfccxcgpng37s3lffhlmyrp98zbsnwxy"; in stdenv.mkDerivation rec { name = "postgis-${version}"; From 170c6104b66c8f5a12314ee96121876862182901 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 21:36:56 -0700 Subject: [PATCH 659/992] pg_cron: 1.0.2 -> 1.1.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pg_cron/versions --- pkgs/servers/sql/postgresql/pg_cron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/pg_cron/default.nix b/pkgs/servers/sql/postgresql/pg_cron/default.nix index c5a7a40546ef..959c2c382524 100644 --- a/pkgs/servers/sql/postgresql/pg_cron/default.nix +++ b/pkgs/servers/sql/postgresql/pg_cron/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "pg_cron-${version}"; - version = "1.0.2"; + version = "1.1.2"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "pg_cron"; rev = "refs/tags/v${version}"; - sha256 = "0z743bbal9j0pvqskznfj0zvjsqvdl7p90d4fdrl0sc0crc3nvyx"; + sha256 = "0n74dx1wkg9qxvjhnx03028465ap3p97v2kzqww833dws1wqk5m1"; }; installPhase = '' From d2e1dd7fc715c675f2ba774a5b6174860d2a2b41 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sun, 14 Oct 2018 06:46:36 +0200 Subject: [PATCH 660/992] nixos/modules: services.syncthing use types.str instead of types.string As Infinisil mentioned in https://github.com/NixOS/nixpkgs/pull/48119#discussion_r224974201 --- nixos/modules/services/networking/syncthing.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index cf21aa9eb70f..fd31b2a67687 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -17,7 +17,7 @@ in { ''; guiAddress = mkOption { - type = types.string; + type = types.str; default = "127.0.0.1:8384"; description = '' Address to serve the GUI. @@ -31,7 +31,7 @@ in { }; user = mkOption { - type = types.string; + type = types.str; default = defaultUser; description = '' Syncthing will be run under this user (user will be created if it doesn't exist. @@ -40,7 +40,7 @@ in { }; group = mkOption { - type = types.string; + type = types.str; default = "nogroup"; description = '' Syncthing will be run under this group (group will not be created if it doesn't exist. @@ -49,7 +49,7 @@ in { }; all_proxy = mkOption { - type = types.nullOr types.string; + type = with types; nullOr str; default = null; example = "socks5://address.com:1234"; description = '' From 411044a934a9eb284b0a61b6eb873de6f2480ead Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 14 Oct 2018 13:30:48 +0800 Subject: [PATCH 661/992] go-ethereum: 1.8.13 -> 1.8.17 --- pkgs/applications/altcoins/default.nix | 1 - pkgs/applications/altcoins/go-ethereum.nix | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index e0a0dbef632c..87f5d0be68a3 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -53,7 +53,6 @@ rec { freicoin = callPackage ./freicoin.nix { boost = boost155; }; go-ethereum = callPackage ./go-ethereum.nix { - buildGoPackage = buildGo110Package; inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; }; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 02e0412449a0..156cbc01a29b 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.13"; + version = "1.8.17"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "123jkyb293z7ww3sa9ji5rw7xd229isi03k4ayyh5p7rr0dg8al0"; + sha256 = "0vm526gbyi8bygqwwki9hx7gf5g3xk2s1biyvwjidrydzj9i46zd"; }; meta = with stdenv.lib; { From 2e94003c9cdb294ab5f24b84139337efeb74a2e0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 14 Oct 2018 13:58:02 +0800 Subject: [PATCH 662/992] nodejs-8_x: 8.11.4 -> 8.12.0 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index c5f899f9bb42..4e6ba7945ec5 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "8.11.4"; - sha256 = "02d6a9sq81mbvap6h1ckwrang6wrxbkg0xxzn06wn2vbv7k7vkpv"; + version = "8.12.0"; + sha256 = "16j1rrxkhmvpcw689ndw1raql1gz4jqn7n82z55zn63c05cgz7as"; } From caa6ab00485a8d49e221c2872bbb2a79daee0d6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 20:48:13 -0700 Subject: [PATCH 663/992] qutebrowser: 1.4.2 -> 1.5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qutebrowser/versions --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index b71eea791550..bf3debf6c7b8 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -28,12 +28,12 @@ let in python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.4.2"; + version = "1.5.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1pnj47mllg1x34qakxs7s59x8mj262nfhdxgihsb2h2ywjq4fpgx"; + sha256 = "1yn181gscj04ni58swk6cmggn047q29siqwgn66pvxhfdf0ny7fq"; }; # Needs tox From 9af40cfa17b50ade505d6b30269d7f91dbbc6486 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 21:42:45 -0700 Subject: [PATCH 664/992] pipenv: 2018.7.1 -> 2018.10.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pipenv/versions --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 297d2c3c6667..1d23f5426a55 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -2,11 +2,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "pipenv"; - version = "2018.7.1"; + version = "2018.10.9"; src = fetchPypi { inherit pname version; - sha256 = "0fpnfxdkymz9an3m6isq5g24ykd6hnkjc8llfnvbmnakz1sd0sxv"; + sha256 = "0b0safavjxq6malmv44acmgds21m2sp1wqa7gs0qz621v6gcgq4j"; }; LC_ALL = "en_US.UTF-8"; From 0c667e8ba7f9393a87cf696489803458c81a6531 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 21:10:13 -0700 Subject: [PATCH 665/992] khal: 0.9.9 -> 0.9.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/khal/versions --- pkgs/applications/misc/khal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index f9c929c21bfb..b94d067dd18d 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -18,11 +18,11 @@ let in with python.pkgs; buildPythonApplication rec { pname = "khal"; - version = "0.9.9"; + version = "0.9.10"; src = fetchPypi { inherit pname version; - sha256 = "0dq9aqb9pqjfqrnfg43mhpb7m0szmychxy1ydb3lwzf3500c9rsh"; + sha256 = "03h0j0d3xyqh98x5v2gv63wv3g91hip3vsaxvybsn5iz331d23h4"; }; LC_ALL = "en_US.UTF-8"; From 820e2fd72f434ed094debb2be9cd9990af5d336c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 20:03:47 -0700 Subject: [PATCH 666/992] shotcut: 18.09.16 -> 18.10.08 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shotcut/versions --- pkgs/applications/video/shotcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index a92cb5eb1e14..0c9d9757584e 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.09.16"; + version = "18.10.08"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "0mv28v9c45gvf1jizb7zwmhcckpy7mznpai1zncc5gb5p7kqf56y"; + sha256 = "1s2zic675f7rx61j839fn86bwckb4823j9krv1q7z4hsvbpiyj08"; }; enableParallelBuilding = true; From 72283489f2841cfd5c4a14f040ffdb8152c1e521 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 19:46:59 -0700 Subject: [PATCH 667/992] sigal: 1.4.0 -> 1.4.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sigal/versions --- pkgs/applications/misc/sigal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 936b1a389f1e..e57e9394c105 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonApplication, fetchPypi, pythonPackages, ffmpeg }: buildPythonApplication rec { - version = "1.4.0"; + version = "1.4.1"; pname = "sigal"; src = fetchPypi { inherit version pname; - sha256 = "0da0n8jhjp2swr18zga87xc77r8c7qwqf5sp222ph9sn3yyyc35i"; + sha256 = "1fg32ii26j3xpq3cryi212lx9z33qnicm1cszwv1wfpg6sr2rr61"; }; buildInputs = with pythonPackages; [ pytest ]; From 29eab7234e41a35f7ea4f27719c7254ea5c35a87 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 19:39:55 -0700 Subject: [PATCH 668/992] sonarr: 2.0.0.5228 -> 2.0.0.5252 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sonarr/versions --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 6e78a84b4c7d..1b4bad093c49 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.5228"; + version = "2.0.0.5252"; src = fetchurl { url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "0nys6livqzdn19f9qazs6w9mz35d1wj2f2fgcrccshrbwafrxdw1"; + sha256 = "0rs6sw2yjnhv3v3qbnalz445cilppw91zxxkj93dbp5vdlinw3fp"; }; buildInputs = [ From c5e2470b2ea6145ee13e75a841520bf27659a134 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 19:23:17 -0700 Subject: [PATCH 669/992] subversionClient: 1.10.2 -> 1.10.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/subversion-client/versions --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 0a61dc38c64a..2a77e1395b46 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -121,8 +121,8 @@ in { }; subversion_1_10 = common { - version = "1.10.2"; - sha256 = "127dysfc31q4dhbbxaznh9kqixy9jd44kgwji2gdwj6rb2lf6dav"; + version = "1.10.3"; + sha256 = "1z6r3n91a4znsh68rl3jisfr7k4faymhbpalmmvsmvsap34al3cz"; extraBuildInputs = [ lz4 utf8proc ]; }; } From 91638e161edf0fc83a0038cd210d61e9235789bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 19:11:12 -0700 Subject: [PATCH 670/992] remmina: 1.2.31.4 -> 1.2.32 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/remmina/versions --- pkgs/applications/networking/remote/remmina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index fb138a1e8d45..96aa037d35bf 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.2.31.4"; + version = "1.2.32"; desktopItem = makeDesktopItem { name = "remmina"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "1jx704f5zjns3nqy0ffgyfaxfxcxp83mfm5k539xfnqjn5g5h1qr"; + sha256 = "15szv1xs6drxq6qyksmxcfdz516ja4zm52r4yf6hwij3fgl8qdpw"; }; nativeBuildInputs = [ pkgconfig ]; From d074fb1940c623a44162002dfe3b3aa8c7c926ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 18:06:03 -0700 Subject: [PATCH 671/992] verilator: 4.002 -> 4.004 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/verilator/versions --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 986c4a1f32a1..dd31f28db313 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "4.002"; + version = "4.004"; src = fetchurl { url = "https://www.veripool.org/ftp/${name}.tgz"; - sha256 = "10g1814kq07a2818p0lmvacy1a6shbc0k6z16wdgas4h5x1n4f43"; + sha256 = "1nkdmz4bm1v2xarajf2g3z5vb2611a4fkvpgjxac4xrja5r8wpwk"; }; enableParallelBuilding = true; From 77d29e5f06665a9c558884af7da95ed55aa4561f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 16:43:33 -0700 Subject: [PATCH 672/992] wireshark: 2.6.3 -> 2.6.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireshark-qt/versions --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index f145d55daf38..753defb0b4f0 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.6.3"; + version = "2.6.4"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1v538h02y8avwy3cr11xz6wkyf9xd8qva4ng4sl9f2fw4skahn6i"; + sha256 = "0qf81dk726sdsmjqa9nd251j1cwvzkyb4hrlp6w4iwa3cdz00sx0"; }; cmakeFlags = [ From 43b61d8474c842f2c367ce43b472be5808e7ea28 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 16:15:40 -0700 Subject: [PATCH 673/992] woeusb: 3.2.9 -> 3.2.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/woeusb/versions --- pkgs/tools/misc/woeusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 0f0455fe0fe3..5232088ab1b1 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.2.9"; + version = "3.2.10"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "1h2msp45slcd2s5jgw7ma9r7pl7schrvifw3kp53skxfpyax4j35"; + sha256 = "0jzgwh9xv92yns5yi5zpl49zbp3csh6m6iclgq070awpjpsqlqi0"; }; buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; From 6d74aaf76e46c7b4b0a1e208257e3384cc2d9893 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 16:06:21 -0700 Subject: [PATCH 674/992] xdg-desktop-portal: 1.0.2 -> 1.0.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xdg-desktop-portal/versions --- pkgs/development/libraries/xdg-desktop-portal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 171ef68cf569..9cdada9bf3b2 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }: let - version = "1.0.2"; + version = "1.0.3"; in stdenv.mkDerivation rec { name = "xdg-desktop-portal-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "flatpak"; repo = "xdg-desktop-portal"; rev = version; - sha256 = "1vl0150gz20x106di9yfa6l3zjw0nd2lr44rkq2147n2a254p79p"; + sha256 = "113k5sr4l58rm8sgp4qbjrhyjg37c5ad54i58njsm98knb5r2ppv"; }; patches = [ From 2bd753b98c796f6b22df4a95ac837996aa801af4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 15:57:37 -0700 Subject: [PATCH 675/992] workrave: 1.10.21 -> 1.10.23 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/workrave/versions --- pkgs/applications/misc/workrave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 4a16793b1c65..f20ef722a8c8 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "workrave-${version}"; - version = "1.10.21"; + version = "1.10.23"; src = let in fetchFromGitHub { - sha256 = "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia"; + sha256 = "1qhlwfhwk5agv4904d6bsf83k9k89q7bms6agg967vsca4905vcw"; rev = with stdenv.lib; "v" + concatStringsSep "_" (splitString "." version); repo = "workrave"; From 4ca9524e987d2396c9a7aa4b44c205c7346bd2a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 18:36:35 -0700 Subject: [PATCH 676/992] spectre-meltdown-checker: 0.39 -> 0.40 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/spectre-meltdown-checker/versions --- pkgs/tools/security/spectre-meltdown-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index c406316940e4..256423892c48 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.39"; + version = "0.40"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "1llp6iyvbykn9w7vnz1jklmy6gmbksk234b46mzjfvg7mvg91dc5"; + sha256 = "0lhykc2andl0611bbs9b5dzp7c753crppvir2i7aw6bgwis23gjs"; }; prePatch = '' From f02d1e6064807c16201318aa5a399c98f4fca33b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Oct 2018 17:43:39 -0700 Subject: [PATCH 677/992] tvheadend: 4.2.6 -> 4.2.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/tvheadend/versions --- pkgs/servers/tvheadend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index c0a3b5a28c31..674d96e54622 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -3,7 +3,7 @@ , which, zlib }: let - version = "4.2.6"; + version = "4.2.7"; in stdenv.mkDerivation rec { name = "tvheadend-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = "tvheadend"; repo = "tvheadend"; rev = "v${version}"; - sha256 = "0rnhk0r34mfmz3cnf735nzkkyal7pnv16hfyrs0g4v5rk99rlab3"; + sha256 = "09q6lddkld22z9nbxx5v3v3z5yvcnl4lgjirvrdprwkv67fld70g"; }; buildInputs = [ From cb4e4dca01d7abe7e6593b65304b0b7b88a7d5e3 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:30:46 +0200 Subject: [PATCH 678/992] libwacom: add license and website metadata --- pkgs/development/libraries/libwacom/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index cc3f19ab7d31..67563e41d01f 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = https://sourceforge.net/projects/linuxwacom/; + homepage = https://linuxwacom.github.io/; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; + license = licenses.mit; }; } From 4b2bff8164d45024d7b51c6d194aa1bcafbb222b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 03:05:02 -0700 Subject: [PATCH 679/992] osinfo-db: 20180920 -> 20181011 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/osinfo-db/versions --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 0a5f7b313065..94e3218ad35e 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180920"; + name = "osinfo-db-20181011"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "19jbzf1g523bkckli043q21hgbfv0043b5ib4zjiz8x98h7ngiac"; + sha256 = "1f0xa50xn15p3zig9031icqky8drf0654sbjmmziw2ijcdyzfkcp"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; From 6d189bc97d8a76640b52d70aee1d781b67f2bbb0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 03:22:25 -0700 Subject: [PATCH 680/992] neo4j: 3.4.7 -> 3.4.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neo4j/versions --- pkgs/servers/nosql/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 1fba6571e281..9365612c14ed 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.4.7"; + version = "3.4.8"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "0jgk7kvsalpmawdds0ln76ma7qbdxwgh004lkalicciiljkyv8pj"; + sha256 = "1mdxqfy5xzc6944lg87975i9bfpqqx28xl8h70m4wn79x0qgby2v"; }; buildInputs = [ makeWrapper jre8 which gawk ]; From fbcb547a902acb5f4b4b7dbb2113082b48b780e8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 14 Sep 2018 16:04:59 -0400 Subject: [PATCH 681/992] pythonPackages.python-json-logger: init at 0.1.9 --- .../python-json-logger/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/python-json-logger/default.nix diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix new file mode 100644 index 000000000000..312b6a106e6a --- /dev/null +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + version = "0.1.9"; + pname = "python-json-logger"; + + src = fetchPypi { + inherit pname version; + sha256 = "e3636824d35ba6a15fc39f573588cba63cf46322a5dc86fb2f280229077e9fbe"; + }; + + checkInputs = [ nose ]; + + meta = with stdenv.lib; { + homepage = http://github.com/madzak/python-json-logger; + description = "A python library adding a json log formatter"; + license = licenses.bsdOriginal; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb032f3634f3..4398d1c6e998 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1659,6 +1659,8 @@ in { python-jose = callPackage ../development/python-modules/python-jose {}; + python-json-logger = callPackage ../development/python-modules/python-json-logger { }; + python-ly = callPackage ../development/python-modules/python-ly {}; pyhepmc = buildPythonPackage rec { From e21f98dfd84cc8077241bb7f450bd09d66ecd414 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 14 Sep 2018 16:05:48 -0400 Subject: [PATCH 682/992] pythonPackages.jupyter-repo2docker: init at 0.6.0 --- .../jupyter-repo2docker/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/jupyter-repo2docker/default.nix diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix new file mode 100644 index 000000000000..0413a5badba8 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkgs-docker +, docker +, traitlets +, python-json-logger +, escapism +, jinja2 +, ruamel_yaml +, pyyaml +, pytest +, wheel +, pytestcov +, pythonAtLeast +}: + +buildPythonPackage rec { + version = "0.6.0"; + pname = "jupyter-repo2docker"; + disabled = !(pythonAtLeast "3.4"); + + src = fetchPypi { + inherit pname version; + sha256 = "32c6dc6fd2402d6f5a955f8ab59299097bb5f4972c7dcc6fe2a8fe4c96dcab27"; + }; + + checkInputs = [ pytest pyyaml wheel pytestcov ]; + propagatedBuildInputs = [ pkgs-docker docker traitlets python-json-logger escapism jinja2 ruamel_yaml ]; + + # tests not packaged with pypi release + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://repo2docker.readthedocs.io/en/latest/; + description = "Repo2docker: Turn code repositories into Jupyter enabled Docker Images"; + license = licenses.bsdOriginal; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4398d1c6e998..ea4f901b8516 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6320,6 +6320,10 @@ in { jupyter_core = callPackage ../development/python-modules/jupyter_core { }; + jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { + pkgs-docker = pkgs.docker; + }; + jupyterhub = callPackage ../development/python-modules/jupyterhub { }; jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; From 34e8009dcb9ca473ce98386697eefd539ac5eb19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 03:46:48 -0700 Subject: [PATCH 683/992] riot-web: 0.16.2 -> 0.16.5 --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 14cfb37197e1..70d272187837 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.16.2"; + version = "0.16.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "14k8hsz2i1nd126jprvi45spdxawk4c8nb3flkrg7rmjdp5sski2"; + sha256 = "1b82d82pfv4kjdxghc8y78zwmnc89hi7arvql2bx0zyfhzxj6drl"; }; installPhase = '' From 6d3b54a1e99ff7283f003d1736b0f258d9307a15 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Sat, 13 Oct 2018 14:03:08 +0200 Subject: [PATCH 684/992] nextcloud: 14.0.1 -> 14.0.3 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3b5e46cdb2a8..3f6fed1e0a03 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "14.0.1"; + version = "14.0.3"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "14ymc6fr91735yyc2gqh7c89mbbwsgamhhysf6crp9kp27l83z5a"; + sha256 = "1vykmvkqds1mjz9hl0xapi70s5s66xd8ysw0sczgavir7092gl6p"; }; patches = [ (fetchpatch { From 097966bc25517f2c59714efea0567c109329a71e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 03:50:55 -0700 Subject: [PATCH 685/992] ne: 3.1.1 -> 3.1.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ne/versions --- pkgs/applications/editors/ne/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index a24fb90ed9c7..9bc6425bc411 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "ne-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "vigna"; repo = "ne"; rev = version; - sha256 = "1i4vk5r2wn4cd6sgsidzqs9s3bmb4j9cn4392izkidi0j9mm3hvg"; + sha256 = "154grh9gdzydnqn9xxj7zpia9cc5x6a7y1g73vwizr9bkg92l5cc"; }; buildInputs = [ ncurses texlive.combined.scheme-medium texinfo perl ghostscript ]; dontBuild = true; From 691eaabff7a708e02e972cd31459bb4fbcd9441e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 04:14:46 -0700 Subject: [PATCH 686/992] nlohmann_json: 3.2.0 -> 3.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nlohmann_json/versions --- pkgs/development/libraries/nlohmann_json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 15bdbb1b48e8..ffb735e725ae 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "0585r6ai9x1bhspffn5w5620wxfl1q1gj476brsnaf7wwnr60hwk"; + sha256 = "1plg9l1avnjsg6khrd88yj9cbzbbkwzpc5synmicqndb35wndn5h"; }; nativeBuildInputs = [ cmake ]; From 487e8dab8fd6b2becd0df9fbc86a5b4016bb1fb1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 04:31:34 -0700 Subject: [PATCH 687/992] metabase: 0.30.3 -> 0.30.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/metabase/versions --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 2e1cba52ee54..0f2f291318c7 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.30.3"; + version = "0.30.4"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1w8886xkg88r8dla4l9kpxw2rwwjx23y1dk5rgfgh1vcw8da8cn4"; + sha256 = "0mvyl5v798qwdydqsjjq94ihfwi62kq4gprxjg3rcckmjdyx2ycs"; }; nativeBuildInputs = [ makeWrapper ]; From df6ec1aa6d742303a1b2bbd932b03635e75cbcf2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 04:44:09 -0700 Subject: [PATCH 688/992] mopidy-iris: 3.26.2 -> 3.27.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mopidy-iris/versions --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index be44112d82a8..546a47118a03 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.26.2"; + version = "3.27.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "04jg5k8znkn0iirfnsndm74f8mypj8zwj76j489l0m263k1kn715"; + sha256 = "00qlvfwfn7kybrx6rlj5h862syw3d5yak4sjqpxvacp7i5n1arsk"; }; propagatedBuildInputs = [ From 9cd21807c8b6261c0e4d32c8d430bd18e54fde0d Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Sun, 7 Oct 2018 16:32:08 +0100 Subject: [PATCH 689/992] nixos/profile-sync-daemon: add missing path to systemd service --- nixos/modules/services/desktops/profile-sync-daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix index 4165bb64fe46..e4e47cfbd438 100644 --- a/nixos/modules/services/desktops/profile-sync-daemon.nix +++ b/nixos/modules/services/desktops/profile-sync-daemon.nix @@ -36,7 +36,7 @@ in { description = "Profile Sync daemon"; wants = [ "psd-resync.service" "local-fs.target" ]; wantedBy = [ "default.target" ]; - path = with pkgs; [ rsync kmod gawk nettools profile-sync-daemon ]; + path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ]; unitConfig = { RequiresMountsFor = [ "/home/" ]; }; @@ -55,7 +55,7 @@ in { wants = [ "psd-resync.timer" ]; partOf = [ "psd.service" ]; wantedBy = [ "default.target" ]; - path = with pkgs; [ rsync kmod gawk nettools profile-sync-daemon ]; + path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ]; serviceConfig = { Type = "oneshot"; ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync"; From 4cb7173651ceddc8c6f1a6dc448cd0de1e16a1f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 05:09:52 -0700 Subject: [PATCH 690/992] mailman: 2.1.24 -> 2.1.29 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mailman/versions --- pkgs/servers/mail/mailman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index a38c0b277dae..87e0d219c9c6 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mailman-${version}"; - version = "2.1.24"; + version = "2.1.29"; src = fetchurl { url = "mirror://gnu/mailman/${name}.tgz"; - sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7"; + sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243"; }; buildInputs = [ python2 python2.pkgs.dnspython ]; From a25e765dc90a6896f33f1fdfe0fe535006c468f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 11 Oct 2018 14:18:13 +0100 Subject: [PATCH 691/992] rambox: 0.5.17 -> 0.6.1 --- .../networking/instant-messengers/rambox/bare.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 334c50814d78..2a80349c4e62 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "rambox-bare-${version}"; - version = "0.5.17"; + version = "0.6.1"; src = fetchFromGitHub { owner = "saenzramiro"; repo = "rambox"; rev = version; - sha256 = "18adga0symhb825db80l4c7kjl3lzzh54p1qibqsfa087rjxx9ay"; + sha256 = "1cyxxgcv0qvm1la8yl5ag3j11spw7zvnj75zpf9c1y33pqmp44yc"; }; nativeBuildInputs = [ nodejs-8_x ruby sencha ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit src; nodejs = nodejs-8_x; - sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k"; + sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr"; }; patches = [ ./isDev.patch ]; From 8cdf5ae36cc5087c6282ceb1feb3bb1359cd4967 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 05:39:30 -0700 Subject: [PATCH 692/992] mapnik: 3.0.20 -> 3.0.21 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mapnik/versions --- pkgs/development/libraries/mapnik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index ebae2a6c3be0..693260af1c76 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { name = "mapnik-${version}"; - version = "3.0.20"; + version = "3.0.21"; src = fetchzip { # this one contains all git submodules and is cheaper than fetchgit url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2"; - sha256 = "05a2hvvk5s4x3wjvh4spd717vd5ri7h0sql7aarpi9jpc5h6xicc"; + sha256 = "0cq2gbmf1sssg72sq4b5s3x1z6wvl1pzxliymm06flw5bpim5as2"; }; # a distinct dev output makes python-mapnik fail From 1b4e48ab2b905eb6b9f34118023ee5847cb6d38d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 14 Oct 2018 14:41:40 +0200 Subject: [PATCH 693/992] clisp: Mark as broken for aarch64 --- pkgs/development/interpreters/clisp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 0a54a916ba73..e6112c5a3343 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -96,7 +96,8 @@ stdenv.mkDerivation rec { description = "ANSI Common Lisp Implementation"; homepage = http://clisp.cons.org; maintainers = with stdenv.lib.maintainers; [raskin tohl]; + platforms = stdenv.lib.platforms.unix; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 - platforms = stdenv.lib.platforms.linux; + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; }; } From ce783564f1311575122ee2171ded889d5e345a43 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 05:42:57 -0700 Subject: [PATCH 694/992] memcached: 1.5.10 -> 1.5.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/memcached/versions --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 9790df9ce765..dc66c710a5d4 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.10"; + version = "1.5.11"; name = "memcached-${version}"; src = fetchurl { url = "https://memcached.org/files/${name}.tar.gz"; - sha256 = "0jqw3z0408yx0lzc6ykn4d29n02dk31kqnmq9b3ldmcnpl6hck29"; + sha256 = "0ajql8qs3w1lpw41vxkq2xabkxmmdk2nwg3i4lkclraq8pw92yk9"; }; buildInputs = [cyrus_sasl libevent]; From 0d44bb4f12a6a43dda608b5583c944dc020b565c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 05:57:20 -0700 Subject: [PATCH 695/992] libtorrentRasterbar: 1.1.9 -> 1.1.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libtorrent-rasterbar/versions --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index f19e9d274313..6b5182fa992f 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.1.9"; + version = "1.1.10"; formattedVersion = lib.replaceChars ["."] ["_"] version; # Make sure we override python, so the correct version is chosen @@ -17,7 +17,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "libtorrent-${formattedVersion}"; - sha256 = "04w3pjzd6q9wplj1dcphylxn1i2b2x0iw1l0ma58ymh14swdah7a"; + sha256 = "0qj1rz52jk95m43cr7l3fi9jmf4pwxncp5mq4hi2vzacfnf79yms"; }; enableParallelBuilding = true; From e47a7f89daa1f2843742abc7fbed420b5bc237a8 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 13:04:55 -0400 Subject: [PATCH 696/992] pythonPackages.dopy: refactor move to python-modules --- .../python-modules/dopy/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 +--------------- 2 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/dopy/default.nix diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix new file mode 100644 index 000000000000..beaca0757507 --- /dev/null +++ b/pkgs/development/python-modules/dopy/default.nix @@ -0,0 +1,26 @@ +{ pkgs +, buildPythonPackage +, requests +, six +}: + +buildPythonPackage rec { + version = "2016-01-04"; + pname = "dopy"; + + src = pkgs.fetchFromGitHub { + owner = "Wiredcraft"; + repo = "dopy"; + rev = "cb443214166a4e91b17c925f40009ac883336dc3"; + sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; + }; + + propagatedBuildInputs = [ requests six ]; + + meta = with pkgs.lib; { + description = "Digital Ocean API python wrapper"; + homepage = "https://github.com/Wiredcraft/dopy"; + license = licenses.mit; + maintainers = with maintainers; [ lihop ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7445c6d8bb..4bdf74214f84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2136,27 +2136,7 @@ in { dogpile_core = callPackage ../development/python-modules/dogpile.core { }; - dopy = buildPythonPackage rec { - version = "2016-01-04"; - name = "dopy-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "Wiredcraft"; - repo = "dopy"; - rev = "cb443214166a4e91b17c925f40009ac883336dc3"; - sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56"; - }; - - propagatedBuildInputs = with self; [ requests six ]; - - meta = { - description = "Digital Ocean API python wrapper"; - homepage = "https://github.com/Wiredcraft/dopy"; - license = licenses.mit; - maintainers = with maintainers; [ lihop ]; - platforms = platforms.all; - }; - }; + dopy = callPackage ../development/python-modules/dopy { }; dpkt = callPackage ../development/python-modules/dpkt {}; From 31a4e4f11b7dd906f0040301480962910d576da1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 06:14:22 -0700 Subject: [PATCH 697/992] libgit2_0_27: 0.27.4 -> 0.27.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libgit2/versions --- pkgs/development/libraries/git2/0.27.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/git2/0.27.nix b/pkgs/development/libraries/git2/0.27.nix index bafd6be37df6..db627449e1ba 100644 --- a/pkgs/development/libraries/git2/0.27.nix +++ b/pkgs/development/libraries/git2/0.27.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.27.4"; + version = "0.27.5"; name = "libgit2-${version}"; src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "1cmc8ldhpyp62pswb7dmjjya3ng0ssaggcsxs1labvp6xyxjvp6s"; + sha256 = "1f6jxgw4pf6jln439v1pj8a0kgym5sq5xry8x0gq18dr5gv3wims"; }; cmakeFlags = [ "-DTHREADSAFE=ON" ]; From fd6d6d987094597fc7ede6fbc67a90c220dfa76c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 14 Oct 2018 15:18:48 +0200 Subject: [PATCH 698/992] tribler: Fix startup The python component of libtorrentRasterbar seems to now be in pythonPackages --- pkgs/applications/networking/p2p/tribler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 1169dba188cd..77ca7afe871e 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, libtorrentRasterbar, imagemagick +{ stdenv, fetchurl, pythonPackages, makeWrapper, imagemagick , enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; pythonPath = [ - libtorrentRasterbar + pythonPackages.libtorrentRasterbar pythonPackages.apsw pythonPackages.twisted pythonPackages.netifaces From 323faf056552c86dae504ba4a3cd49d4e1db0530 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 06:20:40 -0700 Subject: [PATCH 699/992] leatherman: 1.5.0 -> 1.5.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/leatherman/versions --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index b01d902fd91a..259975815d8e 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { - sha256 = "1plx111mfci8z33mwy56y54n597gi8965s7bmnribkk8bvdn10dy"; + sha256 = "0drn8wdl4mwqz84lwc7cjmc6pxj2jwpx7n2dxwzwj43ps624zhbj"; rev = version; repo = "leatherman"; owner = "puppetlabs"; From 9f8b40c2de7f6cf5f2f1456645386b5f926de5ee Mon Sep 17 00:00:00 2001 From: Limbo Peng Date: Sun, 14 Oct 2018 21:20:42 +0800 Subject: [PATCH 700/992] httping: add libintl to buildInputs on Darwin (#48188) * httping: add libintl to buildInputs on Darwin Otherwise it won't compile. * httping: fix URLs --- pkgs/tools/networking/httping/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index bfe9f115133c..abde3f2a380d 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, ncurses, openssl +{ stdenv, fetchurl, gettext, libintl, ncurses, openssl , fftw ? null }: stdenv.mkDerivation rec { @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { version = "2.5"; src = fetchurl { - url = "https://www.vanheusden.com/httping/${name}.tgz"; + url = "https://vanheusden.com/httping/${name}.tgz"; sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"; }; - buildInputs = [ fftw ncurses openssl ]; + buildInputs = [ fftw libintl ncurses openssl ]; nativeBuildInputs = [ gettext ]; makeFlags = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.vanheusden.com/httping; + homepage = https://vanheusden.com/httping; description = "ping with HTTP requests"; longDescription = '' Give httping an url, and it'll show you how long it takes to connect, @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { ''; license = licenses.agpl3; maintainers = with maintainers; [ rickynils ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 605821e1b2fac0ce7dca5ac5decb59418a491eab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 06:24:22 -0700 Subject: [PATCH 701/992] libpqxx: 6.2.4 -> 6.2.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libpqxx/versions --- pkgs/development/libraries/libpqxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 5afed2b2a2f5..fbee81ab677a 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libpqxx-${version}"; - version = "6.2.4"; + version = "6.2.5"; src = fetchFromGitHub { owner = "jtv"; repo = "libpqxx"; rev = version; - sha256 = "18fkyfa3a917ljmarf3jy8ycdhqzpc47cj87542sjpxnpaj9hy59"; + sha256 = "15x9xlj2v66w81j90cb438qkrrcqaq4dqrvhllwyqfz4lprqnhh9"; }; nativeBuildInputs = [ gnused python2 ]; From 3287e88cf0fa4896e2d0a527a3a993c458acc536 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 15:00:37 -0400 Subject: [PATCH 702/992] pythonPackages.backports_os: init at 0.1.1 --- .../python-modules/backports_os/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/backports_os/default.nix diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix new file mode 100644 index 000000000000..9d0ddc2cad9a --- /dev/null +++ b/pkgs/development/python-modules/backports_os/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools_scm +, future +, isPy3k +, python +, hypothesis +}: + +buildPythonPackage rec { + version = "0.1.1"; + pname = "backports.os"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "b472c4933094306ca08ec90b2a8cbb50c34f1fb2767775169a1c1650b7b74630"; + }; + + buildInputs = [ setuptools_scm ]; + checkInputs = [ hypothesis ]; + propagatedBuildInputs = [ future ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover tests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pjdelport/backports.os; + description = "Backport of new features in Python's os module"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7445c6d8bb..32b9daa45e54 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -995,6 +995,8 @@ in { backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; + backports_os = callPackage ../development/python-modules/backports_os { }; + backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else From 77c1ca887bcb419c341b2e7e6a6d6ab7374a0621 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 15:01:14 -0400 Subject: [PATCH 703/992] pythonPackages.pyftpdlib: init at 1.5.4 --- .../python-modules/pyftpdlib/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pyftpdlib/default.nix diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix new file mode 100644 index 000000000000..b8f483d3a1dc --- /dev/null +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, mock +, psutil +, pyopenssl +, pysendfile +, python +}: + +buildPythonPackage rec { + version = "1.5.4"; + pname = "pyftpdlib"; + + src = fetchPypi { + inherit pname version; + sha256 = "e5fca613978743d41c3bfc68e25a811d646a3b8a9eee9eb07021daca89646a0f"; + }; + + checkInputs = [ mock psutil ]; + propagatedBuildInputs = [ pyopenssl pysendfile ]; + + checkPhase = '' + ${python.interpreter} pyftpdlib/test/runner.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/giampaolo/pyftpdlib/; + description = "Very fast asynchronous FTP server library"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32b9daa45e54..2bde64c14866 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3857,6 +3857,8 @@ in { pydotplus = callPackage ../development/python-modules/pydotplus { }; + pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; + pyfxa = callPackage ../development/python-modules/pyfxa { }; pyhomematic = callPackage ../development/python-modules/pyhomematic { }; From 7f613c8d4992b980a97c8d06aa550e09ebc7dbd1 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 15:01:40 -0400 Subject: [PATCH 704/992] pythonPackages.fs: 0.5.4 -> 2.1.1 refactor move to python-modules --- .../development/python-modules/fs/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 32 +---------- 2 files changed, 54 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/python-modules/fs/default.nix diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix new file mode 100644 index 000000000000..9d5de0c73ea2 --- /dev/null +++ b/pkgs/development/python-modules/fs/default.nix @@ -0,0 +1,53 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, six +, nose +, appdirs +, scandir +, backports_os +, typing +, pytz +, enum34 +, pyftpdlib +, psutil +, mock +, pythonAtLeast +, isPy3k +}: + +buildPythonPackage rec { + pname = "fs"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "b20a4aeac9079b194f0160957d4265bb6c99ce68f1b12e980b0fb96f74aafb70"; + }; + + buildInputs = [ pkgs.glibcLocales ]; + checkInputs = [ nose pyftpdlib mock psutil ]; + propagatedBuildInputs = [ six appdirs pytz ] + ++ pkgs.lib.optionals (!isPy3k) [ backports_os ] + ++ pkgs.lib.optionals (!pythonAtLeast "3.6") [ typing ] + ++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ scandir ] + ++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ enum34 ]; + + postPatch = '' + # required for installation + touch LICENSE + # tests modify home directory results in (4 tests failing) / 1600 + rm tests/test_appfs.py tests/test_opener.py + ''; + + LC_ALL="en_US.utf-8"; + + meta = with pkgs.lib; { + description = "Filesystem abstraction"; + homepage = https://github.com/PyFilesystem/pyfilesystem2; + license = licenses.bsd3; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bde64c14866..c4bd0b6446bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5581,37 +5581,7 @@ in { }; }; - fs = buildPythonPackage rec { - name = "fs-0.5.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/fs/${name}.tar.gz"; - sha256 = "ba2cca8773435a7c86059d57cb4b8ea30fda40f8610941f7822d1ce3ffd36197"; - }; - - LC_ALL = "en_US.UTF-8"; - buildInputs = [ pkgs.glibcLocales ]; - propagatedBuildInputs = [ self.six ]; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - # Because 2to3 is used the tests in $out need to be run. - # Both when using unittest and pytest this resulted in many errors, - # some Python byte/str errors, and others specific to resources tested. - # Failing tests due to the latter is to be expected with this type of package. - # Tests are therefore disabled. - doCheck = false; - - meta = { - description = "Filesystem abstraction"; - homepage = https://pypi.python.org/pypi/fs; - license = licenses.bsd3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - }; + fs = callPackage ../development/python-modules/fs { }; fusepy = buildPythonPackage rec { name = "fusepy-2.0.4"; From c8f7188f171aa7832595e623d602bb8ba090a644 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 14 Oct 2018 16:55:09 +0300 Subject: [PATCH 705/992] zstd: 1.3.5 -> 1.3.6 (#47965) --- pkgs/tools/compression/zstd/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index f9a05c4281af..53aaf1004906 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { - sha256 = "0fpv8k16s14g0r552mhbh0mkr716cqy41d2znyrvks6qfphkgir4"; + sha256 = "1x4a8r4m68m93q52ffxvaip9nnwx9yqvd1m90v80777c11s20a4n"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; @@ -21,8 +21,11 @@ stdenv.mkDerivation rec { ]; checkInputs = [ file ]; - doCheck = false; # fails with "zstd: --list does not support reading from standard input" - # probably a bug + doCheck = true; + preCheck = '' + substituteInPlace tests/playTests.sh \ + --replace 'MD5SUM="md5 -r"' 'MD5SUM="md5sum"' + ''; installFlags = [ "PREFIX=$(out)" From 6fb80eeacc72e2d7702e4555fca0122ec9a55ed1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 06:55:36 -0700 Subject: [PATCH 706/992] libsForQt5.libopenshot: 0.2.1 -> 0.2.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libopenshot/versions --- pkgs/applications/video/openshot-qt/libopenshot.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 64bbb07f0aaa..aab54e6d2ee2 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -8,13 +8,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "0n8ksnv6y2qh9iz352zqibfhnfvyjq7pkvy51prl47620ac40pc3"; + sha256 = "1x4kv05pdq1pglb6y056aa7llc6iyibyhzg93k7zwj0q08cp5ixd"; }; patchPhase = '' From b3dd5ef4c7ef6828552dd495d6410a88197fa58d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 07:09:02 -0700 Subject: [PATCH 707/992] librealsense: 2.15.0 -> 2.16.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/librealsense/versions --- pkgs/development/libraries/librealsense/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index ea24c9da88b9..f91fa192c034 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.15.0"; + version = "2.16.1"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "12918gcn0w5h6bqgx6s44w44bs1x2pcndn2833xzya69rddkdv6x"; + sha256 = "0vs2vcfmsb574bvdqrfgdmam0p631c738apk0w9mjdqk59zy1bz2"; }; buildInputs = [ From 1a7682deb292d3a19b9002bc0986ec1f3f0f8180 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 21:20:34 -0400 Subject: [PATCH 708/992] pythonPackages.CacheControl: init at 0.12.5 --- .../python-modules/cachecontrol/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/cachecontrol/default.nix diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix new file mode 100644 index 000000000000..7fedf8c5461b --- /dev/null +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, msgpack +, pytest +}: + +buildPythonPackage rec { + version = "0.12.5"; + pname = "CacheControl"; + + src = fetchPypi { + inherit pname version; + sha256 = "cef77effdf51b43178f6a2d3b787e3734f98ade253fa3187f3bb7315aaa42ff7"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ requests msgpack ]; + + # tests not included with pypi release + doCheck = false; + + checkPhase = '' + pytest tests + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ionrock/cachecontrol; + description = "Httplib2 caching for requests"; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea4f901b8516..35251c154450 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -264,6 +264,8 @@ in { bugseverywhere = callPackage ../applications/version-management/bugseverywhere {}; + cachecontrol = callPackage ../development/python-modules/cachecontrol { }; + cdecimal = callPackage ../development/python-modules/cdecimal { }; clustershell = callPackage ../development/python-modules/clustershell { }; From aaa1af9bde4d32cedae4f3bdadfe4e615ce18d22 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 21:21:09 -0400 Subject: [PATCH 709/992] pythonPackages.hdmedians: init at 0.13 --- .../python-modules/hdmedians/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/hdmedians/default.nix diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix new file mode 100644 index 000000000000..5dbf6215574a --- /dev/null +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, nose +, cython +, numpy +}: + +buildPythonPackage rec { + version = "0.13"; + pname = "hdmedians"; + + src = fetchPypi { + inherit pname version; + sha256 = "230f80e064d905c49a1941af1b7e806e2f22b3c9a90ad5c21fd17d72636ea277"; + }; + + buildInputs = [ cython ]; + checkInputs = [ nose ]; + propagatedBuildInputs = [ numpy ]; + + # cannot resolve path for packages in tests + doCheck = false; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = http://github.com/daleroberts/hdmedians; + description = "High-dimensional medians"; + license = licenses.gpl3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35251c154450..82638130220e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -364,6 +364,8 @@ in { histbook = callPackage ../development/python-modules/histbook { }; + hdmedians = callPackage ../development/python-modules/hdmedians { }; + httpsig = callPackage ../development/python-modules/httpsig { }; i3ipc = callPackage ../development/python-modules/i3ipc { }; @@ -561,7 +563,7 @@ in { slurm = pkgs.slurm; }; - pystache = callPackage ../development/python-modules/pystache { }; + pystache = callPackage ../development/python-modules/pystache { }; pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; From 0f8ccbf259a35da67c34f4ac5b793d6a1a818643 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 21:21:38 -0400 Subject: [PATCH 710/992] pythonPackages.lockfile: init at 0.12.2 --- .../python-modules/lockfile/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +-------------- 2 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/lockfile/default.nix diff --git a/pkgs/development/python-modules/lockfile/default.nix b/pkgs/development/python-modules/lockfile/default.nix new file mode 100644 index 000000000000..15cfee67f84a --- /dev/null +++ b/pkgs/development/python-modules/lockfile/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, nose +}: + +buildPythonPackage rec { + pname = "lockfile"; + version = "0.12.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"; + }; + + buildInputs = [ pbr ]; + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + homepage = https://launchpad.net/pylockfile; + description = "Platform-independent advisory file locking capability for Python applications"; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82638130220e..505874ecf6c1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6612,29 +6612,7 @@ in { llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_6; }; - lockfile = buildPythonPackage rec { - pname = "lockfile"; - version = "0.12.2"; - name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"; - }; - - buildInputs = with self; [ - pbr nose - ]; - - checkPhase = '' - nosetests - ''; - - meta = { - homepage = https://launchpad.net/pylockfile; - description = "Platform-independent advisory file locking capability for Python applications"; - license = licenses.asl20; - }; - }; + lockfile = callPackage ../development/python-modules/lockfile { }; logilab_common = callPackage ../development/python-modules/logilab/common.nix {}; From 4f25a138612ff62df020ff74753bd47d6fbd91f9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 10 Oct 2018 21:21:58 -0400 Subject: [PATCH 711/992] pythonPackages.scikit-bio: init at 0.5.4 --- .../python-modules/scikit-bio/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/scikit-bio/default.nix diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix new file mode 100644 index 000000000000..7a2ab097a71e --- /dev/null +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, cython +, lockfile +, cachecontrol +, decorator +, ipython +, matplotlib +, natsort +, numpy +, pandas +, scipy +, hdmedians +, scikitlearn +, pytest +, coverage +, python +, isPy3k +}: + +buildPythonPackage rec { + version = "0.5.4"; + pname = "scikit-bio"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "3243f1995ef24643c09ff4d9391a79528aadd8232e5aa5d66c38d7b2e0c92f24"; + }; + + buildInputs = [ cython ]; + checkInputs = [ coverage ]; + propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ]; + + # remove on when version > 0.5.4 + postPatch = '' + sed -i "s/numpy >= 1.9.2, < 1.14.0/numpy/" setup.py + sed -i "s/pandas >= 0.19.2, < 0.23.0/pandas/" setup.py + ''; + + # cython package not included for tests + doCheck = false; + + checkPhase = '' + ${python.interpreter} -m skbio.test + ''; + + meta = with stdenv.lib; { + homepage = http://scikit-bio.org/; + description = "Data structures, algorithms and educational resources for bioinformatics"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 505874ecf6c1..a2935c111943 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11715,6 +11715,8 @@ in { inherit (pkgs) gfortran glibcLocales; }; + scikit-bio = callPackage ../development/python-modules/scikit-bio { }; + scp = callPackage ../development/python-modules/scp {}; scripttest = buildPythonPackage rec { From 5f028007a532f8952b0681bf0309f9435c911106 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Oct 2018 10:05:50 -0400 Subject: [PATCH 712/992] pythonPackages.hdmedians: init at 0.13 --- pkgs/development/python-modules/hdmedians/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 5dbf6215574a..76d5921487e7 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { sha256 = "230f80e064d905c49a1941af1b7e806e2f22b3c9a90ad5c21fd17d72636ea277"; }; - buildInputs = [ cython ]; - checkInputs = [ nose ]; + # nose was specified in setup.py as a build dependency... + buildInputs = [ cython nose ]; propagatedBuildInputs = [ numpy ]; # cannot resolve path for packages in tests From 9cae5814e04726bf0beb0bd91b6e613742ae5dbc Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 14 Oct 2018 14:24:04 +0000 Subject: [PATCH 713/992] maintainers: update yegortimoshenko's email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3a50eb2819b8..629ba8d63c38 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4654,7 +4654,7 @@ name = "Dmitry V."; }; yegortimoshenko = { - email = "yegortimoshenko@gmail.com"; + email = "yegortimoshenko@riseup.net"; github = "yegortimoshenko"; name = "Yegor Timoshenko"; }; From 562866e64fd3357e24ee5f56921f38c74ecb2001 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 14 Oct 2018 10:26:38 -0400 Subject: [PATCH 714/992] fail2ban: 0.10.3.1 -> 0.10.4 --- pkgs/tools/security/fail2ban/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 30e8d4303dc1..6b1d8e6c4f88 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.10.3.1"; in +let version = "0.10.4"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "03gljmqykwwvwxcfhqqfccmnsjhsl93052i38r9mf7hj4jj8v7x5"; + sha256 = "07ik6rm856q0ic2r7vbg6j3hsdcdgkv44hh5ck0c2y21fqwrck3l"; }; propagatedBuildInputs = [ gamin ] @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication { preInstall = '' substituteInPlace setup.py --replace /usr/share/doc/ share/doc/ - + # see https://github.com/NixOS/nixpkgs/issues/4968 ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out ''; From 45fcf07fcbec6494eb387a40eb5a9e0058015b7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 07:28:33 -0700 Subject: [PATCH 715/992] mpd_clientlib: 2.15 -> 2.16 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libmpdclient/versions --- pkgs/servers/mpd/clientlib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 5201e150e2ab..d8aed78e28ae 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { - version = "2.15"; + version = "2.16"; name = "libmpdclient-${version}"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "libmpdclient"; rev = "v${version}"; - sha256 = "18x6drzh867afwaakyfb8hcx37pnxxwvvpcs3n2fimnfa6vxgwaa"; + sha256 = "0kd76pcf8pvmzl4k3cbq68c16imwaak2zljsa1wwwgk6idyw6gb1"; }; nativeBuildInputs = [ meson ninja ] From 5a51d74e37957afa86631da1bf186671880b5d34 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 07:38:34 -0700 Subject: [PATCH 716/992] hwinfo: 21.57 -> 21.58 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hwinfo/versions --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index af934b54185a..59ece285676c 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.57"; + version = "21.58"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "1zxc26bljhj04mqzpwnqd6zfnz4dd2syapzn8xcakj882v4a8gnz"; + sha256 = "15gfgb711cs42nynmql2dyi8hs7f5wj3pcm75snnbz5arp8lx3j2"; }; patchPhase = '' From 7f5a8093745a7d0ff6e83ddcc1305daca91be7a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 07:57:25 -0700 Subject: [PATCH 717/992] jackett: 0.10.258 -> 0.10.304 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 4c384c7b2b89..4f9cfa46e714 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.258"; + version = "0.10.304"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1wlg1spz2cxddaagjs6hv5fks3n1wwfm9jmih3rh1vq1rx8j1xnq"; + sha256 = "15v9xyvcdx9kbarilq7d7nm8ac8mljw641nrr3mnk8ij3gjdgb38"; }; buildInputs = [ makeWrapper ]; From 0ec21495ed4b0689ef5a980972d07a16741c7409 Mon Sep 17 00:00:00 2001 From: catern Date: Sun, 14 Oct 2018 11:08:33 -0400 Subject: [PATCH 718/992] bazel-buildtools: upgrade to 2018-10-11 (#48243) --- .../tools/build-managers/bazel/buildtools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 52fec3f131b9..d7bed13ec9d9 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,21 +2,21 @@ buildGoPackage rec { name = "bazel-buildtools-unstable-${version}"; - version = "2018-05-24"; + version = "2018-10-11"; goPackagePath = "github.com/bazelbuild/buildtools"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; - rev = "588d90030bc8054b550967aa45a8a8d170deba0b"; - sha256 = "18q1z138545kh4s5k0jcqwhpzc1w7il4x00l7yzv9wq8bg1vn1rv"; + rev = "86b40b7fee59cc67d3371d20f10702fe8c6dd808"; + sha256 = "10fzqbafwzv0bvx8aag78gh731k5j9nwlbcflhc5xm5zwhla9cyf"; }; goDeps = ./deps.nix; meta = with stdenv.lib; { - description = "This derivation contains developer tools for working with Google's bazel buildtool."; + description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps."; homepage = https://github.com/bazelbuild/buildtools; license = licenses.asl20; maintainers = with maintainers; [ uri-canva ]; From c3439d3dfc83573493cf8032b3d3b8b4c559a06e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 08:09:47 -0700 Subject: [PATCH 719/992] nanoflann: 1.2.3 -> 1.3.0 (#48384) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nanoflann/versions --- pkgs/development/libraries/nanoflann/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index b5d4ea0f4ebf..f29fb9564f31 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { - version = "1.2.3"; + version = "1.3.0"; name = "nanoflann-${version}"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${version}"; - sha256 = "1jrh73kjvdv7s7zc1sc3z254i17lpvn77b19wx32nvzsfxs4g44i"; + sha256 = "1bwdmrz1qygp9qy2nzrp1axa1i4nvm0ljkn6mnhlcvbfsyvhzigv"; }; buildInputs = [ cmake ]; From ab050719baa0e82fa2c3761bbc26139bd11c064e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 08:11:02 -0700 Subject: [PATCH 720/992] ipopt: 3.12.10 -> 3.12.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ipopt/versions --- pkgs/development/libraries/science/math/ipopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 4a6aabb447f3..7e58a4c7c982 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ipopt-${version}"; - version = "3.12.10"; + version = "3.12.11"; src = fetchurl { url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "004pd90knnnzcx727knb7ffkabb1ggbskb8s607bfvfgdd7wlli9"; + sha256 = "1qihlwwqsqpbwpp6zqfa7nrmb55dndppzmdy98897aiknaa2650h"; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; From 265bb51798bf4489609f12479496a1bbfd0efae6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 08:16:18 -0700 Subject: [PATCH 721/992] jbake: 2.6.1 -> 2.6.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jbake/versions --- pkgs/development/tools/jbake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 9c3094fb4fec..c11e6f15ce96 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.6.1"; + version = "2.6.2"; name = "jbake-${version}"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; - sha256 = "0zlh2azmv8gj3c4d4ndivar31wd42nmvhxq6xhn09cib9kffxbc7"; + sha256 = "1q96z0pvkqgb4194m52z89q56cbc0g3faflyfpy55z099f655rx9"; }; buildInputs = [ makeWrapper jre ]; From cce05bfb08be15d168eccdcc8cabb44df8f4a1ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Oct 2018 08:18:52 -0700 Subject: [PATCH 722/992] mdp: 1.0.14 -> 1.0.15 (#48399) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mdp/versions --- pkgs/applications/misc/mdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index f5950b877035..cd7bdd1fe7e2 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.14"; + version = "1.0.15"; name = "mdp-${version}"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; rev = version; - sha256 = "1nljb2bkk7kswywvvn3b2k6q14bh2jnwm8cypax3mwssjmid78af"; + sha256 = "1m9a0vvyw2m55cn7zcq011vrjkiaj5a3g5g6f2dpq953gyi7gff9"; }; makeFlags = [ "PREFIX=$(out)" ]; From 55e222430f094c053e752910fdd1567df9e2f356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 15 Oct 2018 00:42:29 +0900 Subject: [PATCH 723/992] wabt: 1.0.5 -> 1.0.6 --- pkgs/development/tools/wabt/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 26347d4b2782..20c9a71aadd5 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wabt-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "1cbak3ach7cna98j2r0v3y38c59ih2gv0p6f43qp782pyj07hzfy"; + sha256 = "0lqsf4wmg24mb3ksmib8xwvmghx8m2vzrjrs8dazwlmik7rill8i"; }; nativeBuildInputs = [ cmake ]; @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The WebAssembly Binary Toolkit"; longDescription = '' - WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly, - including: + WABT (pronounced "wabbit") is a suite of tools for WebAssembly, including: * wat2wasm: translate from WebAssembly text format to the WebAssembly binary format * wasm2wat: the inverse of wat2wasm, translate from the binary format From 0c78e88ef6ea918815a4a69552d45b5e8ab1cc74 Mon Sep 17 00:00:00 2001 From: Lucie Date: Sun, 14 Oct 2018 17:42:59 +0200 Subject: [PATCH 724/992] invoke: 1.1.1 -> 1.2.0 (#48408) --- pkgs/development/python-modules/invoke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 8785f1fa6dbd..0438a035501b 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.1.1"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1c2cf54c9b9af973ad9704d8ba81b225117cab612568cacbfb3fc42958cc20a9"; + sha256 = "1dr1a5qbb9z5hyns4zk086zm0iqbms33zv0s1296wx502y7jyjfw"; }; # errors with vendored libs From 82f3fc0c83a7953c66b0e9331b3f633f62913f3f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 14 Oct 2018 12:48:33 -0500 Subject: [PATCH 725/992] pythonPackages.structlog: add six to propagatedBuildInputs Move simplejson to checkInputs --- pkgs/development/python-modules/structlog/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 4dc9c3c79bc9..f667f17f77df 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -6,6 +6,7 @@ , pretend , freezegun , simplejson +, six }: buildPythonPackage rec { @@ -25,8 +26,8 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytest pretend freezegun ]; - propagatedBuildInputs = [ simplejson ]; + checkInputs = [ pytest pretend freezegun simplejson ]; + propagatedBuildInputs = [ six ]; checkPhase = '' rm tests/test_twisted.py* From d03f4390addccc727033102f7e773d1b6a12a00f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 14 Oct 2018 12:47:14 -0500 Subject: [PATCH 726/992] pythonPackages.nvchecker: init at 1.1 --- .../python-modules/nvchecker/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/nvchecker/default.nix diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix new file mode 100644 index 000000000000..6e70f90e3705 --- /dev/null +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, pytest_xdist, flaky, tornado }: + +buildPythonPackage rec { + pname = "nvchecker"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nk9ff26s5r6v5v7w4l9110qi5kmhllvwk5kh20zyyhdvxv72m3i"; + }; + + # tornado is not present in the tarball setup.py but is required by the executable + propagatedBuildInputs = [ setuptools structlog tornado ]; + checkInputs = [ pytest pytest-asyncio pytest_xdist flaky ]; + + # Disable tests for now, because our version of pytest seems to be too new + # https://github.com/lilydjwg/nvchecker/commit/42a02efec84824a073601e1c2de30339d251e4c7 + doCheck = false; + + checkPhase = '' + py.test + ''; + + disabled = pythonOlder "3.5"; + + meta = with stdenv.lib; { + homepage = https://github.com/lilydjwg/nvchecker; + description = "New version checker for software"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2935c111943..116226428239 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -418,6 +418,8 @@ in { ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; + nvchecker = callPackage ../development/python-modules/nvchecker { }; + oauthenticator = callPackage ../development/python-modules/oauthenticator { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; From 7748c3da1b116055c637a2441e1f0e9434f82f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 14 Oct 2018 20:12:08 +0200 Subject: [PATCH 727/992] nixos/nixos-install: Unset system The system variable is used from the (possibly polluted) shell environment. This causes nixos-install to fail in a nix-shell because the system shell variable is automatically set to the current system (e.g. x86_64-linux). --- nixos/modules/installer/tools/nixos-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 22c1e0fe9a34..defc46ad2a72 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -13,6 +13,7 @@ extraBuildFlags=() mountPoint=/mnt channelPath= +system= while [ "$#" -gt 0 ]; do i="$1"; shift 1 From 81c3ae949281a7d027dd5a1e9e61a1df5745eabe Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 21 Aug 2018 22:16:48 +0200 Subject: [PATCH 728/992] nixos/znc: add config option This option represents the ZNC configuration as a Nix value. It will be converted to a syntactically valid file. This provides: - Flexibility: Any ZNC option can be used - Modularity: These values can be set from any NixOS module and will be merged correctly - Overridability: Default values can be overridden Also done: Remove unused/unneeded options, mkRemovedOptionModule unfortunately doesn't work inside submodules (yet). The options userName and modulePackages were never used to begin with --- .../services/networking/znc/default.nix | 222 ++++++++++++++---- .../services/networking/znc/options.nix | 190 +++++++-------- 2 files changed, 265 insertions(+), 147 deletions(-) diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index e2526550caf3..bce5b15a19ec 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -3,51 +3,102 @@ with lib; let + cfg = config.services.znc; - defaultUser = "znc"; # Default user to own process. + defaultUser = "znc"; modules = pkgs.buildEnv { name = "znc-modules"; paths = cfg.modulePackages; }; + listenerPorts = concatMap (l: optional (l ? Port) l.Port) + (attrValues (cfg.config.Listener or {})); + + # Converts the config option to a string + semanticString = let + + sortedAttrs = set: sort (l: r: + if l == "extraConfig" then false # Always put extraConfig last + else if isAttrs set.${l} == isAttrs set.${r} then l < r + else isAttrs set.${r} # Attrsets should be last, makes for a nice config + # This last case occurs when any side (but not both) is an attrset + # The order of these is correct when the attrset is on the right + # which we're just returning + ) (attrNames set); + + # Specifies an attrset that encodes the value according to its type + encode = name: value: { + null = []; + bool = [ "${name} = ${boolToString value}" ]; + int = [ "${name} = ${toString value}" ]; + + # extraConfig should be inserted verbatim + string = [ (if name == "extraConfig" then value else "${name} = ${value}") ]; + + # Values like `Foo = [ "bar" "baz" ];` should be transformed into + # Foo=bar + # Foo=baz + list = concatMap (encode name) value; + + # Values like `Foo = { bar = { Baz = "baz"; Qux = "qux"; Florps = null; }; };` should be transmed into + # + # Baz=baz + # Qux=qux + # + set = concatMap (subname: [ + "<${name} ${subname}>" + ] ++ map (line: "\t${line}") (toLines value.${subname}) ++ [ + "" + ]) (filter (v: v != null) (attrNames value)); + + }.${builtins.typeOf value}; + + # One level "above" encode, acts upon a set and uses encode on each name,value pair + toLines = set: concatMap (name: encode name set.${name}) (sortedAttrs set); + + in + concatStringsSep "\n" (toLines cfg.config); + + semanticTypes = with types; rec { + zncAtom = nullOr (either (either int bool) str); + zncAttr = attrsOf (nullOr zncConf); + zncAll = either (either zncAtom (listOf zncAtom)) zncAttr; + zncConf = attrsOf (zncAll // { + # Since this is a recursive type and the description by default contains + # the description of its subtypes, infinite recursion would occur without + # explicitly breaking this cycle + description = "znc values (null, atoms (str, int, bool), list of atoms, or attrsets of znc values)"; + }); + }; + in { - imports = [ - ./options.nix - ]; - - ###### Interface + imports = [ ./options.nix ]; options = { services.znc = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable a ZNC service for a user. - ''; - }; + enable = mkEnableOption "ZNC"; user = mkOption { default = "znc"; example = "john"; - type = types.string; + type = types.str; description = '' - The name of an existing user account to use to own the ZNC server process. - If not specified, a default user will be created to own the process. + The name of an existing user account to use to own the ZNC server + process. If not specified, a default user will be created. ''; }; group = mkOption { - default = ""; + default = defaultUser; example = "users"; - type = types.string; + type = types.str; description = '' - Group to own the ZNCserver process. + Group to own the ZNC process. ''; }; @@ -56,7 +107,8 @@ in example = "/home/john/.znc/"; type = types.path; description = '' - The data directory. Used for configuration files and modules. + The state directory for ZNC. The config and the modules will be linked + to from this directory as well. ''; }; @@ -64,7 +116,79 @@ in type = types.bool; default = false; description = '' - Whether to open ports in the firewall for ZNC. + Whether to open ports in the firewall for ZNC. Does work with + ports for listeners specified in + . + ''; + }; + + config = mkOption { + type = semanticTypes.zncConf; + default = {}; + example = literalExample '' + { + LoadModule = [ "webadmin" "adminlog" ]; + User.paul = { + Admin = true; + Nick = "paul"; + AltNick = "paul1"; + LoadModule = [ "chansaver" "controlpanel" ]; + Network.freenode = { + Server = "chat.freenode.net +6697"; + LoadModule = [ "simple_away" ]; + Chan = { + "#nixos" = { Detached = false; }; + "##linux" = { Disabled = true; }; + }; + }; + Pass.password = { + Method = "sha256"; + Hash = "e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93"; + Salt = "l5Xryew4g*!oa(ECfX2o"; + }; + }; + } + ''; + description = '' + Configuration for ZNC, see + https://wiki.znc.in/Configuration for details. The + Nix value declared here will be translated directly to the xml-like + format ZNC expects. This is much more flexible than the legacy options + under , but also can't do + any type checking. + + + You can use nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.services.znc.config + to view the current value. By default it contains a listener for port + 5000 with SSL enabled. + + + Nix attributes called extraConfig will be inserted + verbatim into the resulting config file. + + + If is turned on, the + option values in will be + gracefully be applied to this option. + + + If you intend to update the configuration through this option, be sure + to enable , otherwise none of the + changes here will be applied after the initial deploy. + ''; + }; + + configFile = mkOption { + type = types.path; + example = "~/.znc/configs/znc.conf"; + description = '' + Configuration file for ZNC. It is recommended to use the + option instead. + + + Setting this option will override any auto-generated config file + through the or + options. ''; }; @@ -78,16 +202,21 @@ in }; mutable = mkOption { - default = true; + default = true; # TODO: Default to true when config is set, make sure to not delete the old config if present type = types.bool; description = '' - Indicates whether to allow the contents of the `dataDir` directory to be changed - by the user at run-time. - If true, modifications to the ZNC configuration after its initial creation are not - overwritten by a NixOS system rebuild. - If false, the ZNC configuration is rebuilt by every system rebuild. - If the user wants to manage the ZNC service using the web admin interface, this value - should be set to true. + Indicates whether to allow the contents of the + dataDir directory to be changed by the user at + run-time. + + + If enabled, modifications to the ZNC configuration after its initial + creation are not overwritten by a NixOS rebuild. If disabled, the + ZNC configuration is rebuilt on every NixOS rebuild. + + + If the user wants to manage the ZNC service using the web admin + interface, this option should be enabled. ''; }; @@ -96,7 +225,7 @@ in example = [ "--debug" ]; type = types.listOf types.str; description = '' - Extra flags to use when executing znc command. + Extra arguments to use for executing znc. ''; }; }; @@ -107,40 +236,48 @@ in config = mkIf cfg.enable { - networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ ]; # TODO: Add port + services.znc = { + configFile = mkDefault (pkgs.writeText "znc-generated.conf" semanticString); + config = { + Version = (builtins.parseDrvName pkgs.znc.name).version; + Listener.l.Port = mkDefault 5000; + Listener.l.SSL = mkDefault true; + }; }; + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall listenerPorts; + systemd.services.znc = { description = "ZNC Server"; wantedBy = [ "multi-user.target" ]; - after = [ "network.service" ]; + after = [ "network-online.target" ]; serviceConfig = { User = cfg.user; Group = cfg.group; Restart = "always"; + ExecStart = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${escapeShellArgs cfg.extraFlags}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; }; preStart = '' - ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/configs + mkdir -p ${cfg.dataDir}/configs # If mutable, regenerate conf file every time. ${optionalString (!cfg.mutable) '' - ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated." - ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf + echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated." + rm -f ${cfg.dataDir}/configs/znc.conf ''} # Ensure essential files exist. if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then - ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now." - ${pkgs.coreutils}/bin/cp --no-clobber ${/* TODO */"zncConfFile"} ${cfg.dataDir}/configs/znc.conf - ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf - ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf + echo "No znc.conf file found in ${cfg.dataDir}. Creating one now." + cp --no-clobber ${cfg.configFile} ${cfg.dataDir}/configs/znc.conf + chmod u+rw ${cfg.dataDir}/configs/znc.conf + chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf fi if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then - ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now." + echo "No znc.pem file found in ${cfg.dataDir}. Creating one now." ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir} fi @@ -148,7 +285,6 @@ in rm ${cfg.dataDir}/modules || true ln -fs ${modules}/lib/znc ${cfg.dataDir}/modules ''; - script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}"; }; users.users = optional (cfg.user == defaultUser) diff --git a/nixos/modules/services/networking/znc/options.nix b/nixos/modules/services/networking/znc/options.nix index ce5ca0a9a3b6..505ebb3bf0ad 100644 --- a/nixos/modules/services/networking/znc/options.nix +++ b/nixos/modules/services/networking/znc/options.nix @@ -6,66 +6,9 @@ let cfg = config.services.znc; - # Default user and pass: - # un=znc - # pw=nixospass - - defaultUserName = "znc"; - defaultPassBlock = " - - Method = sha256 - Hash = e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93 - Salt = l5Xryew4g*!oa(ECfX2o - - "; - - # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`. - mkZncConf = confOpts: '' - Version = 1.6.3 - ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules} - - - Port = ${toString confOpts.port} - IPv4 = true - IPv6 = true - SSL = ${boolToString confOpts.useSSL} - ${lib.optionalString (confOpts.uriPrefix != null) "URIPrefix = ${confOpts.uriPrefix}"} - - - - ${confOpts.passBlock} - Admin = true - Nick = ${confOpts.nick} - AltNick = ${confOpts.nick}_ - Ident = ${confOpts.nick} - RealName = ${confOpts.nick} - ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.userModules} - - ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (name: net: '' - - ${concatMapStrings (m: "LoadModule = ${m}\n") net.modules} - Server = ${net.server} ${lib.optionalString net.useSSL "+"}${toString net.port} ${net.password} - ${concatMapStrings (c: "\n\n") net.channels} - ${lib.optionalString net.hasBitlbeeControlChannel '' - - - ''} - ${net.extraConf} - - '') confOpts.networks) } - - ${confOpts.extraZncConf} - ''; - - zncConfFile = pkgs.writeTextFile { - name = "znc.conf"; - text = if cfg.zncConf != "" - then cfg.zncConf - else mkZncConf cfg.confOptions; - }; - networkOpts = { options = { + server = mkOption { type = types.str; example = "chat.freenode.net"; @@ -75,23 +18,13 @@ let }; port = mkOption { - type = types.int; + type = types.ints.u16; default = 6697; - example = 6697; description = '' IRC server port. ''; }; - userName = mkOption { - default = ""; - example = "johntron"; - type = types.string; - description = '' - A nick identity specific to the IRC server. - ''; - }; - password = mkOption { type = types.str; default = ""; @@ -108,21 +41,12 @@ let ''; }; - modulePackages = mkOption { - type = types.listOf types.package; - default = []; - example = [ "pkgs.zncModules.push" "pkgs.zncModules.fish" ]; - description = '' - External ZNC modules to build. - ''; - }; - modules = mkOption { type = types.listOf types.str; default = [ "simple_away" ]; example = literalExample "[ simple_away sasl ]"; description = '' - ZNC modules to load. + ZNC network modules to load. ''; }; @@ -156,7 +80,8 @@ let Nick = johntron ''; description = '' - Extra config for the network. + Extra config for the network. Consider using + instead. ''; }; }; @@ -166,23 +91,29 @@ in { - ###### Interface - options = { services.znc = { - zncConf = mkOption { - default = ""; - example = "See: http://wiki.znc.in/Configuration"; - type = types.lines; + useLegacyConfig = mkOption { + default = true; + type = types.bool; description = '' - Config file as generated with `znc --makeconf` to use for the whole ZNC configuration. - If specified, `confOptions` will be ignored, and this value, as-is, will be used. - If left empty, a conf file with default values will be used. + Whether to propagate the legacy options under + to the znc config. If this + is turned on, the znc config will contain a user with the default name + "znc", global modules "webadmin" and "adminlog" will be enabled by + default, and more, all controlled through the + options. + You can use nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.services.znc.config + to view the current value of the config. + + + In any case, if you need more flexibility, + can be used to override/add to + all of the legacy options. ''; }; - confOptions = { modules = mkOption { type = types.listOf types.str; @@ -203,9 +134,9 @@ in }; userName = mkOption { - default = defaultUserName; + default = "znc"; example = "johntron"; - type = types.string; + type = types.str; description = '' The user name used to log in to the ZNC web admin interface. ''; @@ -217,37 +148,47 @@ in description = '' IRC networks to connect the user to. ''; - example = { - "freenode" = { - server = "chat.freenode.net"; - port = 6697; - useSSL = true; - modules = [ "simple_away" ]; + example = literalExample '' + { + "freenode" = { + server = "chat.freenode.net"; + port = 6697; + useSSL = true; + modules = [ "simple_away" ]; + }; }; - }; + ''; }; nick = mkOption { default = "znc-user"; example = "john"; - type = types.string; + type = types.str; description = '' The IRC nick. ''; }; passBlock = mkOption { - example = defaultPassBlock; - type = types.string; + example = literalExample '' + <Pass password> + Method = sha256 + Hash = e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93 + Salt = l5Xryew4g*!oa(ECfX2o + </Pass> + ''; + type = types.str; description = '' Generate with `nix-shell -p znc --command "znc --makepass"`. This is the password used to log in to the ZNC web admin interface. + You can also set this through + + and co. ''; }; port = mkOption { default = 5000; - example = 5000; type = types.int; description = '' Specifies the port on which to listen. @@ -258,7 +199,8 @@ in default = true; type = types.bool; description = '' - Indicates whether the ZNC server should use SSL when listening on the specified port. A self-signed certificate will be generated. + Indicates whether the ZNC server should use SSL when listening on + the specified port. A self-signed certificate will be generated. ''; }; @@ -283,4 +225,44 @@ in }; }; + + config = mkIf cfg.useLegacyConfig { + + services.znc.config = let + c = cfg.confOptions; + # defaults here should override defaults set in the non-legacy part + mkDefault = mkOverride 900; + in { + LoadModule = mkDefault c.modules; + Listener.l = { + Port = mkDefault c.port; + IPv4 = mkDefault true; + IPv6 = mkDefault true; + SSL = mkDefault c.useSSL; + }; + User.${c.userName} = { + Admin = mkDefault true; + Nick = mkDefault c.nick; + AltNick = mkDefault "${c.nick}_"; + Ident = mkDefault c.nick; + RealName = mkDefault c.nick; + LoadModule = mkDefault c.userModules; + Network = mapAttrs (name: net: { + LoadModule = mkDefault net.modules; + Server = mkDefault "${net.server} ${optionalString net.useSSL "+"}${toString net.port} ${net.password}"; + Chan = optionalAttrs net.hasBitlbeeControlChannel { "&bitlbee" = mkDefault {}; } // + listToAttrs (map (n: nameValuePair "#${n}" (mkDefault {})) net.channels); + extraConfig = if net.extraConf == "" then mkDefault null else net.extraConf; + }) c.networks; + extraConfig = [ c.passBlock ] ++ optional (c.extraZncConf != "") c.extraZncConf; + }; + }; + }; + + imports = [ + (mkRemovedOptionModule ["services" "znc" "zncConf"] '' + Instead of `services.znc.zncConf = "... foo ...";`, use + `services.znc.configFile = pkgs.writeText "znc.conf" "... foo ...";`. + '') + ]; } From 7e316780438b01cbb0ae79d0516fc204a11a5881 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 13 Oct 2018 15:08:06 +0200 Subject: [PATCH 729/992] nixos/znc: Add release note entry for removed options --- nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index c4847b60e274..ac5a2201c869 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -122,6 +122,14 @@ the Python 2 or 3 version of the package. + + + Options + services.znc.confOptions.networks.name.userName and + services.znc.confOptions.networks.name.modulePackages + were removed. They were never used for anything and can therefore safely be removed. + + From 561fcf4c820c6db65b0efeba675680c54f9f2e41 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 12 Oct 2018 21:20:19 +0000 Subject: [PATCH 730/992] agdaIowaStdlib: 18734 -> 1.4.0 --- .../libraries/agda/agda-iowa-stdlib/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix index ce25521ad2e5..3ab4ed3e9623 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix @@ -1,13 +1,14 @@ -{ stdenv, agda, fetchsvn }: +{ stdenv, agda, fetchFromGitHub }: agda.mkDerivation (self: rec { - version = "18734"; + version = "1.4.0"; name = "agda-iowa-stdlib-${version}"; - src = fetchsvn { - url = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib"; - rev = version; - sha256 = "0aqib88m5n6aqb5lmns9nl62x40yqhg6zpj0zjxibbn4s4qjw9ky"; + src = fetchFromGitHub { + owner = "cedille"; + repo = "ial"; + rev = "v${version}"; + sha256 = "1gwxpybxwdj5ipbb3gapm7r5hfl3g6sj9kp13954pdmx8d5b0gma"; }; sourceDirectories = [ "./." ]; @@ -22,7 +23,5 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - - broken = true; }; }) From 43ae33728bace6deb31042ab61efb196c1b8e2b0 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 12 Oct 2018 21:22:25 +0000 Subject: [PATCH 731/992] cedille: init at 1.0.0 --- .../science/logic/cedille/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/science/logic/cedille/default.nix diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix new file mode 100644 index 000000000000..5b99a47bb415 --- /dev/null +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchFromGitHub, alex, happy, Agda, agdaIowaStdlib, + buildPlatform, buildPackages, ghcWithPackages }: +stdenv.mkDerivation rec { + version = "1.0.0"; + name = "cedille-${version}"; + src = fetchFromGitHub { + owner = "cedille"; + repo = "cedille"; + rev = "v${version}"; + sha256 = "08c2vgg8i6l3ws7hd5gsj89mki36lxm7x7s8hi1qa5gllq04a832"; + }; + buildInputs = [ alex happy Agda (ghcWithPackages (ps: [ps.ieee])) ]; + + LANG = "en_US.UTF-8"; + LOCALE_ARCHIVE = + lib.optionalString (buildPlatform.libc == "glibc") + "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + + postPatch = '' + patchShebangs create-libraries.sh + cp -r ${agdaIowaStdlib.src} ial + chmod -R 755 ial + ''; + + installPhase = '' + mkdir -p $out/bin + mv cedille $out/bin/cedille + ''; + + meta = { + description = "An interactive theorem-prover and dependently typed programming language, based on extrinsic (aka Curry-style) type theory."; + homepage = https://cedille.github.io/; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.mpickering ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8daf69f64f65..256e11ada728 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1091,6 +1091,10 @@ with pkgs; cddl = callPackage ../development/tools/cddl { }; + cedille = callPackage ../applications/science/logic/cedille + { inherit (haskellPackages) alex happy Agda ghcWithPackages; + }; + cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; ckbcomp = callPackage ../tools/X11/ckbcomp { }; From 9e348b4613c734d114e85ec40b72119a3c5ffd4f Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sat, 13 Oct 2018 09:16:57 +0000 Subject: [PATCH 732/992] emacsPackages.cedille: init at 1.0.0 --- .../editors/emacs-modes/cedille/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/cedille/default.nix diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/pkgs/applications/editors/emacs-modes/cedille/default.nix new file mode 100644 index 000000000000..2d1cbb75981e --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/cedille/default.nix @@ -0,0 +1,30 @@ +{ stdenv, cedille, emacs }: + +stdenv.mkDerivation rec { + name = "cedille-mode-${version}"; + version = cedille.version; + + src = cedille.src; + + buildInputs = [ emacs ]; + + buildPhase = ":"; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install se-mode/*.el se-mode/*.elc $out/share/emacs/site-lisp + install cedille-mode/*.el cedille-mode/*.elc $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + substituteInPlace $out/share/emacs/site-lisp/cedille-mode.el \ + --replace /usr/bin/cedille ${cedille}/bin/cedille \ + + ''; + + meta = { + description = "Emacs major mode for Cedille"; + homepage = cedille.meta.homepage; + license = cedille.meta.license ; + platforms = cedille.meta.platforms; + maintainers = cedille.meta.maintainers; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 256e11ada728..43c5dfb36f0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16236,6 +16236,8 @@ with pkgs; calfw = callPackage ../applications/editors/emacs-modes/calfw { }; + cedille = callPackage ../applications/editors/emacs-modes/cedille { cedille = pkgs.cedille; }; + coffee = callPackage ../applications/editors/emacs-modes/coffee { }; colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { }; From 983563105004f4968b930689dc1a619087c2f56c Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Sun, 30 Sep 2018 22:37:32 +0700 Subject: [PATCH 733/992] omegat: init at 4.1.5.2 OmegaT is a Computer-Assisted Translation tool written in Java. This derivation doesn't build it from source, but rather downloads a 'Cross-platform without JRE' zip file. I took the liberty of shorting the upstream version naming of "4.1.5 update 2 Beta" to a more concise "4.1.5.2". --- pkgs/applications/misc/omegat.nix | 40 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/misc/omegat.nix diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix new file mode 100644 index 000000000000..e6a6be88b6c0 --- /dev/null +++ b/pkgs/applications/misc/omegat.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, unzip, jdk, makeWrapper}: + +stdenv.mkDerivation rec { + version = "4.1.5.2"; + name = "omegat"; + + src = fetchurl { # their zip has repeated files or something, so no fetchzip + url = mirror://sourceforge/project/omegat/OmegaT%20-%20Latest/OmegaT%204.1.5%20update%202/OmegaT_4.1.5_02_Beta_Without_JRE.zip; + sha256 = "1mdnsvjgsccpd5xwpqzgva5jjp8yd1akq9aqpild4v6k70lqql2b"; + }; + + buildInputs = [ unzip makeWrapper ]; + + unpackCmd = "unzip -o $curSrc"; # tries to go interactive without -o + + installPhase = '' + mkdir -p $out/bin + cp -r lib docs images plugins scripts *.txt *.html OmegaT.jar $out/ + + cat > $out/bin/omegat < Date: Sun, 14 Oct 2018 08:03:17 -0700 Subject: [PATCH 734/992] josm: 14178 -> 14289 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/josm/versions --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index fc10bc852e5c..4f98ec1bba91 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 = "14178"; + version = "14289"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "08an4s8vbcd8vyinnvd7cxmgnrsy47j78a94nk6vq244gp7v5n0r"; + sha256 = "102dph3479qskzf72cpb9139pq9ifka6pzna1c6s5rs2il6mfvsb"; }; buildInputs = [ jre10 makeWrapper ]; From d85317c7b2445c40e30b985517e078e50c24921b Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Sat, 6 Oct 2018 09:24:08 -0700 Subject: [PATCH 735/992] nixos/containers: Make systemd journals available from the host This is set by default if using the upstream systemd-nspawn@ units. --- nixos/modules/virtualisation/containers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index b91165ce3b82..8fe59badd335 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -130,6 +130,7 @@ let --bind-ro=/nix/var/nix/daemon-socket \ --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \ --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \ + --link-journal=try-guest \ --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \ --setenv HOST_BRIDGE="$HOST_BRIDGE" \ --setenv HOST_ADDRESS="$HOST_ADDRESS" \ From 72128fcd9dc01b06b1acac4aecdded7a773c55f8 Mon Sep 17 00:00:00 2001 From: Tycho Grouwstra Date: Sun, 14 Oct 2018 23:46:38 +0200 Subject: [PATCH 736/992] skypeforlinux: 8.28.0.41 -> 8.32.0.44 (#48391) * skypeforlinux: 8.28.0.41 -> 8.32.0.44 Fixes 404 on https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.28.0.41_amd64.deb, as only [more recent versions](https://repo.skype.com/deb/pool/main/s/skypeforlinux/) are still available, as previously noted at #31047. Avoiding `x.y.76.z` releases as per the comment. * update sha256 --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index eaa9103a7b64..49e5a12d447c 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -6,7 +6,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.28.0.41"; + version = "8.32.0.44"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -56,7 +56,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1kydf71qbz35dx4674h3nxfx8a88k620217906i54ic4qq2mgy2x"; + sha256 = "0yzh4bmv8mrfp0ml9nhcpcy0lhi8jp1fnmnxy0krvnphkp8750c7"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From a1600d0aa8f9eee9f6d6cd067d6cbdb1fdd51d46 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Sun, 14 Oct 2018 18:00:06 -0400 Subject: [PATCH 737/992] ghc: enable parallel building of GHC on aarch64. Note: this only affects GHC, not haskellPackages, which still suffers from https://ghc.haskell.org/trac/ghc/ticket/15449. --- pkgs/development/compilers/ghc/8.2.2.nix | 3 +-- pkgs/development/compilers/ghc/8.4.3.nix | 3 +-- pkgs/development/compilers/ghc/8.6.1.nix | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 8c3012f881c6..b548b05339e4 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -88,8 +88,7 @@ stdenv.mkDerivation (rec { sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; }; - # https://ghc.haskell.org/trac/ghc/ticket/15449 - enableParallelBuilding = !buildPlatform.isAarch64; + enableParallelBuilding = true; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 7cd7494df050..e43f9a57d0a4 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -90,8 +90,7 @@ stdenv.mkDerivation (rec { sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf"; }; - # https://ghc.haskell.org/trac/ghc/ticket/15449 - enableParallelBuilding = !buildPlatform.isAarch64; + enableParallelBuilding = true; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index a2be9d255713..62ea39791b90 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -86,8 +86,7 @@ stdenv.mkDerivation (rec { sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c"; }; - # https://ghc.haskell.org/trac/ghc/ticket/15449 - enableParallelBuilding = !buildPlatform.isAarch64; + enableParallelBuilding = true; outputs = [ "out" "doc" ]; From 72bb5a5449f9c0dc0948b2174592f2b201ee2968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 14 Oct 2018 19:01:37 -0300 Subject: [PATCH 738/992] matcha: 2018-09-14 -> 2018-10-12 (#48426) --- pkgs/misc/themes/matcha/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/misc/themes/matcha/default.nix index 264d171292d2..e23fb7ff47cf 100644 --- a/pkgs/misc/themes/matcha/default.nix +++ b/pkgs/misc/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matcha-${version}"; - version = "2018-09-14"; + version = "2018-10-12"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "matcha"; - rev = "fe35259742b5ae007ab17d46d21acad5754477b9"; - sha256 = "1qwb8l1xfx9ca2y9gcsckxikijz1ij28dirvpqvhbbyn1m8i9hwd"; + rev = "c1c91db44d9e28cc71af019784a77175a60a7b9d"; + sha256 = "0sr805ghgh8sr9nncs693b9p756nmi1l4d8mfywj6z219jhy77qv"; }; buildInputs = [ gdk_pixbuf librsvg ]; From e619998eb3778e7064b7c84e3338e65bbe114f31 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 14 Oct 2018 22:42:01 +0200 Subject: [PATCH 739/992] nixos/lock-kernel-modules: add myself to maintainers --- nixos/modules/security/lock-kernel-modules.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix index c81521ed9b08..fc9e7939d814 100644 --- a/nixos/modules/security/lock-kernel-modules.nix +++ b/nixos/modules/security/lock-kernel-modules.nix @@ -3,6 +3,10 @@ with lib; { + meta = { + maintainers = [ maintainers.joachifm ]; + }; + options = { security.lockKernelModules = mkOption { type = types.bool; From cb845123d413b873f2463411447e35d4ce026e74 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 15 Oct 2018 00:18:33 +0200 Subject: [PATCH 740/992] nixos/hardened: add myself to maintainers --- nixos/modules/profiles/hardened.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 2af8bf1f8e30..38c5a42ba6fb 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = [ maintainers.joachifm ]; + }; + boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened; security.hideProcessInformation = mkDefault true; From 22c12da8aa6e12e6c92f687dff4b47660bc1b6ee Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 14 Oct 2018 20:36:25 -0400 Subject: [PATCH 741/992] dbeaver: 5.2.1 -> 5.2.2 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 681ee5b0bece..412a2e9d4fd0 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.2.1"; + version = "5.2.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0zm320cdpypv2s58gcg89mdkir9xpz1824dscfqkmahx89g1ma81"; + sha256 = "1rrj0c7ksvv9irsz9hb4ip30qgmzps4dy1nj4vl8mzzf389xa43n"; }; installPhase = '' From 01d1f776818176a9cac7d7c9d3a319694fea4f1a Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 13 Oct 2018 23:42:28 +0200 Subject: [PATCH 742/992] tests/prometheus-exporters: add new Tor exporter This new exporter was added in #48307. --- nixos/tests/prometheus-exporters.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 2f2c06dcb7d6..5d1e004c5dd1 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -243,6 +243,25 @@ let ''; }; + tor = { + exporterConfig = { + enable = true; + }; + metricProvider = { + # Note: this does not connect the test environment to the Tor network. + # Client, relay, bridge or exit connectivity are disabled by default. + services.tor.enable = true; + services.tor.controlPort = 9051; + }; + exporterTest = '' + waitForUnit("tor.service"); + waitForOpenPort(9051); + waitForUnit("prometheus-tor-exporter.service"); + waitForOpenPort(9130); + succeed("curl -sSf localhost:9130/metrics | grep -q 'tor_version{.\\+} 1'"); + ''; + }; + varnish = { exporterConfig = { enable = true; From 259cf8812b152d6f5db61821441d51bb446e3b01 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 15 Oct 2018 03:26:46 +0200 Subject: [PATCH 743/992] dolphin-emu: fix metadata (GPLv2 -> GPLv2+, http -> https) Dolphin has been GPLv2+ since 2015. --- pkgs/misc/emulators/dolphin-emu/default.nix | 6 +++--- pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 01e1847973c7..392f5618b6e5 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { wxGTK30 soundtouch miniupnpc mbedtls curl lzo sfml ]; meta = { - homepage = http://dolphin-emu.org/; - description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; - license = stdenv.lib.licenses.gpl2; + homepage = https://dolphin-emu.org/; + description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ MP2E ]; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 8717d9355d2b..68176ff427e3 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -71,9 +71,9 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://dolphin-emu.org"; - description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; - license = licenses.gpl2; + homepage = "https://dolphin-emu.org"; + description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ MP2E ]; branch = "master"; # x86_32 is an unsupported platform. From 962756e8183518e0d2fe2ac9a448b873a4d55ce0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 14 Oct 2018 22:09:36 -0500 Subject: [PATCH 744/992] emacs-mac: use generic builder this builder leads to confusion, especially since it is no longer used in the normal emacs derivation. --- pkgs/applications/editors/emacs/builder.sh | 40 --------------------- pkgs/applications/editors/emacs/macport.nix | 2 -- 2 files changed, 42 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/builder.sh diff --git a/pkgs/applications/editors/emacs/builder.sh b/pkgs/applications/editors/emacs/builder.sh deleted file mode 100644 index 545520cca7c0..000000000000 --- a/pkgs/applications/editors/emacs/builder.sh +++ /dev/null @@ -1,40 +0,0 @@ -source $stdenv/setup - -# This hook is supposed to be run on Linux. It patches the proper locations of -# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with -# *our* versions, not the ones found in the system, as it would do by default. -# On other platforms, this appears to be unnecessary. -preConfigure() { - ./autogen.sh - - for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do - substituteInPlace $i --replace /bin/pwd pwd - done - - case "${system}" in - x86_64-linux) glibclibdir=lib64 ;; - i686-linux) glibclibdir=lib ;; - *) return; - esac - - libc=$(cat ${NIX_CC}/nix-support/orig-libc) - echo "libc: $libc" - - for i in src/s/*.h src/m/*.h; do - substituteInPlace $i \ - --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \ - --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \ - --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \ - --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \ - --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \ - --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o - done -} - -preInstall () { - for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do - substituteInPlace $i --replace /bin/pwd pwd - done -} - -genericBuild diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index 71a41da57474..0876a71cbf73 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { macportVersion = "7.2"; name = "emacs-mac-${emacsVersion}-${macportVersion}"; - builder = ./builder.sh; - src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; From 975c9b57eb483e1bce1b5a97ea94e7b73bbb0d33 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Mon, 15 Oct 2018 15:04:43 +0900 Subject: [PATCH 745/992] gotop: 1.2.9 -> 1.5.0 (#48407) --- pkgs/tools/system/gotop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 0afdb28728c8..3aba05f7aefe 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gotop-${version}"; - version = "1.2.9"; + version = "1.5.0"; goPackagePath = "github.com/cjbassi/gotop"; @@ -10,7 +10,7 @@ buildGoPackage rec { repo = "gotop"; owner = "cjbassi"; rev = version; - sha256 = "07s2f04yhc79vqr1gdh2v974kpn7flp4slnp99mavpa331lv9q8a"; + sha256 = "19kj7mziwkfcf9kkwph05jh5vlkfqpyrpxdk5gdf2swg07w1ld35"; }; meta = with stdenv.lib; { From e4c54f1cc87e9099e7bb3ca432ecaba406bcf2aa Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 15 Oct 2018 01:14:26 -0500 Subject: [PATCH 746/992] termdown: 1.11.0 -> 1.14.1 (#48443) --- pkgs/applications/misc/termdown/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index 631fc08e95ee..65963f9aa34f 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; buildPythonApplication rec { name = "termdown-${version}"; - version = "1.11.0"; + version = "1.14.1"; src = fetchFromGitHub { - rev = "d1e3504e02ad49013595112cb03fbf175822e58d"; - sha256 = "1i6fxymg52q95n0cbm4imdxh6yvpj3q57yf7w9z5d9pr35cf1iq5"; + rev = version; + sha256 = "0jgjzglna0gwp0j31l48pny69szslczl13aahwjfjypkv9lx8w2a"; repo = "termdown"; owner = "trehn"; }; From 0d7ed1b771600b5fc66ff650dee5a435054a0465 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 13 Oct 2018 19:18:55 +0200 Subject: [PATCH 747/992] spectmorph: init at 0.4.1 --- .../applications/audio/spectmorph/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/audio/spectmorph/default.nix diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix new file mode 100644 index 000000000000..9557770418e8 --- /dev/null +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }: + +stdenv.mkDerivation rec { + name = "spectmorph-${version}"; + version = "0.4.1"; + src = fetchurl { + url = "http://spectmorph.org/files/releases/${name}.tar.bz2"; + sha256 = "0z00yvv3jl8qsx6bz9msmg09mdnj5r5d4ws5bmnylwxk182whbrv"; + }; + + buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds"; + homepage = http://spectmorph.org; + license = licenses.gpl3; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.magnetophon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eaed48e6d9fd..124c9f36e532 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17124,6 +17124,8 @@ with pkgs; singularity = callPackage ../applications/virtualization/singularity { }; + spectmorph = callPackage ../applications/audio/spectmorph { }; + spectrwm = callPackage ../applications/window-managers/spectrwm { }; spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; From 3653909bb94711ab83e8fbc36976873e3a594cab Mon Sep 17 00:00:00 2001 From: ryan4729 Date: Mon, 15 Oct 2018 00:22:24 -0700 Subject: [PATCH 748/992] protobuf3: support cross compilation Provide a native c compiler, which, and protoc --- pkgs/development/libraries/protobuf/3.1.nix | 4 ++- pkgs/development/libraries/protobuf/3.4.nix | 4 ++- pkgs/development/libraries/protobuf/3.5.nix | 4 ++- pkgs/development/libraries/protobuf/3.6.nix | 4 ++- .../libraries/protobuf/generic-v3.nix | 9 ++++-- pkgs/top-level/all-packages.nix | 28 ++++++++++++++++--- 6 files changed, 43 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix index 91ef87512c84..2af2d547d70b 100644 --- a/pkgs/development/libraries/protobuf/3.1.nix +++ b/pkgs/development/libraries/protobuf/3.1.nix @@ -1,6 +1,8 @@ -{ callPackage, ... }: +{ callPackage, externalProtoc, buildProtobuf, ... }: callPackage ./generic-v3.nix { version = "3.1.0"; sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; + externalProtoc = externalProtoc; + buildProtobuf = buildProtobuf; } diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix index 5a9034a56a80..c7e4153b2bc1 100644 --- a/pkgs/development/libraries/protobuf/3.4.nix +++ b/pkgs/development/libraries/protobuf/3.4.nix @@ -1,6 +1,8 @@ -{ callPackage, lib, ... }: +{ callPackage, lib, externalProtoc, buildProtobuf, ... }: lib.overrideDerivation (callPackage ./generic-v3.nix { version = "3.4.1"; sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; + externalProtoc = externalProtoc; + buildProtobuf = buildProtobuf; }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix index db9cb6f0371b..2313067a2ac9 100644 --- a/pkgs/development/libraries/protobuf/3.5.nix +++ b/pkgs/development/libraries/protobuf/3.5.nix @@ -1,6 +1,8 @@ -{ callPackage, lib, ... }: +{ callPackage, lib, externalProtoc, buildProtobuf, ... }: lib.overrideDerivation (callPackage ./generic-v3.nix { version = "3.5.1.1"; sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; + externalProtoc = externalProtoc; + buildProtobuf = buildProtobuf; }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix index 0009209d9cef..b52cbbfe06e0 100644 --- a/pkgs/development/libraries/protobuf/3.6.nix +++ b/pkgs/development/libraries/protobuf/3.6.nix @@ -1,6 +1,8 @@ -{ callPackage, ... }: +{ callPackage, externalProtoc, buildProtobuf, ... }: callPackage ./generic-v3.nix { version = "3.6.1"; sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq"; + externalProtoc = externalProtoc; + buildProtobuf = buildProtobuf; } diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 79e4c387cdf5..c810558a070b 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,6 +1,8 @@ { stdenv , fetchFromGitHub -, autoreconfHook, zlib, gmock +, autoreconfHook, zlib, gmock, which, buildPackages +, externalProtoc +, buildProtobuf ? null , version, sha256 , ... }: @@ -28,8 +30,11 @@ stdenv.mkDerivation rec { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ] + ++ stdenv.lib.optional externalProtoc [ buildProtobuf ]; + buildInputs = [ zlib ]; + configureFlags = stdenv.lib.optional externalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 124c9f36e532..6fff2cd66f0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11726,10 +11726,30 @@ with pkgs; protobuf = protobuf3_6; - protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; - protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; - protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { }; - protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; + protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { + externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); + buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) + then buildPackages.protobuf3_6 + else null; + }; + protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { + externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); + buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) + then buildPackages.protobuf3_5 + else null; + }; + protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { + externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); + buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) + then buildPackages.protobuf3_4 + else null; + }; + protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { + externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); + buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) + then buildPackages.protobuf3_1 + else null; + }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; From f4541316be0be32f4e3f36a34b60ab28b89bcb97 Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Mon, 15 Oct 2018 10:22:54 +0200 Subject: [PATCH 749/992] staruml: fix download URL --- pkgs/tools/misc/staruml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 486634452ae9..a7518625771f 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb"; + url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-32-bit.deb"; sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n"; } else fetchurl { - url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb"; + url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-64-bit.deb"; sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0"; }; From 1a3ae02e669f63fd3951bd40b41e75dbe09d516f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 15 Oct 2018 10:25:20 +0200 Subject: [PATCH 750/992] pythonPackages.emoji: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 2c3b7cc05523..019c29d79cd4 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "emoji"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "001b92b9c8a157e1ca49187745fa450513bc8b31c87328dfd83d674b9d7dfa63"; + sha256 = "0gmdcdvh21v33ldg8kbxi7lph7znl2zdz1ic45100z4hx65w1sd9"; }; checkInputs = [ nose ]; From ff473c9ec7aeaec73058b5f2a171dfed7d47c811 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 15 Oct 2018 10:31:10 +0200 Subject: [PATCH 751/992] pythonPackages.jsonrpclib: move expression to python-modules --- .../python-modules/jsonrpclib/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 21 +----------------- 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/jsonrpclib/default.nix diff --git a/pkgs/development/python-modules/jsonrpclib/default.nix b/pkgs/development/python-modules/jsonrpclib/default.nix new file mode 100644 index 000000000000..9f3efdf627ef --- /dev/null +++ b/pkgs/development/python-modules/jsonrpclib/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, cjson }: + +buildPythonPackage rec { + pname = "jsonrpclib"; + version = "0.1.7"; + + disabled = !isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; + }; + + propagatedBuildInputs = [ cjson ]; + + meta = { + description = "JSON RPC client library"; + homepage = https://pypi.python.org/pypi/jsonrpclib/; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.joachifm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 116226428239..8fb12c45036b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2835,26 +2835,7 @@ in { }; }; - jsonrpclib = buildPythonPackage rec { - name = "jsonrpclib-${version}"; - version = "0.1.7"; - - disabled = !isPy27; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jsonrpclib/${name}.tar.gz"; - sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; - }; - - propagatedBuildInputs = with self; [ cjson ]; - - meta = { - description = "JSON RPC client library"; - homepage = https://pypi.python.org/pypi/jsonrpclib/; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.joachifm ]; - }; - }; + jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {}; From 12ededf3d84dc3b4e1cf4845655c56fabfc8d5d2 Mon Sep 17 00:00:00 2001 From: ryan4729 Date: Mon, 15 Oct 2018 01:57:47 -0700 Subject: [PATCH 752/992] protobuf3: fix parameter naming --- pkgs/development/libraries/protobuf/3.1.nix | 5 ++--- pkgs/development/libraries/protobuf/3.4.nix | 5 ++--- pkgs/development/libraries/protobuf/3.5.nix | 5 ++--- pkgs/development/libraries/protobuf/3.6.nix | 5 ++--- pkgs/development/libraries/protobuf/generic-v3.nix | 6 +++--- pkgs/top-level/all-packages.nix | 8 ++++---- 6 files changed, 15 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix index 2af2d547d70b..79e3711ff104 100644 --- a/pkgs/development/libraries/protobuf/3.1.nix +++ b/pkgs/development/libraries/protobuf/3.1.nix @@ -1,8 +1,7 @@ -{ callPackage, externalProtoc, buildProtobuf, ... }: +{ callPackage, useExternalProtoc, buildProtobuf, ... }: callPackage ./generic-v3.nix { version = "3.1.0"; sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; - externalProtoc = externalProtoc; - buildProtobuf = buildProtobuf; + inherit useExternalProtoc buildProtobuf; } diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix index c7e4153b2bc1..a80517250f5d 100644 --- a/pkgs/development/libraries/protobuf/3.4.nix +++ b/pkgs/development/libraries/protobuf/3.4.nix @@ -1,8 +1,7 @@ -{ callPackage, lib, externalProtoc, buildProtobuf, ... }: +{ callPackage, lib, useExternalProtoc, buildProtobuf, ... }: lib.overrideDerivation (callPackage ./generic-v3.nix { version = "3.4.1"; sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; - externalProtoc = externalProtoc; - buildProtobuf = buildProtobuf; + inherit useExternalProtoc buildProtobuf; }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix index 2313067a2ac9..8558e60a5e86 100644 --- a/pkgs/development/libraries/protobuf/3.5.nix +++ b/pkgs/development/libraries/protobuf/3.5.nix @@ -1,8 +1,7 @@ -{ callPackage, lib, externalProtoc, buildProtobuf, ... }: +{ callPackage, lib, useExternalProtoc, buildProtobuf, ... }: lib.overrideDerivation (callPackage ./generic-v3.nix { version = "3.5.1.1"; sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; - externalProtoc = externalProtoc; - buildProtobuf = buildProtobuf; + inherit useExternalProtoc buildProtobuf; }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix index b52cbbfe06e0..a3fac7eb0641 100644 --- a/pkgs/development/libraries/protobuf/3.6.nix +++ b/pkgs/development/libraries/protobuf/3.6.nix @@ -1,8 +1,7 @@ -{ callPackage, externalProtoc, buildProtobuf, ... }: +{ callPackage, useExternalProtoc, buildProtobuf, ... }: callPackage ./generic-v3.nix { version = "3.6.1"; sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq"; - externalProtoc = externalProtoc; - buildProtobuf = buildProtobuf; + inherit useExternalProtoc buildProtobuf; } diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index c810558a070b..3db4571d8bad 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , autoreconfHook, zlib, gmock, which, buildPackages -, externalProtoc +, useExternalProtoc , buildProtobuf ? null , version, sha256 , ... @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ] - ++ stdenv.lib.optional externalProtoc [ buildProtobuf ]; + ++ stdenv.lib.optional useExternalProtoc [ buildProtobuf ]; buildInputs = [ zlib ]; - configureFlags = stdenv.lib.optional externalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ]; + configureFlags = stdenv.lib.optional useExternalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fff2cd66f0a..65e11ac65325 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11727,25 +11727,25 @@ with pkgs; protobuf = protobuf3_6; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { - externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); + useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) then buildPackages.protobuf3_6 else null; }; protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { - externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); + useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) then buildPackages.protobuf3_5 else null; }; protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { - externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); + useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) then buildPackages.protobuf3_4 else null; }; protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { - externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); + useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) then buildPackages.protobuf3_1 else null; From 7d20acdbcd6311d4ec86b8665b535320b409fa57 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 9 Oct 2018 16:50:55 +0900 Subject: [PATCH 753/992] apvlv: add .desktop file --- pkgs/applications/misc/apvlv/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index eb35eb9cf73b..2d9ea5e3574b 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { mkdir -p $out/share/doc/apvlv/ cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade + '' + + stdenv.lib.optionalString (!stdenv.isDarwin) '' + install -D ../apvlv.desktop $out/share/applications/apvlv.desktop ''; meta = with stdenv.lib; { From 069bf7aee30faf7b3ed773cfae2154d761b2d6c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2018 11:55:19 +0200 Subject: [PATCH 754/992] ghc: add new 8.4.4 version --- pkgs/development/compilers/ghc/8.4.4.nix | 247 +++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 10 + 2 files changed, 257 insertions(+) create mode 100644 pkgs/development/compilers/ghc/8.4.4.nix diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix new file mode 100644 index 000000000000..0588d7fba921 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -0,0 +1,247 @@ +{ stdenv, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4 + +, libiconv ? null, ncurses + +, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whetherto build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" +, # Whether to backport https://phabricator.haskell.org/D4388 for + # deterministic profiling symbol names, at the cost of a slightly + # non-standard GHC API + deterministicProfiling ? false +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation (rec { + version = "8.4.4"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [(fetchpatch { + url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf"; + sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; + extraPrefix = "utils/hsc2hs/"; + stripLen = 1; + }) (fetchpatch rec { # https://phabricator.haskell.org/D5123 + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D5123.diff"; + sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; + })] ++ stdenv.lib.optional deterministicProfiling + (fetchpatch rec { + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D4388.diff"; + sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s"; + }) + ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = libDeps hostPlatform; + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ]; + + postInstall = '' + for bin in "$out"/lib/${name}/bin/*; do + isELF "$bin" || continue + paxmark m "$bin" + done + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.4.4"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6bdcaf49af91..e654b35d258d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -69,6 +69,11 @@ in { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; + ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { + bootPkgs = packages.ghc821Binary; + buildLlvmPackages = buildPackages.llvmPackages_5; + llvmPackages = pkgs.llvmPackages_5; + }; ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix { bootPkgs = packages.ghc822; buildLlvmPackages = buildPackages.llvmPackages_6; @@ -153,6 +158,11 @@ in { ghc = bh.compiler.ghc843; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; }; + ghc844 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc844; + ghc = bh.compiler.ghc844; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; + }; ghc861 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc861; ghc = bh.compiler.ghc861; From 1f9188b708da7d2ea973a840ac086e6542ed0d2a Mon Sep 17 00:00:00 2001 From: ryan4729 Date: Mon, 15 Oct 2018 03:01:29 -0700 Subject: [PATCH 755/992] protobuf3: clean up cross compile --- pkgs/development/libraries/protobuf/3.1.nix | 3 +- pkgs/development/libraries/protobuf/3.4.nix | 3 +- pkgs/development/libraries/protobuf/3.5.nix | 3 +- pkgs/development/libraries/protobuf/3.6.nix | 3 +- .../libraries/protobuf/generic-v3.nix | 14 ++++++---- pkgs/top-level/all-packages.nix | 28 +++---------------- 6 files changed, 16 insertions(+), 38 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix index 79e3711ff104..91ef87512c84 100644 --- a/pkgs/development/libraries/protobuf/3.1.nix +++ b/pkgs/development/libraries/protobuf/3.1.nix @@ -1,7 +1,6 @@ -{ callPackage, useExternalProtoc, buildProtobuf, ... }: +{ callPackage, ... }: callPackage ./generic-v3.nix { version = "3.1.0"; sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; - inherit useExternalProtoc buildProtobuf; } diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix index a80517250f5d..5a9034a56a80 100644 --- a/pkgs/development/libraries/protobuf/3.4.nix +++ b/pkgs/development/libraries/protobuf/3.4.nix @@ -1,7 +1,6 @@ -{ callPackage, lib, useExternalProtoc, buildProtobuf, ... }: +{ callPackage, lib, ... }: lib.overrideDerivation (callPackage ./generic-v3.nix { version = "3.4.1"; sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; - inherit useExternalProtoc buildProtobuf; }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix index 8558e60a5e86..db9cb6f0371b 100644 --- a/pkgs/development/libraries/protobuf/3.5.nix +++ b/pkgs/development/libraries/protobuf/3.5.nix @@ -1,7 +1,6 @@ -{ callPackage, lib, useExternalProtoc, buildProtobuf, ... }: +{ callPackage, lib, ... }: lib.overrideDerivation (callPackage ./generic-v3.nix { version = "3.5.1.1"; sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; - inherit useExternalProtoc buildProtobuf; }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix index a3fac7eb0641..0009209d9cef 100644 --- a/pkgs/development/libraries/protobuf/3.6.nix +++ b/pkgs/development/libraries/protobuf/3.6.nix @@ -1,7 +1,6 @@ -{ callPackage, useExternalProtoc, buildProtobuf, ... }: +{ callPackage, ... }: callPackage ./generic-v3.nix { version = "3.6.1"; sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq"; - inherit useExternalProtoc buildProtobuf; } diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 3db4571d8bad..43e5e5d799d1 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,13 +1,12 @@ { stdenv , fetchFromGitHub , autoreconfHook, zlib, gmock, which, buildPackages -, useExternalProtoc -, buildProtobuf ? null , version, sha256 , ... }: -stdenv.mkDerivation rec { +let +mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { name = "protobuf-${version}"; # make sure you test also -A pythonPackages.protobuf @@ -31,10 +30,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ] - ++ stdenv.lib.optional useExternalProtoc [ buildProtobuf ]; + ++ (if buildProtobuf == null then [] else [ buildProtobuf ]); buildInputs = [ zlib ]; - configureFlags = stdenv.lib.optional useExternalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ]; + configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ]; enableParallelBuilding = true; @@ -59,4 +58,7 @@ stdenv.mkDerivation rec { }; passthru.version = version; -} +}; +in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform) + then (mkProtobufDerivation null buildPackages.stdenv) + else null) stdenv diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65e11ac65325..124c9f36e532 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11726,30 +11726,10 @@ with pkgs; protobuf = protobuf3_6; - protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { - useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); - buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) - then buildPackages.protobuf3_6 - else null; - }; - protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { - useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); - buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) - then buildPackages.protobuf3_5 - else null; - }; - protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { - useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); - buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) - then buildPackages.protobuf3_4 - else null; - }; - protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { - useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); - buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) - then buildPackages.protobuf3_1 - else null; - }; + protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; + protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; + protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { }; + protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; From ad6ee9c61f2263334ece09830335002ee3d7f4b0 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 15 Oct 2018 19:10:30 +0900 Subject: [PATCH 756/992] python3Packages.cmd2: 0.9.4 -> 0.9.6 --- .../python-modules/cmd2/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 4217d193cfea..019ab4e6cdd8 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k , pyperclip, six, pyparsing, vim, wcwidth, colorama -, contextlib2 ? null, setuptools_scm -, pytest, mock, which, glibcLocales +, contextlib2 ? null, typing ? null, setuptools_scm +, pytest, mock ? null, pytest-mock +, which, glibcLocales }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.4"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "0037dcf92331c63ae43e7e644536e646fff8be2fd5a83da06b3482f910f929c6"; + sha256 = "0279p76n6yny6psys9fc6yjdrqiisbpmrl59a2vxy56hi7094kaw"; }; LC_ALL="en_US.UTF-8"; @@ -23,12 +24,6 @@ buildPythonPackage rec { export PATH=$(realpath bin):$PATH ''; - checkInputs= [ pytest mock which vim glibcLocales ]; - checkPhase = '' - # test_path_completion_user_expansion might be fixed in the next release - py.test -k 'not test_path_completion_user_expansion' - ''; - doCheck = !stdenv.isDarwin; disabled = !isPy3k; buildInputs = [ @@ -42,9 +37,20 @@ buildPythonPackage rec { pyparsing wcwidth ] - ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 + ++ stdenv.lib.optionals (pythonOlder "3.5") [contextlib2 typing] ; + + doCheck = !stdenv.isDarwin; + # pytest-cov + # argcomplete will generate errors + checkInputs= [ pytest mock which vim glibcLocales pytest-mock ] + ++ stdenv.lib.optional (pythonOlder "3.6") [ mock ]; + checkPhase = '' + # test_path_completion_user_expansion might be fixed in the next release + py.test -k 'not test_path_completion_user_expansion' + ''; + meta = with stdenv.lib; { description = "Enhancements for standard library's cmd module"; homepage = https://github.com/python-cmd2/cmd2; From 65a81afcf5ef9bc96c21089b370bece300849977 Mon Sep 17 00:00:00 2001 From: ryan4729 Date: Mon, 15 Oct 2018 03:13:20 -0700 Subject: [PATCH 757/992] protobuf3: remove unnecessary null check --- pkgs/development/libraries/protobuf/generic-v3.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 43e5e5d799d1..883dff56f2ee 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -29,8 +29,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ] - ++ (if buildProtobuf == null then [] else [ buildProtobuf ]); + nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ]; buildInputs = [ zlib ]; configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ]; From 08cc85951e09135fb3c1ba1e0c043051381df8b4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 15 Oct 2018 13:28:24 +0300 Subject: [PATCH 758/992] saga: add mpickering as a co-maintainer after #39125 --- pkgs/applications/gis/saga/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 10cec193cc0d..4738bfba14a8 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "System for Automated Geoscientific Analyses"; homepage = http://www.saga-gis.org; license = licenses.gpl2Plus; - maintainers = [ maintainers.michelk ]; + maintainers = with maintainers; [ michelk mpickering ]; platforms = with platforms; unix; }; } From e04931e0190beeae354c753350dbf6d802a1eac7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Oct 2018 16:16:06 +0200 Subject: [PATCH 759/992] LTS Haskell 12.13 --- .../configuration-hackage2nix.yaml | 57 ++++++++++--------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f68270ba772e..012afc545ab6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -45,7 +45,7 @@ default-package-overrides: - base-compat-batteries ==0.10.1 # Newer versions don't work in LTS-12.x - cassava-megaparsec < 2 - # LTS Haskell 12.12 + # LTS Haskell 12.13 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -313,7 +313,7 @@ default-package-overrides: - bson ==0.3.2.6 - bson-lens ==0.1.1 - btrfs ==0.1.2.3 - - buffer-builder ==0.2.4.6 + - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 - butcher ==1.3.2.0 - butter ==0.1.0.6 @@ -354,7 +354,7 @@ default-package-overrides: - cast ==0.1.0.2 - category ==0.2.0.1 - cayley-client ==0.4.7 - - cborg ==0.2.0.0 + - cborg ==0.2.1.0 - cereal ==0.5.7.0 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 @@ -439,7 +439,7 @@ default-package-overrides: - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.3.0.3 + - conduit ==1.3.1 - conduit-algorithms ==0.0.8.2 - conduit-combinators ==1.3.0 - conduit-connection ==0.1.0.4 @@ -461,6 +461,7 @@ default-package-overrides: - contravariant ==1.4.1 - contravariant-extras ==0.3.4 - control-bool ==0.2.1 + - control-dsl ==0.2.1.1 - control-monad-free ==0.6.2 - control-monad-omega ==0.3.1 - convertible ==1.1.1.0 @@ -516,7 +517,7 @@ default-package-overrides: - currency ==0.2.0.0 - cutter ==0.0 - cyclotomic ==0.5.1 - - czipwith ==1.0.1.0 + - czipwith ==1.0.1.1 - darcs ==2.14.1 - data-accessor ==0.2.2.8 - data-accessor-mtl ==0.2.0.4 @@ -587,7 +588,7 @@ default-package-overrides: - diagrams-html5 ==1.4.1 - diagrams-lib ==1.4.2.3 - diagrams-postscript ==1.4.1 - - diagrams-rasterific ==1.4.1 + - diagrams-rasterific ==1.4.1.1 - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.2 - di-core ==1.0.3 @@ -813,7 +814,7 @@ default-package-overrides: - genvalidity-property ==0.2.1.1 - genvalidity-scientific ==0.2.1.0 - genvalidity-text ==0.5.1.0 - - genvalidity-time ==0.2.1.0 + - genvalidity-time ==0.2.1.1 - genvalidity-unordered-containers ==0.2.0.3 - genvalidity-uuid ==0.1.0.2 - genvalidity-vector ==0.2.0.2 @@ -905,8 +906,8 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.3.1 - haskeline ==0.7.4.3 - - haskell-gi ==0.21.4 - - haskell-gi-base ==0.21.3 + - haskell-gi ==0.21.5 + - haskell-gi-base ==0.21.4 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.0.2 - haskell-lsp ==0.2.2.0 @@ -1003,8 +1004,8 @@ default-package-overrides: - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 + - HSet ==0.0.1 - hsexif ==0.6.1.6 - hs-functors ==0.1.3.0 - hs-GeoIP ==0.3 @@ -1266,7 +1267,7 @@ default-package-overrides: - llvm-hs-pretty ==0.5.0.0 - llvm-hs-pure ==6.2.1 - lmdb ==0.2.5 - - load-env ==0.2.0.1 + - load-env ==0.2.0.2 - locators ==0.2.4.4 - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 @@ -1339,7 +1340,7 @@ default-package-overrides: - microstache ==1.0.1.1 - midi ==0.2.2.2 - mighty-metropolis ==1.2.0 - - milena ==0.5.2.2 + - milena ==0.5.2.3 - mime-mail ==0.4.14 - mime-mail-ses ==0.4.1 - mime-types ==0.1.0.8 @@ -1502,7 +1503,7 @@ default-package-overrides: - OpenGL ==3.0.2.2 - OpenGLRaw ==3.3.1.0 - openpgp-asciiarmor ==0.1.1 - - opensource ==0.1.0.0 + - opensource ==0.1.1.0 - openssl-streams ==1.2.1.3 - open-witness ==0.4.0.1 - operational ==0.2.3.5 @@ -1655,7 +1656,7 @@ default-package-overrides: - proto-lens ==0.3.1.0 - proto-lens-arbitrary ==0.1.2.2 - proto-lens-combinators ==0.1.0.11 - - proto-lens-optparse ==0.1.1.3 + - proto-lens-optparse ==0.1.1.4 - proto-lens-protobuf-types ==0.3.0.1 - proto-lens-protoc ==0.3.1.2 - protolude ==0.2.2 @@ -1695,7 +1696,7 @@ default-package-overrides: - rank1dynamic ==0.4.0 - rank2classes ==1.1.0.1 - Rasterific ==0.7.4 - - rasterific-svg ==0.3.3.1 + - rasterific-svg ==0.3.3.2 - ratel ==1.0.5 - ratel-wai ==1.0.3 - ratio-int ==0.1.2 @@ -1747,7 +1748,7 @@ default-package-overrides: - reroute ==0.5.0.0 - resolv ==0.1.1.1 - resource-pool ==0.2.3.2 - - resourcet ==1.2.1 + - resourcet ==1.2.2 - rest-stringmap ==0.2.0.7 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 @@ -1775,7 +1776,7 @@ default-package-overrides: - safeio ==0.0.5.0 - safe-money ==0.6 - SafeSemaphore ==0.10.1 - - saltine ==0.1.0.1 + - saltine ==0.1.0.2 - salve ==1.0.6 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 @@ -1784,8 +1785,8 @@ default-package-overrides: - sandman ==0.2.0.1 - say ==0.1.0.1 - sbp ==2.3.17 - - scalendar ==1.2.0 - SCalendar ==1.1.0 + - scalendar ==1.2.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1881,8 +1882,8 @@ default-package-overrides: - siphash ==1.0.3 - size-based ==0.1.1.0 - skein ==1.0.9.4 - - skylighting ==0.7.3 - - skylighting-core ==0.7.3 + - skylighting ==0.7.4 + - skylighting-core ==0.7.4 - slack-web ==0.2.0.6 - slave-thread ==1.0.2 - smallcheck ==1.1.5 @@ -1931,7 +1932,7 @@ default-package-overrides: - statestack ==0.2.0.5 - StateVar ==1.1.1.1 - static-canvas ==0.2.0.3 - - static-text ==0.2.0.2 + - static-text ==0.2.0.3 - statistics ==0.14.0.2 - stb-image-redux ==0.2.1.2 - step-function ==0.2 @@ -1964,7 +1965,7 @@ default-package-overrides: - streams ==3.3 - strict ==0.3.2 - strict-base-types ==0.6.1 - - strict-concurrency ==0.2.4.2 + - strict-concurrency ==0.2.4.3 - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 @@ -1981,7 +1982,7 @@ default-package-overrides: - superbuffer ==0.3.1.1 - svg-builder ==0.1.1 - SVGFonts ==1.7 - - svg-tree ==0.6.2.2 + - svg-tree ==0.6.2.3 - swagger ==0.3.0 - swagger2 ==2.2.2 - swish ==0.9.2.1 @@ -2006,7 +2007,7 @@ default-package-overrides: - tar ==0.5.1.0 - tar-conduit ==0.2.5 - tardis ==0.4.1.0 - - tasty ==1.1.0.3 + - tasty ==1.1.0.4 - tasty-ant-xml ==1.1.4 - tasty-dejafu ==1.2.0.7 - tasty-discover ==4.2.1 @@ -2074,7 +2075,7 @@ default-package-overrides: - thread-local-storage ==0.2 - threads ==0.5.1.6 - threads-extras ==0.1.0.2 - - threepenny-gui ==0.8.2.4 + - threepenny-gui ==0.8.3.0 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.8 - throttle-io-stream ==0.2.0.1 @@ -2174,7 +2175,7 @@ default-package-overrides: - unordered-containers ==0.2.9.0 - unordered-intmap ==0.1.1 - unsafe ==0.0 - - uri-bytestring ==0.3.2.0 + - uri-bytestring ==0.3.2.1 - uri-encode ==1.5.0.5 - uri-templater ==0.3.1.0 - urlpath ==9.0.0 @@ -2339,7 +2340,7 @@ default-package-overrides: - yesod-auth-fb ==1.9.1 - yesod-auth-hashdb ==1.7 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.6 + - yesod-core ==1.6.8 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 @@ -2360,7 +2361,7 @@ default-package-overrides: - yi-language ==0.17.1 - yi-rope ==0.11 - yjtools ==0.9.18 - - yoga ==0.0.0.2 + - yoga ==0.0.0.5 - youtube ==0.2.1.1 - zero ==0.1.4 - zeromq4-haskell ==0.7.0 From 5dbe6ac45b94877c6baaa5d1cd9d00dc70f97663 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2018 12:33:13 +0200 Subject: [PATCH 760/992] hackage2nix: disable failing Hydra builds --- .../configuration-hackage2nix.yaml | 72 +++++++++++++++++-- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 012afc545ab6..8b469e6c0f5e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2886,13 +2886,14 @@ dont-distribute-packages: ArrowVHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] artery: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii-flatten: [ i686-linux, x86_64-linux, x86_64-darwin ] - ascii-string: [ i686-linux, x86_64-linux, x86_64-darwin ] + ascii-string: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii-table: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] asciidiagram: [ i686-linux, x86_64-linux, x86_64-darwin ] asic: [ i686-linux, x86_64-linux, x86_64-darwin ] + asif: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ] asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] asn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2905,7 +2906,7 @@ dont-distribute-packages: ast-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] astview: [ i686-linux, x86_64-linux, x86_64-darwin ] - async-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] + async-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] async-dejafu: [ i686-linux, x86_64-linux, x86_64-darwin ] async-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] asynchronous-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2931,11 +2932,13 @@ dont-distribute-packages: attoparsec-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-data: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-time: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-varword: [ i686-linux, x86_64-linux, x86_64-darwin ] attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ] Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2945,7 +2948,7 @@ dont-distribute-packages: augur: [ i686-linux, x86_64-linux, x86_64-darwin ] aur-api: [ i686-linux, x86_64-linux, x86_64-darwin ] aur: [ i686-linux, x86_64-linux, x86_64-darwin ] - aura: [ i686-linux, x86_64-linux, x86_64-darwin ] + aura: [ i686-linux, x86_64-linux, x86_64-darwin ] Aurochs: [ i686-linux, x86_64-linux, x86_64-darwin ] authenticate-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] authoring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2987,7 +2990,7 @@ dont-distribute-packages: aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] - axel: [ i686-linux, x86_64-linux, x86_64-darwin ] + axel: [ i686-linux, x86_64-linux, x86_64-darwin ] axiom: [ i686-linux, x86_64-linux, x86_64-darwin ] azubi: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3024,6 +3027,7 @@ dont-distribute-packages: base-feature-macros: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] baserock-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3050,6 +3054,7 @@ dont-distribute-packages: bein: [ i686-linux, x86_64-linux, x86_64-darwin ] belka: [ i686-linux, x86_64-linux, x86_64-darwin ] bench-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + bench-show: [ i686-linux, x86_64-linux, x86_64-darwin ] BenchmarkHistory: [ i686-linux, x86_64-linux, x86_64-darwin ] benchpress: [ i686-linux, x86_64-linux, x86_64-darwin ] bencoding: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3287,6 +3292,7 @@ dont-distribute-packages: c2ats: [ i686-linux, x86_64-linux, x86_64-darwin ] c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-cargs: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-db: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3355,6 +3361,7 @@ dont-distribute-packages: cao: [ i686-linux, x86_64-linux, x86_64-darwin ] cap: [ i686-linux, x86_64-linux, x86_64-darwin ] Capabilities: [ i686-linux, x86_64-linux, x86_64-darwin ] + capability: [ i686-linux, x86_64-linux, x86_64-darwin ] capnp: [ i686-linux, x86_64-linux, x86_64-darwin ] capped-list: [ i686-linux, x86_64-linux, x86_64-darwin ] capri: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3499,6 +3506,7 @@ dont-distribute-packages: clash-verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] clash: [ i686-linux, x86_64-linux, x86_64-darwin ] + classify-frog: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-miso: [ i686-linux, x86_64-linux, x86_64-darwin ] classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3560,6 +3568,7 @@ dont-distribute-packages: CMQ: [ i686-linux, x86_64-linux, x86_64-darwin ] cmv: [ i686-linux, x86_64-linux, x86_64-darwin ] cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] + co-log: [ i686-linux, x86_64-linux, x86_64-darwin ] Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-beam: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3702,6 +3711,7 @@ dont-distribute-packages: context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] ContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] contiguous-checked: [ i686-linux, x86_64-linux, x86_64-darwin ] + contiguous-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] contiguous: [ i686-linux, x86_64-linux, x86_64-darwin ] continue: [ i686-linux, x86_64-linux, x86_64-darwin ] continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3827,6 +3837,8 @@ dont-distribute-packages: CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] curryrs: [ i686-linux, x86_64-linux, x86_64-darwin ] cursedcsv: [ i686-linux, x86_64-linux, x86_64-darwin ] + cursor-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] + cursor: [ i686-linux, x86_64-linux, x86_64-darwin ] curve25519: [ i686-linux, x86_64-linux, x86_64-darwin ] curves: [ i686-linux, x86_64-linux, x86_64-darwin ] custom-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3914,6 +3926,7 @@ dont-distribute-packages: datetime: [ i686-linux, x86_64-linux, x86_64-darwin ] dawdle: [ i686-linux, x86_64-linux, x86_64-darwin ] dbcleaner: [ i686-linux, x86_64-linux, x86_64-darwin ] + DBFunctor: [ i686-linux, x86_64-linux, x86_64-darwin ] dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ] DBlimited: [ i686-linux, x86_64-linux, x86_64-darwin ] dbm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4011,6 +4024,7 @@ dont-distribute-packages: dgim: [ i686-linux, x86_64-linux, x86_64-darwin ] dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ] + dhall-lex: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-to-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] di-df1: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4263,6 +4277,7 @@ dont-distribute-packages: engine-io: [ i686-linux, x86_64-linux, x86_64-darwin ] entangle: [ i686-linux, x86_64-linux, x86_64-darwin ] EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] + entwine: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerate-function: [ i686-linux, x86_64-linux, x86_64-darwin ] enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4349,8 +4364,10 @@ dont-distribute-packages: exif: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] + exinst-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] + exinst-serialise: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ i686-linux, x86_64-linux, x86_64-darwin ] exitcode: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4365,6 +4382,8 @@ dont-distribute-packages: explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] explore: [ i686-linux, x86_64-linux, x86_64-darwin ] exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ] + expressions: [ i686-linux, x86_64-linux, x86_64-darwin ] extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4577,6 +4596,7 @@ dont-distribute-packages: fractals: [ i686-linux, x86_64-linux, x86_64-darwin ] frag: [ i686-linux, x86_64-linux, x86_64-darwin ] Frames-beam: [ i686-linux, x86_64-linux, x86_64-darwin ] + Frames-dsv: [ i686-linux, x86_64-linux, x86_64-darwin ] Frames: [ i686-linux, x86_64-linux, x86_64-darwin ] franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5054,6 +5074,7 @@ dont-distribute-packages: graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphmod-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] graql: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5196,6 +5217,7 @@ dont-distribute-packages: hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-dhall: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-shortcode: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5208,6 +5230,7 @@ dont-distribute-packages: halma-telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] halma: [ i686-linux, x86_64-linux, x86_64-darwin ] halves: [ i686-linux, x86_64-linux, x86_64-darwin ] + hamilton: [ i686-linux, x86_64-linux, x86_64-darwin ] HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5311,6 +5334,8 @@ dont-distribute-packages: haskell-abci: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-aliyun: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-awk: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-bitmex-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-bitmex-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5567,6 +5592,7 @@ dont-distribute-packages: heterolist: [ i686-linux, x86_64-linux, x86_64-darwin ] hetris: [ i686-linux, x86_64-linux, x86_64-darwin ] heukarya: [ i686-linux, x86_64-linux, x86_64-darwin ] + hevm: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ] hexchat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5691,6 +5717,8 @@ dont-distribute-packages: HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-iadd: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5716,6 +5744,7 @@ dont-distribute-packages: hmatrix-sundials: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-vector-sized: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5840,6 +5869,7 @@ dont-distribute-packages: HRay: [ i686-linux, x86_64-linux, x86_64-darwin ] Hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] + hriemann: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-core: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-graf: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-hist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5954,6 +5984,7 @@ dont-distribute-packages: hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] HsParrot: [ i686-linux, x86_64-linux, x86_64-darwin ] hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-dirstream: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-match: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6079,6 +6110,7 @@ dont-distribute-packages: hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-dsv: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-prim-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6255,6 +6287,8 @@ dont-distribute-packages: introduction: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] + invertible-hxt: [ i686-linux, x86_64-linux, x86_64-darwin ] + invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] IOR: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6263,6 +6297,7 @@ dont-distribute-packages: iothread: [ i686-linux, x86_64-linux, x86_64-darwin ] iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] ip2location: [ i686-linux, x86_64-linux, x86_64-darwin ] + ip: [ i686-linux, x86_64-linux, x86_64-darwin ] ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ] ipc: [ i686-linux, x86_64-linux, x86_64-darwin ] ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6425,6 +6460,7 @@ dont-distribute-packages: katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] + kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] keccak: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6647,6 +6683,7 @@ dont-distribute-packages: libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] licensor: [ i686-linux, x86_64-linux, x86_64-darwin ] + life-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] lifted-base-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] lifted-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6871,6 +6908,7 @@ dont-distribute-packages: markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] marked-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] markov-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] + markup: [ i686-linux, x86_64-linux, x86_64-darwin ] marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] marquise: [ i686-linux, x86_64-linux, x86_64-darwin ] mars: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6992,6 +7030,7 @@ dont-distribute-packages: minirotate: [ i686-linux, x86_64-linux, x86_64-darwin ] ministg: [ i686-linux, x86_64-linux, x86_64-darwin ] minst-idx: [ i686-linux, x86_64-linux, x86_64-darwin ] + mios: [ i686-linux, x86_64-linux, x86_64-darwin ] mirror-tweet: [ i686-linux, x86_64-linux, x86_64-darwin ] missing-py2: [ i686-linux, x86_64-linux, x86_64-darwin ] MissingPy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7058,6 +7097,7 @@ dont-distribute-packages: MonadCatchIO-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ] monadiccp-gecode: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadIO: [ i686-linux, x86_64-linux, x86_64-darwin ] Monadius: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadLab: [ i686-linux, x86_64-linux, x86_64-darwin ] monadLib-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7095,6 +7135,8 @@ dont-distribute-packages: morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] morph: [ i686-linux, x86_64-linux, x86_64-darwin ] mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + moto-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + moto: [ i686-linux, x86_64-linux, x86_64-darwin ] motor-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] motor-reflection: [ i686-linux, x86_64-linux, x86_64-darwin ] motor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7267,6 +7309,7 @@ dont-distribute-packages: network-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] network-hans: [ i686-linux, x86_64-linux, x86_64-darwin ] network-interfacerequest: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-messagepack-rpc-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] network-msgpack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] network-netpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7451,6 +7494,7 @@ dont-distribute-packages: optional: [ i686-linux, x86_64-linux, x86_64-darwin ] optparse-applicative-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] optparse-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] + orc: [ i686-linux, x86_64-linux, x86_64-darwin ] orchestrate: [ i686-linux, x86_64-linux, x86_64-darwin ] OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7617,6 +7661,7 @@ dont-distribute-packages: persistent-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-relational-record: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7707,6 +7752,7 @@ dont-distribute-packages: plat: [ i686-linux, x86_64-linux, x86_64-darwin ] platinum-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] PlayingCards: [ i686-linux, x86_64-linux, x86_64-darwin ] + plex: [ i686-linux, x86_64-linux, x86_64-darwin ] plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ] plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7773,6 +7819,7 @@ dont-distribute-packages: postgresql-simple-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-url: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7835,6 +7882,7 @@ dont-distribute-packages: priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] priority-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] + prizm: [ i686-linux, x86_64-linux, x86_64-darwin ] ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] proc: [ i686-linux, x86_64-linux, x86_64-darwin ] process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8190,6 +8238,7 @@ dont-distribute-packages: reproject: [ i686-linux, x86_64-linux, x86_64-darwin ] req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + rerebase: [ i686-linux, x86_64-linux, x86_64-darwin ] reserve: [ i686-linux, x86_64-linux, x86_64-darwin ] reservoir: [ i686-linux, x86_64-linux, x86_64-darwin ] resin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8234,6 +8283,7 @@ dont-distribute-packages: rfc-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] rfc3339: [ i686-linux, x86_64-linux, x86_64-darwin ] rfc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rhine-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] rhythm-game-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] RichConditional: [ i686-linux, x86_64-linux, x86_64-darwin ] ridley-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8403,6 +8453,7 @@ dont-distribute-packages: scrape-changes: [ i686-linux, x86_64-linux, x86_64-darwin ] ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ] script-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + SCRIPTWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] scrobble: [ i686-linux, x86_64-linux, x86_64-darwin ] scrz: [ i686-linux, x86_64-linux, x86_64-darwin ] Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8936,6 +8987,7 @@ dont-distribute-packages: streaming-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-osm: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-png: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8977,6 +9029,7 @@ dont-distribute-packages: suffixarray: [ i686-linux, x86_64-linux, x86_64-darwin ] SuffixStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] suitable: [ i686-linux, x86_64-linux, x86_64-darwin ] + summoner: [ i686-linux, x86_64-linux, x86_64-darwin ] sump: [ i686-linux, x86_64-linux, x86_64-darwin ] sunlight: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9226,6 +9279,7 @@ dont-distribute-packages: thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] thrist: [ i686-linux, x86_64-linux, x86_64-darwin ] throttled-io-loop: [ i686-linux, x86_64-linux, x86_64-darwin ] + throwable-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] thumbnail-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9330,6 +9384,7 @@ dont-distribute-packages: translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ] translate-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] translate: [ i686-linux, x86_64-linux, x86_64-darwin ] + trasa-client: [ i686-linux, x86_64-linux, x86_64-darwin ] trasa-server: [ i686-linux, x86_64-linux, x86_64-darwin ] travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] travis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9444,6 +9499,7 @@ dont-distribute-packages: types-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] typesafe-precure: [ i686-linux, x86_64-linux, x86_64-darwin ] typescript-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] + typograffiti: [ i686-linux, x86_64-linux, x86_64-darwin ] tyro: [ i686-linux, x86_64-linux, x86_64-darwin ] u2f: [ i686-linux, x86_64-linux, x86_64-darwin ] uAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9464,6 +9520,7 @@ dont-distribute-packages: unboxed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] unbreak: [ i686-linux, x86_64-linux, x86_64-darwin ] unexceptionalio-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] + unfix-binders: [ i686-linux, x86_64-linux, x86_64-darwin ] uni-events: [ i686-linux, x86_64-linux, x86_64-darwin ] uni-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] uni-htk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9516,6 +9573,7 @@ dont-distribute-packages: uri-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] uri-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] uri-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + uri: [ i686-linux, x86_64-linux, x86_64-darwin ] url-decoders: [ i686-linux, x86_64-linux, x86_64-darwin ] url-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] URLb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9523,6 +9581,7 @@ dont-distribute-packages: urldecode: [ i686-linux, x86_64-linux, x86_64-darwin ] urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] UrlDisp: [ i686-linux, x86_64-linux, x86_64-darwin ] + urlpath: [ i686-linux, x86_64-linux, x86_64-darwin ] URLT: [ i686-linux, x86_64-linux, x86_64-darwin ] urn-random: [ i686-linux, x86_64-linux, x86_64-darwin ] urn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9590,6 +9649,7 @@ dont-distribute-packages: vector-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-functorlazy: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-heterogenous: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-instances-collections: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9697,10 +9757,12 @@ dont-distribute-packages: WaveFront: [ i686-linux, x86_64-linux, x86_64-darwin ] wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] wavy: [ i686-linux, x86_64-linux, x86_64-darwin ] + weak-bag: [ i686-linux, x86_64-linux, x86_64-darwin ] weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] web-css: [ i686-linux, x86_64-linux, x86_64-darwin ] web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ] web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] web-output: [ i686-linux, x86_64-linux, x86_64-darwin ] web-page: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9784,6 +9846,7 @@ dont-distribute-packages: wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] wreq-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] wright: [ i686-linux, x86_64-linux, x86_64-darwin ] + ws: [ i686-linux, x86_64-linux, x86_64-darwin ] wsdl: [ i686-linux, x86_64-linux, x86_64-darwin ] wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ] wsjtx-udp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9894,6 +9957,7 @@ dont-distribute-packages: yahoo-web-search: [ i686-linux, x86_64-linux, x86_64-darwin ] yajl-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] yajl: [ i686-linux, x86_64-linux, x86_64-darwin ] + yak: [ i686-linux, x86_64-linux, x86_64-darwin ] yam-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] yam-transaction-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] yam-web: [ i686-linux, x86_64-linux, x86_64-darwin ] From 21daeb205961938e9c8f408a3f8405e2dd33ad88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Oct 2018 02:31:32 +0200 Subject: [PATCH 761/992] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.11.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/15d56e428a051c01c0e7c5e516e76ff89bf88cdb. --- .../haskell-modules/hackage-packages.nix | 2155 +++++++++++++---- 1 file changed, 1659 insertions(+), 496 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 352d97d497ab..e7a5b5b1626d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3515,6 +3515,36 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "DBFunctor" = callPackage + ({ mkDerivation, base, bytestring, cassava, cereal, containers + , deepseq, either, MissingH, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "DBFunctor"; + version = "0.1.0.0"; + sha256 = "0add2hbk8jz8pmmk1in7z3rc4r7xgks0b5xqz113lzf4abnpiac7"; + revision = "1"; + editedCabalFile = "1gfadkmnf1c151kkcq41ca2vx36drp2kfhq74ybhvdz32kbrvwq3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cassava cereal containers deepseq either MissingH + text transformers unordered-containers vector + ]; + executableHaskellDepends = [ + base bytestring cassava cereal containers deepseq either MissingH + text transformers unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring cassava cereal containers deepseq either MissingH + text transformers unordered-containers vector + ]; + description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "DBlimited" = callPackage ({ mkDerivation, base, containers, parsec }: mkDerivation { @@ -5863,6 +5893,7 @@ self: { testHaskellDepends = [ base Frames hspec pipes ]; description = "Alternative CSV parser for the Frames package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Frank" = callPackage @@ -7281,15 +7312,18 @@ self: { }) {inherit (pkgs) unixODBC;}; "HDBC-postgresql" = callPackage - ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time - , parsec, postgresql, time, utf8-string + ({ mkDerivation, base, bytestring, Cabal, convertible, HDBC, mtl + , old-time, parsec, postgresql, time, utf8-string }: mkDerivation { pname = "HDBC-postgresql"; version = "2.3.2.5"; sha256 = "0l9i7mkdcch7f1ajl0fma7rra3dc0llmlia0iqhqb4k0gcrpy7l8"; + revision = "1"; + editedCabalFile = "1myhqsn3kk21pchlwf9s6vxggl59s6vmhmbx2539ad4jvnfy2ijx"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring convertible HDBC mtl old-time parsec time utf8-string @@ -8598,8 +8632,8 @@ self: { pname = "HTTP"; version = "4000.3.12"; sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3"; - revision = "1"; - editedCabalFile = "108i60vy6r7k1yaraw9g6xc7r82nwb9h84vsk9q5s01z980c7kk4"; + revision = "2"; + editedCabalFile = "1gw6xzp1n4gsqwnbfr29ds8v4wpk78b2bha8i108dqav97viwm8c"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -11838,8 +11872,8 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "MASMGen"; - version = "0.5.0.0"; - sha256 = "1fdskc92m5bv5m19irhv3b8mr4wyzv1xnwaxgnd3ynmjgrrb127c"; + version = "0.7.0.0"; + sha256 = "0b5vscpdf252gqi7qpsz9ia4101iik3bgrcdawz1mlinlv1zaccv"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers mtl ]; description = "Generate MASM code from haskell"; @@ -12281,6 +12315,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MissingH_1_4_1_0" = callPackage + ({ mkDerivation, array, base, containers, directory + , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network + , old-locale, old-time, parsec, process, QuickCheck, random + , regex-compat, testpack, time, unix + }: + mkDerivation { + pname = "MissingH"; + version = "1.4.1.0"; + sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29"; + libraryHaskellDepends = [ + array base containers directory filepath hslogger HUnit mtl network + old-locale old-time parsec process random regex-compat time unix + ]; + testHaskellDepends = [ + array base containers directory errorcall-eq-instance filepath + hslogger HUnit mtl network old-locale old-time parsec process + QuickCheck random regex-compat testpack time unix + ]; + description = "Large utility library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MissingK" = callPackage ({ mkDerivation, base, glib, template-haskell }: mkDerivation { @@ -15532,6 +15590,8 @@ self: { pname = "Rasterific"; version = "0.7.4.1"; sha256 = "1d0j7xf2xbgrlny30qwm52wby51ic2cqlhb867a7a03k02p7ib2b"; + revision = "1"; + editedCabalFile = "1lz8b9xcfcv0a762zvaksh7c80yryc9yhap198dlm60i0znpjdg2"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -15634,8 +15694,8 @@ self: { }: mkDerivation { pname = "RepLib"; - version = "0.5.4"; - sha256 = "13c34k78fqvr3h1lvsa0kkwk2bv1cv3m27spp4429cafgbi4fr4q"; + version = "0.5.4.1"; + sha256 = "064avhz0x77yd5irvvs4sa1fcn8srb3n5sqbd4vmsjva6514jr9y"; libraryHaskellDepends = [ base containers mtl template-haskell transformers ]; @@ -15788,6 +15848,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "SCRIPTWriter" = callPackage + ({ mkDerivation, array, base, binary, bitcoin-hs, bitcoin-script + , bytestring, containers, mtl, uu-tc + }: + mkDerivation { + pname = "SCRIPTWriter"; + version = "1.0"; + sha256 = "0333p5r2ms9yhkxgbhdrmhylszqq6xpr4hdvjgn62xwd6a4a1i3l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bitcoin-hs bitcoin-script bytestring containers + mtl uu-tc + ]; + executableHaskellDepends = [ base ]; + description = "ESCRIPT: a human friendly language for programming Bitcoin scripts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "SCalendar" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, scalendar , text, time @@ -16767,8 +16847,8 @@ self: { }: mkDerivation { pname = "Slides"; - version = "0.1.0.9"; - sha256 = "0jfhbgk1i8gbpi2ka33r23q7336xnf6y4bxfszhs09bhvhsr95ia"; + version = "0.1.0.10"; + sha256 = "0w60zffs83d5xmhz0d12aip5xqgih495wfrah25d64f9fh6j4j0i"; libraryHaskellDepends = [ base colour diagrams-lib diagrams-svg file-embed regex-applicative ]; @@ -17370,15 +17450,15 @@ self: { }: mkDerivation { pname = "StrictCheck"; - version = "0.1.1"; - sha256 = "1mm1kyrrrwgxdjnafazggblcjlin3i8bjqrj6q0l7xrgllnqalv2"; + version = "0.2.0"; + sha256 = "11gr15c17134fddh3ms9m1z0hjsf8dqhk2z7vvd61gfzzpcx5xms"; libraryHaskellDepends = [ base bifunctors containers generics-sop QuickCheck template-haskell ]; testHaskellDepends = [ base deepseq generics-sop HUnit QuickCheck ]; - description = "StrictCheck: Keep Your Laziness In Check"; + description = "Keep Your Laziness In Check"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -20272,8 +20352,8 @@ self: { pname = "accelerate-io"; version = "1.2.0.0"; sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf"; - revision = "1"; - editedCabalFile = "0n1bch7rb2pvfqajjzaxrlw06f7vr583ckvn2ldr6lv59w1jrk3l"; + revision = "2"; + editedCabalFile = "0w8y40p71c6c7cj49n4kanwmsa53s2nydigiiidqp93yxhw0virq"; libraryHaskellDepends = [ accelerate array base bmp bytestring primitive repa vector ]; @@ -21132,8 +21212,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; - revision = "6"; - editedCabalFile = "0zq9j2hgapb9blvmd9y8kmczizw4a18kksnfqd1py1jzx7hr46n3"; + revision = "7"; + editedCabalFile = "0z4l6j1q3y5zq4941bsb6ypkhfg3pyvb5gcmasymh2nj9g952xkd"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -22526,23 +22606,22 @@ self: { "aip" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, checkers , Crypto, directory, exceptions, filepath, HTTP, lens, network-uri - , optparse-applicative, parsec, parsers, QuickCheck, tagsoup - , tagsoup-selection, tasty, tasty-hunit, tasty-quickcheck, time - , transformers, unordered-containers, utf8-string + , optparse-applicative, parsec, parsers, process, QuickCheck + , semigroupoids, semigroups, tagsoup, tagsoup-selection, tasty + , tasty-hunit, tasty-quickcheck, time, transformers + , unordered-containers, utf8-string }: mkDerivation { pname = "aip"; - version = "0.1.0"; - sha256 = "0b2jr4z0mdkpqzay2c8m2zbbsrs5ia1l5m7zy02nh63ifl5avw2k"; - revision = "1"; - editedCabalFile = "13n79gq17kj5q81512j51gz0ld772anyxixfdx1q8inay4araplx"; + version = "0.1.1"; + sha256 = "05pv8m5wjzpj5wxsad6rzka9fcch5aakd73697ndaiwasqajvx3d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring Crypto directory exceptions filepath HTTP lens network-uri optparse-applicative parsec parsers - tagsoup tagsoup-selection time transformers unordered-containers - utf8-string + process semigroupoids semigroups tagsoup tagsoup-selection time + transformers unordered-containers utf8-string ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -27348,8 +27427,8 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.5.1.1"; - sha256 = "1251i3nz2ipg21qyys34ilxi1bnchf4a2v4571l54kaysk8p8lhi"; + version = "0.6.0.0"; + sha256 = "03k752lws5whcr2kiiljhfvz9y7xiqp9a1y2hnhgh5sjwckpjyn9"; libraryHaskellDepends = [ base containers mtl template-haskell vector ]; @@ -27361,6 +27440,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apecs-physics" = callPackage + ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear + , template-haskell, vector + }: + mkDerivation { + pname = "apecs-physics"; + version = "0.2.0.0"; + sha256 = "17mbf06785mdn8pmy90hw92240zq889rh2dlv1sh45p44grr2h5c"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + apecs base containers inline-c linear template-haskell vector + ]; + description = "2D physics for apecs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "apelsin" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, filepath, glib, gtk, HTTP, mtl, network, process @@ -29172,8 +29267,8 @@ self: { }: mkDerivation { pname = "asciidiagram"; - version = "1.3.3.1"; - sha256 = "194jdii485z0fif07nvjcj5468m53zgm2v9x1h3pj8xlmfh9rrly"; + version = "1.3.3.2"; + sha256 = "0kbf4jswdyvd0x4yk00ss4yjqla852rd64081lkf1xn7yi0k8d1b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29237,6 +29332,7 @@ self: { old-locale resourcet temporary-resourcet text thyme vector ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asil" = callPackage @@ -30509,6 +30605,7 @@ self: { testHaskellDepends = [ base ]; description = "Parse IP data types with attoparsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-ip_0_0_3" = callPackage @@ -30658,6 +30755,7 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attoparsec-uri_0_0_6" = callPackage @@ -32960,6 +33058,7 @@ self: { doHaddock = false; description = "\"base\" package sans \"Prelude\" module"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-orphans" = callPackage @@ -34026,6 +34125,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bench-show" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, Chart, Chart-diagrams, csv + , directory, filepath, mwc-random, split, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "bench-show"; + version = "0.2.0"; + sha256 = "17d7dk5r697r9fls14labciwp3rwykv6n5mkhljrjszf2z2c6j65"; + libraryHaskellDepends = [ + ansi-wl-pprint base Chart Chart-diagrams csv directory filepath + mwc-random split statistics transformers vector + ]; + testHaskellDepends = [ base split text ]; + description = "Show, plot and compare benchmark results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "benchmark-function" = callPackage ({ mkDerivation, base, process, random, time }: mkDerivation { @@ -34725,6 +34843,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "binary-conduit_1_3_1" = callPackage + ({ mkDerivation, base, binary, bytestring, conduit, exceptions + , hspec, QuickCheck, quickcheck-assertions, resourcet, vector + }: + mkDerivation { + pname = "binary-conduit"; + version = "1.3.1"; + sha256 = "17yj8rn6fwzbv0z6lczrddv7mkr8906xg2pf2dlvmnwb97zw7004"; + libraryHaskellDepends = [ + base binary bytestring conduit exceptions vector + ]; + testHaskellDepends = [ + base binary bytestring conduit hspec QuickCheck + quickcheck-assertions resourcet + ]; + description = "data serialization/deserialization conduit library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-derive" = callPackage ({ mkDerivation, base, binary, ghc-prim }: mkDerivation { @@ -34983,10 +35121,8 @@ self: { ({ mkDerivation, base, bytestring, cborg, serialise }: mkDerivation { pname = "binary-serialise-cbor"; - version = "0.2.0.0"; - sha256 = "1kcqmxz77jmdkknpbjr860xmqrib3adh9rm99agidicg66ilsavv"; - revision = "1"; - editedCabalFile = "1dkranaa9fn81z0x75b1dblnph9d0pvzzz0jpz374lqsxaimqgp6"; + version = "0.2.1.0"; + sha256 = "0qdbz2qvvqiaqp859fn00470gzxpvw8k3v0wqclgqps3zj9g9854"; libraryHaskellDepends = [ base bytestring cborg serialise ]; description = "Yet Another Binary Serialisation Library (compatibility shim)"; license = stdenv.lib.licenses.bsd3; @@ -36143,10 +36279,8 @@ self: { }: mkDerivation { pname = "biohazard"; - version = "1.0.4"; - sha256 = "1gj5xr0b9s2zifknm10bynkh0gvsi0gmw2sa3zcp1if17ixndv2c"; - revision = "2"; - editedCabalFile = "0r1fz9h92zyb7ryk8lngqlyl75djr8ngbcfrr9bbmz8img2ipb2a"; + version = "1.1.0"; + sha256 = "0sd12i3542hkvy7ijabc0y5dcf758diyvmdpi120wbvh0ay15gvy"; libraryHaskellDepends = [ async attoparsec base base-prelude bytestring containers exceptions hashable primitive stm text transformers unix unordered-containers @@ -38401,6 +38535,8 @@ self: { pname = "boolean-normal-forms"; version = "0.0.1"; sha256 = "12i0jarbv7gq2p8zw0jgh2gq3wqk6s0vsc9rd0g7c36srcmr944b"; + revision = "1"; + editedCabalFile = "1p31kqxp77xdhkszppmnzqgxp883vasrh5910qfif50lch39myfm"; libraryHaskellDepends = [ base cond containers deepseq ]; testHaskellDepends = [ base cond containers QuickCheck tasty tasty-quickcheck @@ -39684,8 +39820,8 @@ self: { }: mkDerivation { pname = "buffer-builder"; - version = "0.2.4.6"; - sha256 = "0r2xn5rc9kg99zcx5x8p15mm6isk0vdr4szc0vyywbj1k96kwf2l"; + version = "0.2.4.7"; + sha256 = "0n1zb12zm86rm3jqpdh7j15w6dd1mii0fmaihkdqm0b1rv2zm2dk"; libraryHaskellDepends = [ base bytestring mtl text unordered-containers vector ]; @@ -39780,8 +39916,8 @@ self: { }: mkDerivation { pname = "bugsnag-haskell"; - version = "0.0.2.0"; - sha256 = "0jkcfgs6ln3pcq5c0pz170wwphkx27ya2xj7li1avph5j5q42dxl"; + version = "0.0.2.1"; + sha256 = "09vvckg6advf47ciq3cv2g06g13d2az1kinby5fpfz1wma7s1zjg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39854,8 +39990,8 @@ self: { }: mkDerivation { pname = "buildbox"; - version = "2.2.1.1"; - sha256 = "19kyi8w3z3k3ydbzw5y57j6m4ffg6y9pachwzsfzjpkfczi7ds7z"; + version = "2.2.1.2"; + sha256 = "10kasyr2rk8zm1dh7c2ka1djlxmb20lriphd9sm18z4fw3w82cxz"; libraryHaskellDepends = [ base bytestring containers directory exceptions mtl old-locale process stm temporary text time @@ -40266,8 +40402,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.3.1.0"; - sha256 = "11kchyzm908ld3s3k8jh8phbryhp4zj5d3aq4sflfd8pkrns321d"; + version = "0.3.2.0"; + sha256 = "100s2f4w0lgnsjgjazck7hnbk3k9ibg1i4rdcyza9jphp67vjgar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41176,6 +41312,7 @@ self: { testHaskellDepends = [ base filepath tasty tasty-golden ]; description = "A command line program for extracting compiler arguments from a cabal file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-constraints" = callPackage @@ -42940,6 +43077,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "capability" = callPackage + ({ mkDerivation, base, containers, dlist, exceptions, generic-lens + , hspec, lens, monad-control, monad-unlift, mtl, mutable-containers + , primitive, safe-exceptions, silently, streaming, temporary, text + , transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "capability"; + version = "0.1.0.0"; + sha256 = "1aif560z65hmq0pyf6b30nj73685r85vgq440pmzgfhidbn4lf51"; + libraryHaskellDepends = [ + base dlist exceptions generic-lens lens monad-control monad-unlift + mtl mutable-containers primitive safe-exceptions streaming + transformers unliftio unliftio-core + ]; + testHaskellDepends = [ + base containers hspec lens mtl silently streaming temporary text + unliftio + ]; + description = "Extensional capabilities and deriving combinators"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "capataz" = callPackage ({ mkDerivation, async, base, bytestring, pretty-show , prettyprinter, rio, tasty, tasty-hunit, tasty-smallcheck @@ -43803,8 +43964,8 @@ self: { }: mkDerivation { pname = "cassava-streams"; - version = "0.3.0.2"; - sha256 = "09aiwcc9q768jz7xd7hxymrj3hw6g21imsh6ka4rrw059hi4lzna"; + version = "0.3.0.3"; + sha256 = "01s0h2mi9b4h3jy405jvz2an8w6fdvg370mizfk910anx7wsa3ix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44158,10 +44319,8 @@ self: { }: mkDerivation { pname = "cbor-tool"; - version = "0.2.0.0"; - sha256 = "0m8ic53vbzk06xw8rxs9vndnmbdjmcslc8zqa7lafhnl3lgqaybp"; - revision = "1"; - editedCabalFile = "08yd8qv9kalgr6hn2kwwzmqzaq4i05fp7d7pfmnkfm7jg6zm8kwy"; + version = "0.2.1.0"; + sha256 = "0cjgkl8az6qnq0b48ljw5yshkzq7lb7c6mb0gm07z2dpaxsk0rwm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -44173,19 +44332,24 @@ self: { }) {}; "cborg" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , half, integer-gmp, primitive, text + ({ mkDerivation, aeson, array, base, base16-bytestring + , base64-bytestring, bytestring, containers, deepseq, fail + , ghc-prim, half, integer-gmp, primitive, QuickCheck, scientific + , tasty, tasty-hunit, tasty-quickcheck, text, vector }: mkDerivation { pname = "cborg"; - version = "0.2.0.0"; - sha256 = "1dvzqzk68ym1v1gxrx8kc59hj4jd2l0c8f2bqf67jgm5ld0bv340"; - revision = "2"; - editedCabalFile = "1fim6qbzimff8hpzv6bw558pzkh65cql8gdjinghc7w9c5my6y7l"; + version = "0.2.1.0"; + sha256 = "10vlv5mwg9625rmir7mi0zj5ygs3j3vlhm2h8lilkbj5frgp764i"; libraryHaskellDepends = [ - array base bytestring containers ghc-prim half integer-gmp + array base bytestring containers deepseq ghc-prim half integer-gmp primitive text ]; + testHaskellDepends = [ + aeson array base base16-bytestring base64-bytestring bytestring + deepseq fail half QuickCheck scientific tasty tasty-hunit + tasty-quickcheck text vector + ]; description = "Concise Binary Object Representation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -44196,10 +44360,8 @@ self: { }: mkDerivation { pname = "cborg-json"; - version = "0.2.0.0"; - sha256 = "09ps2lyvxg0qpki9f0lydag9hyys20q5ywgxim0jcaa0jky0j92x"; - revision = "1"; - editedCabalFile = "1v0brbq9ri5fx19kb2ijhd3h3ibqadfprgcisja0mx6amzkbqnrz"; + version = "0.2.1.0"; + sha256 = "01i0npbwf6cnjkwwk0l4fnwlbjhsj7vn3d4zd202hcnxdm7bbdiz"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -46157,8 +46319,8 @@ self: { pname = "circle-packing"; version = "0.1.0.6"; sha256 = "06z8irwrjxxgk5xqlpy6a9mjl44kp9pgx2xpslhgxrd31nll9vk4"; - revision = "1"; - editedCabalFile = "10dh8jgjah1h54f83s9289abfqzc4ifykb01p5jljfac63yn42zs"; + revision = "2"; + editedCabalFile = "1ag213lv6yfzxdc4ghbywy165qblnqx5b3j9d23kc6fcyf19nfyk"; libraryHaskellDepends = [ base ]; description = "Simple heuristic for packing discs of varying radii in a circle"; license = stdenv.lib.licenses.bsd3; @@ -46778,6 +46940,7 @@ self: { ]; description = "Classify sounds produced by Xenopus laevis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classy-influxdb-simple" = callPackage @@ -46861,6 +47024,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude_1_5_0" = callPackage + ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring + , chunked-data, containers, deepseq, dlist, ghc-prim, hashable + , hspec, mono-traversable, mono-traversable-instances, mtl + , mutable-containers, primitive, QuickCheck, say, semigroups, stm + , stm-chans, text, time, transformers, unliftio + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "1.5.0"; + sha256 = "1nm4lygxqb1wq503maki6dsah2gpn5rd22jmbwjxfwyzgyqy9fnk"; + libraryHaskellDepends = [ + async base basic-prelude bifunctors bytestring chunked-data + containers deepseq dlist ghc-prim hashable mono-traversable + mono-traversable-instances mtl mutable-containers primitive say + semigroups stm stm-chans text time transformers unliftio + unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck transformers unordered-containers + ]; + description = "A typeclass-based Prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classy-prelude-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec , monad-control, QuickCheck, resourcet, transformers, void @@ -46880,6 +47070,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude-conduit_1_5_0" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec + , monad-control, QuickCheck, resourcet, transformers, void + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "1.5.0"; + sha256 = "007xz0yzp0bzbrx7arj7xmjlwrja120kwgxrbkm98sydjlsph9ys"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit monad-control resourcet + transformers void + ]; + testHaskellDepends = [ + base bytestring conduit hspec QuickCheck transformers + ]; + description = "classy-prelude together with conduit functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classy-prelude-yesod" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types @@ -46899,6 +47109,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "classy-prelude-yesod_1_5_0" = callPackage + ({ mkDerivation, aeson, base, classy-prelude + , classy-prelude-conduit, data-default, http-conduit, http-types + , persistent, yesod, yesod-newsfeed, yesod-static + }: + mkDerivation { + pname = "classy-prelude-yesod"; + version = "1.5.0"; + sha256 = "10wz09ksn537w5z9lmj4dsfi0ygk37d5khijr8qq3py2gr2c9ywz"; + libraryHaskellDepends = [ + aeson base classy-prelude classy-prelude-conduit data-default + http-conduit http-types persistent yesod yesod-newsfeed + yesod-static + ]; + description = "Provide a classy prelude including common Yesod functionality"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classyplate" = callPackage ({ mkDerivation, base, criterion, parallel, template-haskell , uniplate @@ -48352,6 +48581,7 @@ self: { executableToolDepends = [ markdown-unlit ]; description = "Logging library"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "co-log-core" = callPackage @@ -49433,12 +49663,17 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, utility-ht }: + ({ mkDerivation, base, guarded-allocation, QuickCheck, transformers + , utility-ht + }: mkDerivation { pname = "comfort-array"; - version = "0.0.1.1"; - sha256 = "1p6ba5yjpldhy5j7cml2i0i6597pjw87l6xpym1hccn6q1mkqxq5"; - libraryHaskellDepends = [ base utility-ht ]; + version = "0.1.1"; + sha256 = "0kmqb7mcanx3n597nm8p6g76nc4v5smkl5srjmb2757fb3w68xmk"; + libraryHaskellDepends = [ + base guarded-allocation QuickCheck transformers utility-ht + ]; + testHaskellDepends = [ base QuickCheck ]; description = "Arrays where the index type is a function of the shape type"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -50511,8 +50746,8 @@ self: { }: mkDerivation { pname = "concraft"; - version = "0.13.0"; - sha256 = "1b03h65ww3cb0vxjrvj8y7bn30ci0fdbjcf8gxnmyy34npgz1ihw"; + version = "0.14.1"; + sha256 = "0v7han8ps1ysxi929clkbx0c0vjd6dyxxhfp8q5k2jx58blwzxyg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51078,8 +51313,8 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.3.0.3"; - sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v"; + version = "1.3.1"; + sha256 = "1mi0ad2ha51lyx1sw15zkzbh2bvv1q7jcfrxd4xc91d7mmk9n4mf"; libraryHaskellDepends = [ base bytestring directory exceptions filepath mono-traversable mtl primitive resourcet text transformers unix unliftio-core vector @@ -51530,6 +51765,62 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "confcrypt" = callPackage + ({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring + , bytestring, conduit, containers, crypto-pubkey-openssh + , crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec + , memory, mtl, optparse-applicative, parser-combinators, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "confcrypt"; + version = "0.1.0.2"; + sha256 = "0iw47xz34f2dljsq6hm75046sy7wmzj4ndgfh9h3x4iixs5vidfw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-kms base base64-bytestring bytestring conduit + containers crypto-pubkey-openssh crypto-pubkey-types cryptonite + deepseq lens megaparsec mtl optparse-applicative parser-combinators + text transformers + ]; + executableHaskellDepends = [ + amazonka amazonka-kms base base64-bytestring bytestring conduit + containers crypto-pubkey-openssh crypto-pubkey-types cryptonite + deepseq lens megaparsec mtl optparse-applicative parser-combinators + text transformers + ]; + testHaskellDepends = [ + amazonka amazonka-kms base base64-bytestring bytestring conduit + containers crypto-pubkey-openssh crypto-pubkey-types cryptonite + deepseq HUnit lens megaparsec memory mtl optparse-applicative + parser-combinators QuickCheck tasty tasty-hunit tasty-quickcheck + text transformers + ]; + license = stdenv.lib.licenses.mit; + }) {}; + + "confetti" = callPackage + ({ mkDerivation, base, directory, filepath, MissingH, tasty + , tasty-hunit, tasty-smallcheck, text, time, unix, yaml + }: + mkDerivation { + pname = "confetti"; + version = "0.3.2"; + sha256 = "0ac1mrxwiyjwihywy7hclfymrixhb0mj8266sljzpmk1671qr4ym"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath MissingH text time unix yaml + ]; + executableHaskellDepends = [ base directory text ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-smallcheck text + ]; + description = "A simple config file swapping tool"; + license = stdenv.lib.licenses.mit; + }) {}; + "conffmt" = callPackage ({ mkDerivation, base, language-conf, megaparsec , optparse-applicative, pretty, text @@ -51589,6 +51880,8 @@ self: { pname = "config-ini"; version = "0.2.3.0"; sha256 = "03sv2y9ax3jqcfydfzfvmsixl8qch2zym3sr065pjsh8qxrknkqc"; + revision = "1"; + editedCabalFile = "0q5lps38g92irp6hm8lvdjds6qi0nafxxlar5wjh0544v78z0d9q"; libraryHaskellDepends = [ base containers megaparsec text transformers unordered-containers ]; @@ -52558,6 +52851,7 @@ self: { ]; description = "dft of contiguous memory structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "continue" = callPackage @@ -54558,8 +54852,8 @@ self: { }: mkDerivation { pname = "crf-chain2-tiers"; - version = "0.3.0"; - sha256 = "1iv86nscnrvy2yskpx4xilzqbz7y2gv9kzvlgz2h44svhshnypar"; + version = "0.5.0"; + sha256 = "1gwfkvs9lc7ni68n2mxrqx0haawnc8dwx0b73q7a75ysx538f84x"; libraryHaskellDepends = [ array base binary comonad containers data-lens data-memocombinators logfloat monad-codec parallel pedestrian-dag sgd vector @@ -54649,6 +54943,8 @@ self: { pname = "criterion"; version = "1.5.2.0"; sha256 = "03y4lqkrr08nbsjk6qkrhyai7zzv0rrknn6rgni184f18c091wsd"; + revision = "1"; + editedCabalFile = "0v42832227asv9qb1cyq8lg37ygi13956j11jcg4hzrc68ck39vv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -55051,6 +55347,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crypto-enigma_0_0_2_14" = callPackage + ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck + , split + }: + mkDerivation { + pname = "crypto-enigma"; + version = "0.0.2.14"; + sha256 = "12gvgpi7hichjq9ya77hm9q1x49qc1024zmr6pb1mv57nwwx599p"; + libraryHaskellDepends = [ base containers MissingH mtl split ]; + testHaskellDepends = [ base HUnit QuickCheck ]; + description = "An Enigma machine simulator with display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "crypto-multihash" = callPackage ({ mkDerivation, base, base58-bytestring, bytestring, containers , cryptonite, hspec, memory, QuickCheck, string-conversions @@ -56309,6 +56620,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "curl-runnings_0_9_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, cmdargs + , directory, hspec, hspec-expectations, http-conduit, http-types + , megaparsec, pretty-simple, regex-posix, tar, text + , unordered-containers, vector, yaml, zlib + }: + mkDerivation { + pname = "curl-runnings"; + version = "0.9.2"; + sha256 = "1xslp7zg6l3adljac6iga9c421cf0hab9zi4dyjbkws76imh1d0b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive directory hspec + hspec-expectations http-conduit http-types megaparsec pretty-simple + regex-posix text unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs directory http-conduit tar text zlib + ]; + testHaskellDepends = [ base directory hspec hspec-expectations ]; + description = "A framework for declaratively writing curl based API tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "curlhs" = callPackage ({ mkDerivation, base, bytestring, hspec, rtld, time }: mkDerivation { @@ -56511,6 +56848,7 @@ self: { ]; description = "Purely Functional Cursors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cursor-gen" = callPackage @@ -56533,6 +56871,7 @@ self: { ]; description = "Generators for Purely Functional Cursors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curve25519" = callPackage @@ -56703,18 +57042,6 @@ self: { }) {}; "czipwith" = callPackage - ({ mkDerivation, base, template-haskell, transformers }: - mkDerivation { - pname = "czipwith"; - version = "1.0.1.0"; - sha256 = "0s1gz76789w5grm121fikgrxz1hjca6v6dwmds5zg63j6iir3f0p"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base transformers ]; - description = "CZipWith class and deriving via TH"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "czipwith_1_0_1_1" = callPackage ({ mkDerivation, base, template-haskell, transformers }: mkDerivation { pname = "czipwith"; @@ -56724,7 +57051,6 @@ self: { testHaskellDepends = [ base transformers ]; description = "CZipWith class and deriving via TH"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "d-bus" = callPackage @@ -60277,6 +60603,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "decidable" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "decidable"; + version = "0.1.2.0"; + sha256 = "1dgxkwdazqdlnc6pvqwkx531xajl4ygjm5315dz9ilacgbbl2qss"; + libraryHaskellDepends = [ base singletons ]; + description = "Combinators for manipulating dependently-typed predicates"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "decimal-arithmetic" = callPackage ({ mkDerivation, base, binary, binary-bits, deepseq, doctest, hspec , mtl, QuickCheck @@ -60955,6 +61292,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dense-linear-algebra" = callPackage + ({ mkDerivation, base, deepseq, hspec, math-functions, primitive + , QuickCheck, vector, vector-algorithms, vector-binary-instances + , vector-th-unbox + }: + mkDerivation { + pname = "dense-linear-algebra"; + version = "0.1.0.0"; + sha256 = "1m7jjxahqxj7ilic3r9806mwp5rnnsmn8vvipkmk40xl65wplxzp"; + libraryHaskellDepends = [ + base deepseq math-functions primitive vector vector-algorithms + vector-binary-instances vector-th-unbox + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Simple and incomplete pure haskell implementation of linear algebra"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "dependency" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, containers , criterion, deepseq, hspec, microlens @@ -61929,6 +62284,7 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Lexer for the Dhall language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-nix" = callPackage @@ -62301,6 +62657,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.3"; sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5"; + revision = "1"; + editedCabalFile = "16ici9kx7cnva1ihhin5nyc1icif17yks3nwcxxzqxjjw556vpig"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -62443,6 +62801,8 @@ self: { pname = "diagrams-lib"; version = "1.4.2.3"; sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5"; + revision = "1"; + editedCabalFile = "0zsigisgn6sjpfy2hm31zddnsyqm2a046nxb5drjqm7r0aa3vjff"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -62566,8 +62926,8 @@ self: { }: mkDerivation { pname = "diagrams-rasterific"; - version = "1.4.1"; - sha256 = "0zlpmmgn79jgckzzib758c82brci391r181hg43267s1lx463iih"; + version = "1.4.1.1"; + sha256 = "0raki8c20s40y5xy2ax8y38xl3y40fb9qv95ax3qgnmi46s8fapp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core @@ -62620,8 +62980,8 @@ self: { pname = "diagrams-solve"; version = "0.1.1"; sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4"; - revision = "2"; - editedCabalFile = "1zgpx0jmgfr3mg77w3nz08cmgzlwfav2c6bcn68f53z829a6y5lf"; + revision = "3"; + editedCabalFile = "13vfs5k09c16q3dvqzgfca1kd93pgc4ll8mfl3wracanm5mn5rx7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -62640,8 +63000,8 @@ self: { pname = "diagrams-svg"; version = "1.4.2"; sha256 = "1lnyxx45yawqas7hmvvannwaa3ycf1l9g40lsl2m8sl2ja6vcmal"; - revision = "1"; - editedCabalFile = "1mb2fdfvy0c1v7nahspq2cisfqrn37xjh4a6xhqr3b36pfz8rwnd"; + revision = "2"; + editedCabalFile = "15sn85xaachw4cj56w61bjcwrbf4qmnkfl8mbgdapxi5k0y4f2qv"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -63758,19 +64118,20 @@ self: { }) {}; "discord-haskell" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , data-default, http-client, iso8601-time, MonadRandom, req - , safe-exceptions, text, time, unordered-containers, vector - , websockets, wuss + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , containers, data-default, http-client, iso8601-time, JuicyPixels + , MonadRandom, req, safe-exceptions, text, time + , unordered-containers, vector, websockets, wuss }: mkDerivation { pname = "discord-haskell"; - version = "0.5.1"; - sha256 = "0y4ha8zsds53bq330740a0m4wjxmsrdlnhf2fmhp5i3c7rjknka8"; + version = "0.6.0"; + sha256 = "1202zfh3lq0ci48ylp637hcih469awz6sfkp14lzq5psybiiynvw"; libraryHaskellDepends = [ - aeson async base bytestring containers data-default http-client - iso8601-time MonadRandom req safe-exceptions text time - unordered-containers vector websockets wuss + aeson async base base64-bytestring bytestring containers + data-default http-client iso8601-time JuicyPixels MonadRandom req + safe-exceptions text time unordered-containers vector websockets + wuss ]; description = "Write bots for Discord in Haskell"; license = stdenv.lib.licenses.mit; @@ -65788,6 +66149,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dotenv_0_6_0_2" = callPackage + ({ mkDerivation, base, base-compat, containers, directory + , exceptions, hspec, hspec-megaparsec, megaparsec + , optparse-applicative, process, text, transformers, yaml + }: + mkDerivation { + pname = "dotenv"; + version = "0.6.0.2"; + sha256 = "0xgpz4pk684vlm3w2k9ynywj0knrx6am2szja6x4k9wyk9a64w89"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat containers directory exceptions megaparsec process + text transformers yaml + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + transformers yaml + ]; + testHaskellDepends = [ + base base-compat containers directory exceptions hspec + hspec-megaparsec megaparsec process text transformers yaml + ]; + description = "Loads environment variables from dotenv files"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -69246,6 +69636,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_3_2_8" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3.2.8"; + sha256 = "1lsf6x3hmic8anx9dw6dryvsdh128rprb6dxqkyjr17iqy5ww6yp"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + description = "Email address validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -69732,6 +70139,7 @@ self: { ]; description = "entwine - Concurrency tools"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enum-subset-generate" = callPackage @@ -70662,53 +71070,56 @@ self: { "espial" = callPackage ({ mkDerivation, aeson, base, bcrypt, bytestring, case-insensitive , classy-prelude, classy-prelude-conduit, classy-prelude-yesod - , conduit, containers, data-default, directory, esqueleto - , fast-logger, file-embed, foreign-store, hjsmin, hscolour, hspec - , http-conduit, iso8601-time, microlens, monad-control - , monad-logger, mtl, optparse-generic, persistent - , persistent-sqlite, persistent-template, pretty-show, safe - , shakespeare, template-haskell, text, time, transformers - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-static - , yesod-test + , conduit, containers, data-default, directory, ekg, ekg-core + , esqueleto, fast-logger, file-embed, foreign-store, hjsmin + , hscolour, hspec, http-conduit, iso8601-time, microlens + , monad-control, monad-logger, monad-metrics, mtl, optparse-generic + , persistent, persistent-sqlite, persistent-template, pinboard + , pretty-show, safe, shakespeare, template-haskell, text, time + , transformers, unordered-containers, vector, wai, wai-extra + , wai-logger, wai-middleware-metrics, warp, yaml, yesod, yesod-auth + , yesod-core, yesod-form, yesod-static, yesod-test }: mkDerivation { pname = "espial"; - version = "0.0.4"; - sha256 = "15v0apj7mfb61jmbl806ak92h5a8qbp8cl05g07qnrp8hmh1g9fp"; + version = "0.0.5.1"; + sha256 = "010a809fmi6sxh2fwiwvjqk3d293cg5acj57lb1qbm6qjzn7ir37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bcrypt bytestring case-insensitive classy-prelude classy-prelude-conduit classy-prelude-yesod conduit containers - data-default directory esqueleto fast-logger file-embed - foreign-store hjsmin hscolour http-conduit iso8601-time - monad-control monad-logger mtl persistent persistent-sqlite - persistent-template pretty-show safe shakespeare template-haskell - text time transformers unordered-containers vector wai wai-extra - wai-logger warp yaml yesod yesod-auth yesod-core yesod-form - yesod-static + data-default directory ekg ekg-core esqueleto fast-logger + file-embed foreign-store hjsmin hscolour http-conduit iso8601-time + microlens monad-control monad-logger monad-metrics mtl persistent + persistent-sqlite persistent-template pinboard pretty-show safe + shakespeare template-haskell text time transformers + unordered-containers vector wai wai-extra wai-logger + wai-middleware-metrics warp yaml yesod yesod-auth yesod-core + yesod-form yesod-static ]; executableHaskellDepends = [ aeson base bcrypt bytestring case-insensitive classy-prelude classy-prelude-conduit classy-prelude-yesod conduit containers - data-default directory esqueleto fast-logger file-embed - foreign-store hjsmin hscolour http-conduit iso8601-time - monad-control monad-logger mtl optparse-generic persistent - persistent-sqlite persistent-template pretty-show safe shakespeare - template-haskell text time transformers unordered-containers vector - wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core + data-default directory ekg ekg-core esqueleto fast-logger + file-embed foreign-store hjsmin hscolour http-conduit iso8601-time + microlens monad-control monad-logger monad-metrics mtl + optparse-generic persistent persistent-sqlite persistent-template + pinboard pretty-show safe shakespeare template-haskell text time + transformers unordered-containers vector wai wai-extra wai-logger + wai-middleware-metrics warp yaml yesod yesod-auth yesod-core yesod-form yesod-static ]; testHaskellDepends = [ aeson base bcrypt bytestring case-insensitive classy-prelude classy-prelude-conduit classy-prelude-yesod conduit containers - data-default directory esqueleto fast-logger file-embed - foreign-store hjsmin hscolour hspec http-conduit iso8601-time - microlens monad-control monad-logger mtl persistent - persistent-sqlite persistent-template pretty-show safe shakespeare - template-haskell text time transformers unordered-containers vector - wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core + data-default directory ekg ekg-core esqueleto fast-logger + file-embed foreign-store hjsmin hscolour hspec http-conduit + iso8601-time microlens monad-control monad-logger monad-metrics mtl + persistent persistent-sqlite persistent-template pinboard + pretty-show safe shakespeare template-haskell text time + transformers unordered-containers vector wai wai-extra wai-logger + wai-middleware-metrics warp yaml yesod yesod-auth yesod-core yesod-form yesod-static yesod-test ]; description = "Espial is an open-source, web-based bookmarking server"; @@ -72164,6 +72575,7 @@ self: { ]; description = "Dependent pairs and their instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exinst-deepseq" = callPackage @@ -72208,6 +72620,7 @@ self: { ]; description = "Dependent pairs and their instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "existential" = callPackage @@ -72617,6 +73030,7 @@ self: { testHaskellDepends = [ base singletons text ]; description = "Expressions and Formulae a la carte"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expressions-z3" = callPackage @@ -72635,6 +73049,7 @@ self: { ]; description = "Encode and Decode expressions from Z3 ASTs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extcore" = callPackage @@ -72869,6 +73284,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_6_13" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.6.13"; + sha256 = "0jc5g120ff97sayff10kqn66wz8aw2wymgwgh2livzkf7vqm5q50"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ base directory filepath QuickCheck unix ]; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -73328,8 +73760,8 @@ self: { }: mkDerivation { pname = "fast-arithmetic"; - version = "0.6.2.2"; - sha256 = "0rdlsl1k6kp766nm85afilwcvkdbi40kvqi5iy9a1ldkdk277vlk"; + version = "0.6.2.3"; + sha256 = "17k8xghlk0nqmby33ziwbp6zvb27kh6adwhlydzzy8azn1m2snf7"; libraryHaskellDepends = [ base composition-prelude gmpint ]; testHaskellDepends = [ arithmoi base combinat-compat hspec QuickCheck @@ -77043,6 +77475,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fmt-terminal-colors" = callPackage + ({ mkDerivation, ansi-terminal, base, fmt }: + mkDerivation { + pname = "fmt-terminal-colors"; + version = "0.1.0.0"; + sha256 = "1x2g5vc84l00lz4i8x2jhliglg6l32zxa7mm2l9f4rsgav6mvgc1"; + libraryHaskellDepends = [ ansi-terminal base fmt ]; + testHaskellDepends = [ ansi-terminal base fmt ]; + description = "ANSI terminal colors formatters for fmt library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fn" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, resourcet, text @@ -77513,8 +77957,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "3"; - editedCabalFile = "0rp5ggzdqy9i8bsjz7i36l8l2b04vjy6sqm6gxmb4pqmakj1x8q6"; + revision = "4"; + editedCabalFile = "0hpr1z68lflgcdl9gbmva0i52wbgfhh4qj3iwdvzipsp8mwav7s7"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -78348,8 +78792,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.0.5.0"; - sha256 = "1aqzah0c95mi9aqlvhl9r56im59jgjl38r199d7zb4lligfzvacr"; + version = "0.0.5.1"; + sha256 = "1h8966am7j0xdqq2vmfj2cyrzmkd70bs1kx9fpx1bgn1acdpg1xa"; libraryHaskellDepends = [ base constraints containers data-fix dlist free groups kan-extensions mtl natural-numbers transformers @@ -79361,8 +79805,8 @@ self: { }: mkDerivation { pname = "ftp-client"; - version = "0.5.0.1"; - sha256 = "1mffpifpsp3l0nmpd6wabgxmz459ky47bzfizqbijxac24x69455"; + version = "0.5.1.0"; + sha256 = "1g48hkjvmiljjx2jmfb47ch0c4l3zz7vy8dpsg3wkqvzm9n78f1v"; libraryHaskellDepends = [ attoparsec base bytestring connection containers exceptions network transformers @@ -79374,21 +79818,19 @@ self: { "ftp-client-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, exceptions - , ftp-client, ftp-clientconduit, resourcet + , ftp-client, resourcet }: mkDerivation { pname = "ftp-client-conduit"; - version = "0.5.0.2"; - sha256 = "0hkipszpl6nkd8c79nvi591dqp7aaflvmpadf84r82n5agadf4ss"; + version = "0.5.0.3"; + sha256 = "148albjscl7c707c5r0xv7ki8wb26irfkjqdy46cmlmls2y5hvpv"; libraryHaskellDepends = [ base bytestring conduit connection exceptions ftp-client resourcet ]; - testHaskellDepends = [ base ftp-clientconduit ]; + testHaskellDepends = [ base ]; description = "Transfer file with FTP and FTPS with Conduit"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {ftp-clientconduit = null;}; + }) {}; "ftp-conduit" = callPackage ({ mkDerivation, base, byteorder, bytestring, conduit, MissingH @@ -81115,8 +81557,8 @@ self: { }: mkDerivation { pname = "generic-data"; - version = "0.2.0.0"; - sha256 = "0md52nnc8zhi26hywmqyfcxjzh4kvc0jl5ia005mi8c3dvr5l819"; + version = "0.3.0.0"; + sha256 = "0n53z9vmwfmb8h1x86wm9lcqrkfi1lvlfvm6kcw79d2xxx6l90jc"; libraryHaskellDepends = [ base base-orphans contravariant show-combinators ]; @@ -81976,22 +82418,6 @@ self: { }) {}; "genvalidity-time" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec - , QuickCheck, time, validity-time - }: - mkDerivation { - pname = "genvalidity-time"; - version = "0.2.1.0"; - sha256 = "1r28jg9awlx1hzcfdhi0a9a6xlr0f33imqgqyxz4pm9zs4faag7s"; - libraryHaskellDepends = [ - base genvalidity QuickCheck time validity-time - ]; - testHaskellDepends = [ base genvalidity-hspec hspec time ]; - description = "GenValidity support for time"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-time_0_2_1_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, time, validity-time }: @@ -82005,7 +82431,6 @@ self: { testHaskellDepends = [ base genvalidity-hspec hspec time ]; description = "GenValidity support for time"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-unordered-containers" = callPackage @@ -82875,8 +83300,8 @@ self: { ({ mkDerivation, base, ghc, hashable, inspection-testing }: mkDerivation { pname = "ghc-justdoit"; - version = "0.1"; - sha256 = "0qr6ipsq7g1275svdgqcppcb37r387fvap5fyyn6fn4h84dhvkby"; + version = "0.1.0.1"; + sha256 = "1f52cq2c886djr59xmwdaby7diba7j687s20d48sxirvrk95wcmb"; libraryHaskellDepends = [ base ghc hashable ]; testHaskellDepends = [ base inspection-testing ]; description = "A magic typeclass that just does it"; @@ -84956,8 +85381,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180926"; - sha256 = "1251rj8h63y30sfqk0zh670yhz14p256y59n3590pg015pf3575d"; + version = "6.20181011"; + sha256 = "0k18vrk5g9fdlhvklg14fyjk7x9css18i82xzl8wsycjbcq9ncgf"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -85673,32 +86098,34 @@ self: { "gitit" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, ConfigFile, containers, directory, feed, filepath - , filestore, ghc, ghc-paths, happstack-server, highlighting-kate - , hoauth2, hslogger, HStringTemplate, HTTP, http-client-tls - , http-conduit, json, mtl, network, network-uri, old-locale - , old-time, pandoc, pandoc-types, parsec, pretty, process, random - , recaptcha, safe, SHA, split, syb, tagsoup, text, time, uri, url - , utf8-string, uuid, xhtml, xml, xss-sanitize, zlib + , filestore, ghc, ghc-paths, happstack-server, hoauth2, hslogger + , HStringTemplate, HTTP, http-client-tls, http-conduit, json, mtl + , network, network-uri, old-locale, old-time, pandoc, pandoc-types + , parsec, pretty, process, random, recaptcha, safe, SHA + , skylighting, split, syb, tagsoup, text, time, uri, uri-bytestring + , url, utf8-string, uuid, xhtml, xml, xml-conduit, xss-sanitize + , zlib }: mkDerivation { pname = "gitit"; - version = "0.12.2.1"; - sha256 = "1x2kh1lsqiib7g4yp7g0yijsghl27k1axjx3zmhl7fwhkxc4w48m"; + version = "0.12.3"; + sha256 = "0jfi8rvvj2sh0dv19575fr781azsnahs7a828r1z2cql0dslkljl"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring ConfigFile containers directory feed filepath filestore ghc ghc-paths - happstack-server highlighting-kate hoauth2 hslogger HStringTemplate - HTTP http-client-tls http-conduit json mtl network network-uri + happstack-server hoauth2 hslogger HStringTemplate HTTP + http-client-tls http-conduit json mtl network network-uri old-locale old-time pandoc pandoc-types parsec pretty process - random recaptcha safe SHA split syb tagsoup text time uri url - utf8-string uuid xhtml xml xss-sanitize zlib + random recaptcha safe SHA skylighting split syb tagsoup text time + uri uri-bytestring url utf8-string uuid xhtml xml xml-conduit + xss-sanitize zlib ]; executableHaskellDepends = [ base bytestring directory filepath hslogger HTTP mtl network - network-uri syb url utf8-string + network-uri syb text url utf8-string ]; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; @@ -86360,16 +86787,14 @@ self: { ({ mkDerivation, async, attoparsec, base, base64-bytestring , bytestring, Cabal, config-schema, config-value, containers , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL - , HUnit, irc-core, kan-extensions, lens, network, process + , HUnit, irc-core, kan-extensions, lens, network, process, psqueues , regex-tdfa, semigroupoids, split, stm, template-haskell, text , time, transformers, unix, unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.28"; - sha256 = "17z3lhb7ngvp0678ry5zk0jl7pmjhzypk2l6x9mp43m427ick1nk"; - revision = "2"; - editedCabalFile = "082abvc99w4pkv41dzbqbmz3kcyi3zl7i201vr2rdfpwjv8r40pa"; + version = "2.29"; + sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -86377,8 +86802,8 @@ self: { async attoparsec base base64-bytestring bytestring config-schema config-value containers directory filepath free gitrev hashable hookup HsOpenSSL irc-core kan-extensions lens network process - regex-tdfa semigroupoids split stm template-haskell text time - transformers unix unordered-containers vector vty + psqueues regex-tdfa semigroupoids split stm template-haskell text + time transformers unix unordered-containers vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -89975,6 +90400,7 @@ self: { executableHaskellDepends = [ base ]; description = "A reimplementation of graphmod as a source plugin"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphql" = callPackage @@ -92042,6 +92468,56 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hOpenPGP_2_7_4_1" = callPackage + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, base64-bytestring, bifunctors, binary + , binary-conduit, bytestring, bzlib, conduit, conduit-extra + , containers, criterion, crypto-cipher-types, cryptonite, errors + , hashable, incremental-parser, ixset-typed, lens, memory + , monad-loops, nettle, network, network-uri, newtype + , openpgp-asciiarmor, prettyprinter, QuickCheck + , quickcheck-instances, resourcet, semigroups, split, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , transformers, unliftio-core, unordered-containers, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.7.4.1"; + sha256 = "0fcm87rkf1c94w68ad2zkd3r2pbxzqa82kh3d2ky87rc1wqnia0s"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring + base64-bytestring bifunctors binary binary-conduit bytestring bzlib + conduit conduit-extra containers crypto-cipher-types cryptonite + errors hashable incremental-parser ixset-typed lens memory + monad-loops nettle network-uri newtype openpgp-asciiarmor + prettyprinter resourcet semigroups split text time + time-locale-compat transformers unliftio-core unordered-containers + zlib + ]; + testHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri newtype prettyprinter QuickCheck + quickcheck-instances resourcet semigroups split tasty tasty-hunit + tasty-quickcheck text time time-locale-compat transformers + unliftio-core unordered-containers zlib + ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bifunctors binary + binary-conduit bytestring bzlib conduit conduit-extra containers + criterion crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri newtype openpgp-asciiarmor prettyprinter + resourcet semigroups split text time time-locale-compat + transformers unliftio-core unordered-containers zlib + ]; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hPDB" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , ghc-prim, iterable, linear, mmap, mtl, Octree, parallel @@ -94070,6 +94546,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hakyll-dhall" = callPackage + ({ mkDerivation, base, binary, cborg, containers + , data-default-class, dhall, filepath, hakyll, lens-family-core + , mtl, prettyprinter, text, transformers + }: + mkDerivation { + pname = "hakyll-dhall"; + version = "0.2.2.0"; + sha256 = "02hqp9gm26n2w3hh54j94h3ga9nbh24yglx8ljkr30gz7l6r9sc8"; + revision = "1"; + editedCabalFile = "1q9dz2cb26272hfj4dqgp0kcl2rprh7vvpxyjwvh04n3siixxf62"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary cborg containers data-default-class dhall filepath + hakyll lens-family-core mtl prettyprinter text transformers + ]; + executableHaskellDepends = [ base dhall hakyll ]; + description = "Dhall compiler for Hakyll"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hakyll-dir-list" = callPackage ({ mkDerivation, base, containers, data-default, filepath, hakyll }: @@ -94474,6 +94973,7 @@ self: { ]; description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hamlet" = callPackage @@ -94847,6 +95347,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hapistrano_0_3_6_1" = callPackage + ({ mkDerivation, aeson, async, base, directory, filepath + , formatting, gitrev, hspec, mtl, optparse-applicative, path + , path-io, process, stm, temporary, time, transformers, yaml + }: + mkDerivation { + pname = "hapistrano"; + version = "0.3.6.1"; + sha256 = "0g0i0n952zjvysjrsp4srhqgrq5fyy7kdinixsxazpccf01f229y"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base filepath formatting gitrev mtl path process time transformers + ]; + executableHaskellDepends = [ + aeson async base formatting gitrev optparse-applicative path + path-io stm yaml + ]; + testHaskellDepends = [ + base directory filepath hspec mtl path path-io process temporary + ]; + description = "A deployment library for Haskell applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happindicator" = callPackage ({ mkDerivation, array, base, bytestring, containers, glib, gtk , gtk2hs-buildtools, libappindicator-gtk2, mtl @@ -96765,6 +97292,61 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-bitmex-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, bytestring-conversion + , cryptonite, haskell-bitmex-rest, http-client, http-client-tls + , http-types, katip, memory, microlens, mtl, network + , safe-exceptions, text, time, vector, websockets, wuss + }: + mkDerivation { + pname = "haskell-bitmex-client"; + version = "0.1.0.1"; + sha256 = "13qqi0ribc20p9h3nmfsjzhizyyz0nzsxfwx21i2r4v9md9j9n3c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring bytestring-conversion cryptonite + haskell-bitmex-rest http-client http-client-tls http-types katip + memory microlens mtl network safe-exceptions text time vector + websockets wuss + ]; + executableHaskellDepends = [ + aeson base bytestring haskell-bitmex-rest http-client + http-client-tls katip mtl text time websockets + ]; + description = "Complete BitMEX Client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haskell-bitmex-rest" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, deepseq, exceptions, hspec + , http-api-data, http-client, http-client-tls, http-media + , http-types, iso8601-time, katip, microlens, mtl, network + , QuickCheck, random, safe-exceptions, semigroups, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "haskell-bitmex-rest"; + version = "0.1.0.0"; + sha256 = "09xj9bf50wwq1xgy800wadm8jbnbs4qnjcxqx0gy3jmx1z7mgmmc"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + deepseq exceptions http-api-data http-client http-client-tls + http-media http-types iso8601-time katip microlens mtl network + random safe-exceptions text time transformers unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec iso8601-time mtl QuickCheck + semigroups text time transformers unordered-containers vector + ]; + description = "Auto-generated bitmex API Client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-brainfuck" = callPackage ({ mkDerivation, base, bytestring, mtl, parsec, QuickCheck, tasty , tasty-quickcheck, tasty-th @@ -97091,19 +97673,14 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.21.4"; - sha256 = "0rjb7pg8v0kjx115n0bksw705g6yg9vn8krxrakhvds5hvmb9caw"; - isLibrary = true; - isExecutable = true; + version = "0.21.5"; + sha256 = "1rvi9bmgxq7q6js8yb5yb156yxmnm9px9amgjwzxmr7sxz31dl8j"; libraryHaskellDepends = [ attoparsec base bytestring Cabal containers directory filepath haskell-gi-base mtl pretty-show process regex-tdfa safe text transformers xdg-basedir xml-conduit ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - executableHaskellDepends = [ - base containers directory filepath haskell-gi-base pretty-show text - ]; testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; @@ -97114,8 +97691,8 @@ self: { ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.21.3"; - sha256 = "1nh2cb8l0yvn6hp5bw273yyj0y15f1sd8115wi7sxyvas5h5q7m4"; + version = "0.21.4"; + sha256 = "0vrl0cqws1l0ba7avf16c9zyfsvq7gd8wv4sjzd7rjk6jmg38vds"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -97476,8 +98053,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.2"; - sha256 = "1gfqyh0lgi4n20dmh6pavxixy3flw385fp2iisks99l30nzn0kyv"; + version = "0.9.3"; + sha256 = "1gr5sxjjkf7faiyc4y1sbiv06c5fiz7w5s8sxz7hh5k54w8nhs4c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath @@ -99146,22 +99723,20 @@ self: { "haskoin-core" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring - , cereal, conduit, containers, cryptonite, deepseq, entropy - , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3 - , network, QuickCheck, safe, scientific, secp256k1-haskell, split - , string-conversions, text, time, transformers - , unordered-containers, vector + , cereal, conduit, containers, cryptonite, entropy, hashable, hspec + , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck + , safe, scientific, secp256k1-haskell, split, string-conversions + , text, time, transformers, unordered-containers, vector }: mkDerivation { pname = "haskoin-core"; - version = "0.5.2"; - sha256 = "1sjsni26m9f36v9zc3q6gkpv8d7bnwvn88s1v77d5z81jszfwq2b"; + version = "0.8.1"; + sha256 = "0wlsxxrb4a7dn19412gxkwlayrjzpawkpxxy7mww279i159zl7k8"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit - containers cryptonite deepseq entropy hashable memory mtl murmur3 - network QuickCheck scientific secp256k1-haskell split - string-conversions text time transformers unordered-containers - vector + containers cryptonite entropy hashable memory mtl murmur3 network + QuickCheck scientific secp256k1-haskell split string-conversions + text time transformers unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring cereal containers hspec HUnit mtl QuickCheck @@ -99198,23 +99773,26 @@ self: { "haskoin-node" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra - , haskoin-core, hspec, monad-logger, mtl, network, nqe, random - , resourcet, rocksdb-haskell, rocksdb-query, string-conversions - , time, unliftio + , data-default, hashable, haskoin-core, hspec, hspec-discover + , HUnit, monad-logger, mtl, network, nqe, random, resourcet + , rocksdb-haskell, rocksdb-query, safe, string-conversions, text + , time, transformers, unliftio, unordered-containers }: mkDerivation { pname = "haskoin-node"; - version = "0.6.1"; - sha256 = "06f1jmdgy5afkxcr06y1cp4jz21nby4snhnbpylj25d2y0dak8wy"; + version = "0.8.1"; + sha256 = "08zwn8s1ddr6aw2c3n6j2xazxa7zc3x5ga27v2rwqky0cma311c4"; libraryHaskellDepends = [ - base bytestring cereal conduit conduit-extra haskoin-core - monad-logger mtl network nqe random resourcet rocksdb-haskell - rocksdb-query string-conversions time unliftio + base bytestring cereal conduit conduit-extra data-default hashable + haskoin-core monad-logger mtl network nqe random resourcet + rocksdb-haskell rocksdb-query string-conversions text time + transformers unliftio unordered-containers ]; testHaskellDepends = [ - base bytestring cereal haskoin-core hspec monad-logger mtl network - nqe random rocksdb-haskell unliftio + base bytestring cereal haskoin-core hspec HUnit monad-logger mtl + network nqe random rocksdb-haskell safe unliftio ]; + testToolDepends = [ hspec-discover ]; description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -103002,6 +103580,7 @@ self: { testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) secp256k1;}; "hevolisa" = callPackage @@ -105642,6 +106221,7 @@ self: { ]; description = "A terminal UI as drop-in replacement for hledger add"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-interest" = callPackage @@ -105676,6 +106256,7 @@ self: { ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-lib" = callPackage @@ -106391,6 +106972,7 @@ self: { ]; description = "Conversions between hmatrix and vector-sized types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmeap" = callPackage @@ -108519,6 +109101,8 @@ self: { pname = "hpack-dhall"; version = "0.3.0"; sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh"; + revision = "2"; + editedCabalFile = "0qjw27y6q1g2yfgg7wijzi0xd9ccz3far4dixs18nd2wqsw8ih51"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109275,6 +109859,7 @@ self: { ]; description = "A Riemann Client for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hruby" = callPackage @@ -110851,35 +111436,33 @@ self: { }) {}; "hsdev" = callPackage - ({ mkDerivation, aeson, aeson-lens, aeson-pretty, array, async - , attoparsec, base, bytestring, Cabal, containers, cpphs - , data-default, deepseq, direct-sqlite, directory, exceptions - , filepath, fsnotify, ghc, ghc-boot, ghc-paths, ghc-syb-utils - , haddock-api, haddock-library, haskell-names, haskell-src-exts - , hdocs, hformat, hlint, hspec, HTTP, lens, lifted-base, mmorph - , monad-control, monad-loops, mtl, network, optparse-applicative - , process, regex-pcre-builtin, scientific, simple-log - , sqlite-simple, stm, syb, template-haskell, text, text-region - , time, transformers, transformers-base, traverse-with-class - , uniplate, unix, unordered-containers, vector + ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec + , base, bytestring, Cabal, containers, cpphs, data-default, deepseq + , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc + , ghc-boot, ghc-paths, haddock-api, haddock-library, haskell-names + , haskell-src-exts, hdocs, hformat, hlint, hspec, HTTP, lens + , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl + , network, optparse-applicative, process, regex-pcre-builtin + , scientific, simple-log, sqlite-simple, stm, syb, template-haskell + , text, text-region, time, transformers, transformers-base + , traverse-with-class, uniplate, unix, unordered-containers, vector }: mkDerivation { pname = "hsdev"; - version = "0.3.1.4"; - sha256 = "12mz6ahfs693yxi02765v4215dbs2pzqp17w49z38zz3y6kcwmb9"; + version = "0.3.2.1"; + sha256 = "01sfpd2dsqbbkxq5arb0gzllfyfcmjwcln91v02f5x1f6ksjlpzp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async attoparsec base bytestring Cabal containers cpphs data-default deepseq direct-sqlite directory - exceptions filepath fsnotify ghc ghc-boot ghc-paths ghc-syb-utils - haddock-api haddock-library haskell-names haskell-src-exts hdocs - hformat hlint HTTP lens lifted-base mmorph monad-control - monad-loops mtl network optparse-applicative process - regex-pcre-builtin scientific simple-log sqlite-simple stm syb - template-haskell text text-region time transformers - transformers-base traverse-with-class uniplate unix - unordered-containers vector + exceptions filepath fsnotify ghc ghc-boot ghc-paths haddock-api + haddock-library haskell-names haskell-src-exts hdocs hformat hlint + HTTP lens lifted-base mmorph monad-control monad-loops mtl network + optparse-applicative process regex-pcre-builtin scientific + simple-log sqlite-simple stm syb template-haskell text text-region + time transformers transformers-base traverse-with-class uniplate + unix unordered-containers vector ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring containers deepseq directory @@ -110887,8 +111470,8 @@ self: { process text transformers unordered-containers ]; testHaskellDepends = [ - aeson aeson-lens async base containers data-default deepseq - directory filepath hformat hspec lens mtl text + aeson async base containers data-default deepseq directory filepath + hformat hspec lens lens-aeson mtl text ]; description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; @@ -112080,6 +112663,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Helper functions to simplify adding integration tests"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-discover_2_4_8" = callPackage @@ -115177,8 +115761,8 @@ self: { pname = "httpd-shed"; version = "0.4.0.3"; sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh"; - revision = "1"; - editedCabalFile = "159cjn9j8lq00gj2yvrzp81r37av25f83chsimp88h55zm9z8akw"; + revision = "2"; + editedCabalFile = "12y9qf8s0aq4dc80wrvh14cjvvm4mcygrqq72w4z8w9n8mp8jg9p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base network network-uri ]; @@ -116426,6 +117010,7 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect" = callPackage @@ -119549,8 +120134,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "inchworm"; - version = "1.0.2.2"; - sha256 = "0r8a8hg3fzfc619zsjdnid1la0njnfrijhqfgqjmis4ncivah52h"; + version = "1.0.2.4"; + sha256 = "0r4d3pqpkmfa6ksjzvm8kjzrrkvb0lv76cf6fcrciwm7dj5biz74"; libraryHaskellDepends = [ base ]; description = "Inchworm Lexer Framework"; license = stdenv.lib.licenses.mit; @@ -119653,6 +120238,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "incremental-parser_0_3_2" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.3.2"; + sha256 = "0rzm83mjbvaxa48yjs16c1v41l0yy1nfilc549z4vjgzqixy1pw6"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -119789,8 +120394,8 @@ self: { }: mkDerivation { pname = "indexation"; - version = "0.6.4.1"; - sha256 = "04xywlx0xngbycc77x14nfvjb8z0q7mmyab75l8z223fj1fh3c21"; + version = "0.8"; + sha256 = "111ikvrmxhqb1idpc1n70hds6slp3c9i15pigmpldj73jxinqihf"; libraryHaskellDepends = [ base bitvec bytestring cereal cereal-vector contravariant deepseq deferred-folds dense-int-set focus foldl hashable list-t mmorph @@ -120056,6 +120661,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inflections_0_4_0_4" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec + , hspec-megaparsec, megaparsec, QuickCheck, text + , unordered-containers + }: + mkDerivation { + pname = "inflections"; + version = "0.4.0.4"; + sha256 = "0lspb0xpfj4q6wrzgss7pfjmr6xb5clj7y686vsairbkpcj3cfcl"; + libraryHaskellDepends = [ + base exceptions megaparsec text unordered-containers + ]; + testHaskellDepends = [ + base containers hspec hspec-megaparsec megaparsec QuickCheck text + ]; + description = "Inflections library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inflist" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -120476,16 +121101,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "inspection-testing_0_3" = callPackage + "inspection-testing_0_4" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: mkDerivation { pname = "inspection-testing"; - version = "0.3"; - sha256 = "0drrfl1k9y7vm270iwr1l451vifffn3qmxjm92rmdq9sk3kij3al"; - revision = "1"; - editedCabalFile = "06lb7gkgv5hns2kpslabl1zhd4i45wnnhcd4kmcz0n7d3hdx35cg"; + version = "0.4"; + sha256 = "04km186267ssaqs18kxjzsbya4jhsbyfj51959clfzbi1bfj0yfb"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -120733,6 +121356,8 @@ self: { pname = "integer-logarithms"; version = "1.0.2.2"; sha256 = "1hvzbrh8fm1g9fbavdym52pr5n9f2bnfx1parkfizwqlbj6n51ms"; + revision = "1"; + editedCabalFile = "1684dkh8j2xqsd85bfsmhv3iam37hasjg4x79mvl6xh7scmpfdbw"; libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -121355,6 +121980,7 @@ self: { testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-grammar" = callPackage @@ -121397,6 +122023,7 @@ self: { ]; description = "invertible transformer instances for HXT Picklers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-syntax" = callPackage @@ -121716,6 +122343,7 @@ self: { ]; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ip_1_4_1" = callPackage @@ -122764,6 +123392,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "iterm-show" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring }: + mkDerivation { + pname = "iterm-show"; + version = "0.1.0.1"; + sha256 = "1wlrn6q3v5a4pqmk3a3syir7szq97g658s1bzrq5p65frs7i7daw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base base64-bytestring bytestring ]; + executableHaskellDepends = [ base bytestring ]; + description = "Enable graphical display of images inline on some terminals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "iterm-show-JuicyPixels" = callPackage + ({ mkDerivation, base, iterm-show, JuicyPixels }: + mkDerivation { + pname = "iterm-show-JuicyPixels"; + version = "0.1.0.0"; + sha256 = "1r4if1izanpz7kc2hl8vcn6iz7p0sk5dqq8rxvrpclcx3dklhh6z"; + libraryHaskellDepends = [ base iterm-show JuicyPixels ]; + description = "Orphan Show instances for JuciyPixels image types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "iterm-show-diagrams" = callPackage + ({ mkDerivation, base, diagrams-lib, diagrams-rasterific + , iterm-show, JuicyPixels + }: + mkDerivation { + pname = "iterm-show-diagrams"; + version = "0.1.0.0"; + sha256 = "1szan9v24d8fksxcw3fqvzppf49664xm5y1zdk9yv007r5pfxr4c"; + libraryHaskellDepends = [ + base diagrams-lib diagrams-rasterific iterm-show JuicyPixels + ]; + description = "Orphan Show instances for diagrams package that render inline in some terminals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ival" = callPackage ({ mkDerivation, alg, base, smallcheck, tasty, tasty-smallcheck }: mkDerivation { @@ -125992,10 +126660,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.6.1.0"; - sha256 = "0mqx1dvq5v18sd2rqr2zlvmznj84vwml8zdf0hlhviw7kl9wjbah"; - revision = "1"; - editedCabalFile = "1znlk9jkrp3hl1frra563c61p49sp56nw1xps593w2qq9hr037rq"; + version = "0.6.3.0"; + sha256 = "0pjd81rp5rhf0nxgqi274zlffhcvd3v8nl60y5pj06wpyn55wx0g"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -126259,6 +126925,7 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kbq-gu" = callPackage @@ -130941,12 +131608,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens-labels_0_3_0_0" = callPackage + "lens-labels_0_3_0_1" = callPackage ({ mkDerivation, base, ghc-prim, profunctors, tagged }: mkDerivation { pname = "lens-labels"; - version = "0.3.0.0"; - sha256 = "1kpbn9lsaxvw86w3r121rymrxcyihci7njpcw3f2663pb01v39rn"; + version = "0.3.0.1"; + sha256 = "0zz2w01knsj1zn9vj8g3dbhvh0sgnibr5wm9dn91qv0bmps745z7"; libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; description = "Integration of lenses with OverloadedLabels"; license = stdenv.lib.licenses.bsd3; @@ -132211,6 +132878,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {xslt = null;}; + "libyaml" = callPackage + ({ mkDerivation, base, bytestring, conduit, resourcet }: + mkDerivation { + pname = "libyaml"; + version = "0.1.0.0"; + sha256 = "01vgzf05ad1v8h65n12fwd2whldnqhlv7cbcaf08m3ck2viqimlw"; + libraryHaskellDepends = [ base bytestring conduit resourcet ]; + description = "Low-level, streaming YAML interface"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "libzfs" = callPackage ({ mkDerivation, base, mtl, nvpair, transformers, zfs }: mkDerivation { @@ -132287,6 +132965,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lift-generics" = callPackage @@ -134598,8 +135277,8 @@ self: { }: mkDerivation { pname = "load-env"; - version = "0.2.0.1"; - sha256 = "1xkk72lfpb4fbnmm7wqxxl1v7jwk9b6da53i90k3dvypakl4gryb"; + version = "0.2.0.2"; + sha256 = "063zd2nbwbyndfy1hrir9x270f99wzbyarfj561r9dddak2754w1"; libraryHaskellDepends = [ base directory filepath parsec ]; testHaskellDepends = [ base directory doctest hspec parsec temporary @@ -138444,6 +139123,7 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -138665,6 +139345,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv_0_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, data-default, data-default-class + , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions + , vector + }: + mkDerivation { + pname = "massiv"; + version = "0.2.2.0"; + sha256 = "1mw636d070icl2wanvgrr8k0a44fhzdmzkw3047442nvl3nyghbc"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq ghc-prim primitive + vector + ]; + testHaskellDepends = [ + base bytestring data-default deepseq hspec QuickCheck + safe-exceptions vector + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq, directory , filepath, JuicyPixels, massiv, netpbm, process, vector @@ -141466,8 +142168,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.2.2"; - sha256 = "0dag2r79wpq67ydd7blwha2jf8nd5311bxv3li3fm88m0kbqrni1"; + version = "0.5.2.3"; + sha256 = "0s3bxj6d3p0fng08da9y2qb8cl967lqhsqplhcwmaj3aai72rj5w"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base monad-control mtl murmur-hash network random resource-pool @@ -141938,6 +142640,7 @@ self: { ]; description = "A Minisat-based CDCL SAT solver in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mirror-tweet" = callPackage @@ -143875,6 +144578,7 @@ self: { libraryHaskellDepends = [ base mtl stm ]; description = "Overloading of concurrency variables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monadLib" = callPackage @@ -144903,6 +145607,7 @@ self: { ]; description = "General purpose migrations library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "moto-postgresql" = callPackage @@ -144918,6 +145623,7 @@ self: { ]; description = "PostgreSQL-based migrations registry for moto"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "motor" = callPackage @@ -149527,6 +150233,7 @@ self: { ]; description = "WebSocket backend for MessagePack RPC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-metrics" = callPackage @@ -151553,19 +152260,19 @@ self: { }) {}; "nqe" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , containers, exceptions, hashable, hspec, mtl, stm, stm-conduit , text, unique, unliftio }: mkDerivation { pname = "nqe"; - version = "0.5.0"; - sha256 = "0i5rp2nh4gr6isqvzkxmq31b7ycp2dhs885hn5ng6bc9q3nsjxly"; + version = "0.6.1"; + sha256 = "1l0dydhcqmgf6bamy29sgry8sjirvw3khzjkhpjlb12zl2y75xxd"; libraryHaskellDepends = [ base conduit containers hashable mtl stm unique unliftio ]; testHaskellDepends = [ - base bytestring conduit conduit-extra exceptions hspec stm + async base bytestring conduit conduit-extra exceptions hspec stm stm-conduit text unliftio ]; description = "Concurrency library in the style of Erlang/OTP"; @@ -153899,10 +154606,8 @@ self: { }: mkDerivation { pname = "opensource"; - version = "0.1.0.0"; - sha256 = "09q1c9v27b7d482ccgv73fhvhk3jfq2fvxnrz6ywi3zvf37bcn9l"; - revision = "1"; - editedCabalFile = "02zb9m7d6fsjbqgwbjnkrpgqc93zm34bvzgasw903hhdkskshrp6"; + version = "0.1.1.0"; + sha256 = "10jlgk1rbpz5h1mbknq0i71k0n4ppp3yd498i7p2l79a9gi6pwqy"; libraryHaskellDepends = [ aeson base http-client http-client-tls text transformers ]; @@ -154637,6 +155342,7 @@ self: { ]; description = "Orchestration-style co-ordination EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orchestrate" = callPackage @@ -154865,21 +155571,21 @@ self: { "orgmode-parse" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , free, hashable, HUnit, neat-interpolation, old-locale, tasty - , tasty-hunit, text, thyme, unordered-containers + , free, hashable, HUnit, neat-interpolation, old-locale, semigroups + , tasty, tasty-hunit, text, thyme, unordered-containers }: mkDerivation { pname = "orgmode-parse"; - version = "0.2.1"; - sha256 = "1zpkj3f0gdi5ri39s7g532j2pgk5mgs97y2g1gj42q9aa5lm5hw5"; + version = "0.2.2"; + sha256 = "1f6wcxkln5ddaa2z7wbkp6wndgq38qv9h1wnn27gqcms02758v2r"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable - old-locale text thyme unordered-containers + old-locale semigroups text thyme unordered-containers ]; testHaskellDepends = [ aeson attoparsec base bytestring containers free hashable HUnit - neat-interpolation old-locale tasty tasty-hunit text thyme - unordered-containers + neat-interpolation old-locale semigroups tasty tasty-hunit text + thyme unordered-containers ]; description = "A collection of Attoparsec combinators for parsing org-mode flavored documents"; license = stdenv.lib.licenses.bsd3; @@ -154887,27 +155593,27 @@ self: { }) {}; "orgstat" = callPackage - ({ mkDerivation, aeson, attoparsec, base, boxes, bytestring, colour - , containers, data-default, diagrams-lib, diagrams-svg, directory - , exceptions, filepath, formatting, hashable, hspec, HUnit, lens - , linear, log-warper, mtl, optparse-simple, orgmode-parse - , QuickCheck, quickcheck-text, text, time, transformers, turtle - , universum, yaml + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, boxes + , bytestring, colour, containers, data-default, diagrams-lib + , diagrams-svg, directory, exceptions, filepath, fmt, formatting + , hashable, hspec, HUnit, lens, linear, mtl, optparse-simple + , orgmode-parse, QuickCheck, quickcheck-text, text, time + , transformers, turtle, universum, yaml }: mkDerivation { pname = "orgstat"; - version = "0.1.4"; - sha256 = "063iqrxcqj4mxlic934ksrl23alvpwr3q5k2w666sqc02nkmcv88"; + version = "0.1.5"; + sha256 = "00zkn7d45q9wbbpkygkz8fslals6z5d90hvg1jgna4vw87zqwkdz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base boxes bytestring colour containers - data-default diagrams-lib diagrams-svg directory exceptions - filepath formatting hashable lens linear log-warper mtl + aeson ansi-terminal attoparsec base boxes bytestring colour + containers data-default diagrams-lib diagrams-svg directory + exceptions filepath fmt formatting hashable lens linear mtl optparse-simple orgmode-parse text time turtle universum yaml ]; executableHaskellDepends = [ - base bytestring directory exceptions filepath formatting log-warper + base bytestring directory exceptions filepath formatting optparse-simple universum ]; testHaskellDepends = [ @@ -155851,6 +156557,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_14_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , Cabal, containers, data-default, directory, filepath, hs-bibutils + , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time + , unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.14.7"; + sha256 = "18r0pqv170yrsvgarj4xlpgmanydycqq9akxlnp1pkinqhs24iyd"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time unordered-containers vector + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring filepath pandoc + pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath mtl pandoc + pandoc-types process temporary text yaml + ]; + doCheck = false; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -156088,8 +156829,8 @@ self: { }: mkDerivation { pname = "pandoc-pyplot"; - version = "1.0.0.1"; - sha256 = "1sxksn2b7x1mrgla0c3dn5x9js0yhfg125259kh1iqzlkanj81px"; + version = "1.0.2.0"; + sha256 = "0q6qj45g8d95z86lqkwpxw7c929x7q68611602mp2ip31dib11xc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157040,8 +157781,8 @@ self: { }: mkDerivation { pname = "paripari"; - version = "0.5.0.0"; - sha256 = "0wk0b7vb3y2gs1sayd0sh5wa643q5vvc6s2cq9p1h8paxkhd3ypb"; + version = "0.6.0.0"; + sha256 = "1604py5ms14xhmvsxdqx56xfbs3g4wkhjd8f5gsmhpqwz7acy511"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159450,6 +160191,38 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent_2_9_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, blaze-markup, bytestring, conduit, containers + , fast-logger, hspec, http-api-data, monad-control, monad-logger + , mtl, old-locale, path-pieces, resource-pool, resourcet + , scientific, silently, tagged, template-haskell, text, time + , transformers, unliftio-core, unordered-containers, vector, void + }: + mkDerivation { + pname = "persistent"; + version = "2.9.0"; + sha256 = "0qgjfydyhcyfr8mni0qjykn3jsh4r299yy2wqsl3rsd19bmmr1p7"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html blaze-markup + bytestring conduit containers fast-logger http-api-data + monad-logger mtl old-locale path-pieces resource-pool resourcet + scientific silently tagged template-haskell text time transformers + unliftio-core unordered-containers vector void + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data monad-control + monad-logger mtl old-locale path-pieces resource-pool resourcet + scientific tagged template-haskell text time transformers + unordered-containers vector + ]; + 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 @@ -159646,6 +160419,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-mysql_2_9_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-logger, mysql, mysql-simple, persistent + , resource-pool, resourcet, text, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.9.0"; + sha256 = "0aa1ia4r49vy5hfg59rbrfmfwdyaix0l32drdjnj9xxqbayifjzf"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + description = "Backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-logger, mysql-haskell, network, persistent @@ -159725,6 +160517,27 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-postgresql_2_9_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-logger, persistent, postgresql-libpq + , postgresql-simple, resource-pool, resourcet, text, time + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.9.0"; + sha256 = "1rqlbdz7wwjl1d3xqp01sz5xnn8hff35hgkhx6c66lzrfyl9q0mx"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + persistent postgresql-libpq postgresql-simple resource-pool + resourcet text time transformers unliftio-core + ]; + 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 @@ -159742,6 +160555,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-qq" = callPackage + ({ mkDerivation, base, haskell-src-meta, mtl, persistent + , template-haskell, text + }: + mkDerivation { + pname = "persistent-qq"; + version = "2.9.0"; + sha256 = "02dvsmlamfy93490qhb9qq25vq8wrqhzzza5q5shvak1n7wgjvh0"; + revision = "1"; + editedCabalFile = "15zkam90rfq33549kqpwyllrjpdvgkcpwnv16y6n439xd96vyyci"; + libraryHaskellDepends = [ + base haskell-src-meta mtl persistent template-haskell text + ]; + description = "Provides a quasi-quoter for raw SQL for persistent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-ratelimit" = callPackage ({ mkDerivation, base, time, yesod }: mkDerivation { @@ -159871,6 +160702,35 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_9_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , hspec, microlens-th, monad-logger, old-locale, persistent + , persistent-template, resource-pool, resourcet, sqlite, temporary + , text, time, transformers, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.9.0"; + sha256 = "0yn99m64p49x0bghpbnm77bk3ghk99w2w5d1772cmx15aq2d7w0y"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + old-locale persistent resource-pool resourcet text time + transformers unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base hspec persistent persistent-template temporary text time + transformers + ]; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-template" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -161106,6 +161966,8 @@ self: { pname = "pipes"; version = "4.3.9"; sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w"; + revision = "1"; + editedCabalFile = "0mkwbbn8vlrsvm3pl2cyaw1qr9hbjqfm831naj7cbrmiksf2l5aa"; libraryHaskellDepends = [ base exceptions mmorph mtl semigroups transformers void ]; @@ -162615,6 +163477,7 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plist" = callPackage @@ -164379,8 +165242,8 @@ self: { }: mkDerivation { pname = "postgresql-connector"; - version = "0.2.6"; - sha256 = "1nhsplb7s4k3y2450pr57fl39n1gjs2110vvr9v4pn0h6hwz1yl3"; + version = "0.2.7"; + sha256 = "1p5nqav8yxgj8knbrmfv1lgpflid338ka2a9xp3pixq0dwz7argk"; libraryHaskellDepends = [ base bytestring exceptions lens mtl postgresql-simple resource-pool resourcet time transformers-base @@ -164715,6 +165578,7 @@ self: { testHaskellDepends = [ rerebase ]; description = "PostgreSQL SQL syntax utilities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {pg_query = null;}; "postgresql-transactional" = callPackage @@ -165297,18 +166161,18 @@ self: { ({ mkDerivation, aeson, base, basic-prelude, exceptions , fast-logger, lens, lifted-base, monad-control, monad-logger , MonadRandom, mtl, network, resourcet, safe, template-haskell - , text, text-manipulate, time, transformers-base, unliftio-core + , text, text-manipulate, time, transformers-base , unordered-containers, uuid }: mkDerivation { pname = "preamble"; - version = "0.0.64"; - sha256 = "1h7px6kz2plp5fix7i0dviv0hg3nzq31pvwwayh4q747lh3xjwp4"; + version = "0.0.65"; + sha256 = "1i11d46rrnlsjipy74rb9yfq0d91lk7wjkiz4z9sl099pgmgc9lw"; libraryHaskellDepends = [ aeson base basic-prelude exceptions fast-logger lens lifted-base monad-control monad-logger MonadRandom mtl network resourcet safe template-haskell text text-manipulate time transformers-base - unliftio-core unordered-containers uuid + unordered-containers uuid ]; description = "Yet another prelude"; license = stdenv.lib.licenses.mit; @@ -166671,6 +167535,7 @@ self: { ]; description = "Convert colors to different color spaces, interpolate colors, and transform colors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "probability" = callPackage @@ -167862,15 +168727,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens_0_4_0_0" = callPackage + "proto-lens_0_4_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq , lens-family, lens-labels, parsec, pretty, text, transformers , void }: mkDerivation { pname = "proto-lens"; - version = "0.4.0.0"; - sha256 = "1yj86mnjc3509ad9g19fr9fdkblwfyilb5ydv1isn6xs7llq3c3r"; + version = "0.4.0.1"; + sha256 = "1ryz183ds1k28nvw6y1w84k29aq5mgrpv5yyqarj0g463gp137cm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq lens-family @@ -167896,14 +168761,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens-arbitrary_0_1_2_3" = callPackage + "proto-lens-arbitrary_0_1_2_4" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.3"; - sha256 = "0ljr6iyqrdlfay0yd2j6q2wm5k79wnn4ay4kbmzmw2fdy0p73gyn"; + version = "0.1.2.4"; + sha256 = "0d17vkcv21qphs44ig5fdcvisxn20980m0lx693w52ikzsax5k4s"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -167934,15 +168799,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "proto-lens-combinators_0_4" = callPackage + "proto-lens-combinators_0_4_0_1" = callPackage ({ mkDerivation, base, Cabal, HUnit, lens-family, lens-family-core , proto-lens, proto-lens-runtime, proto-lens-setup, test-framework , test-framework-hunit, transformers }: mkDerivation { pname = "proto-lens-combinators"; - version = "0.4"; - sha256 = "1fc98ynjx0b9x4v56pzkf3h9y46a583aw3lf7l9ij4ck87y83q6b"; + version = "0.4.0.1"; + sha256 = "0dkd9jmmxf5r01di3q1r0qnyhkyxrjlnfxa40c2vq0fl16h68lkb"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ base lens-family proto-lens transformers @@ -167977,8 +168842,8 @@ self: { ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.1.3"; - sha256 = "0dciwsc1qa9iisym5702a0kjwfiikqgfijdzpf21q2aiffagkacd"; + version = "0.1.1.4"; + sha256 = "1dn5cjwbagcykh1fv99v6mmj7mlnl46nqlwpz1878fy7vl7i8lzh"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; @@ -168021,14 +168886,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; - "proto-lens-protobuf-types_0_4_0_0" = callPackage + "proto-lens-protobuf-types_0_4_0_1" = callPackage ({ mkDerivation, base, Cabal, lens-labels, proto-lens , proto-lens-runtime, proto-lens-setup, protobuf, text }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.4.0.0"; - sha256 = "1h2ss8nn569g97cvq3lflgcc6sz3k9y3gx0ini69d1lrkccd8jmg"; + version = "0.4.0.1"; + sha256 = "091284pyp4b36hnvfjsrsg6zlgw1payzwfbsy66sgbbi285mwira"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ base lens-labels proto-lens proto-lens-runtime text @@ -168092,14 +168957,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) protobuf;}; - "proto-lens-protoc_0_4_0_0" = callPackage + "proto-lens-protoc_0_4_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, filepath , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.4.0.0"; - sha256 = "1w22278jjcyj9z4lwpkxws9v97maqrwacmd5d0pl8d2byh8jqry8"; + version = "0.4.0.1"; + sha256 = "1vigmy8aq65yaspgq803a4vxsq5v3zwlaq95yrf47zrvcx1lw3ni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168121,8 +168986,8 @@ self: { }: mkDerivation { pname = "proto-lens-runtime"; - version = "0.4.0.1"; - sha256 = "0kyd2y4jhzb0isclk5gw98c4n49kjnl27rlywmajmbfwf2d6w4yc"; + version = "0.4.0.2"; + sha256 = "1k6biy5z890nn5b76sd3xr086sbrqr09rx1r2a7jxra2l2ymc4sr"; libraryHaskellDepends = [ base bytestring containers deepseq filepath lens-family lens-labels proto-lens text @@ -168138,8 +169003,8 @@ self: { }: mkDerivation { pname = "proto-lens-setup"; - version = "0.4.0.0"; - sha256 = "0j0a2jq9axq8v4h918lnrvjg0zyb0gvr5v3x9c6lajv8fb8bxmlf"; + version = "0.4.0.1"; + sha256 = "1x8lj5z2ih20757m0di0lg4kn3s3g90qpjpv5wkzj2xf097cwqjp"; libraryHaskellDepends = [ base bytestring Cabal containers deepseq directory filepath process proto-lens-protoc temporary text @@ -168333,6 +169198,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protolude_0_2_3" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text + , transformers, transformers-compat + }: + mkDerivation { + pname = "protolude"; + version = "0.2.3"; + sha256 = "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj"; + libraryHaskellDepends = [ + array async base bytestring containers deepseq ghc-prim hashable + mtl mtl-compat stm text transformers transformers-compat + ]; + description = "A small prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude-lifted" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base, protolude }: @@ -171763,6 +172646,8 @@ self: { pname = "random-bytestring"; version = "0.1.3.1"; sha256 = "1d0f3y8n87fyyvlkn1c87d47xi50qn4cn11bnsn052860kyjda1k"; + revision = "1"; + editedCabalFile = "0gk5hcx1j06rklfd2cv63kh5dzjk8hr184riam784c7s9zg3s9a4"; libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; benchmarkHaskellDepends = [ async base bytestring criterion cryptonite entropy ghc-prim @@ -172442,10 +173327,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.3.3.1"; - sha256 = "110ivmmgajv232hyg9pc30lzg3l72q8ykyp1zrjs3k5n309ymdfn"; - revision = "1"; - editedCabalFile = "0mhg2k786zx1cmblijnz73cf12h1s5grmkc0wb63612hnxxz53i7"; + version = "0.3.3.2"; + sha256 = "1i0pl1hin1ipi3l0074ywd1khacpbvz3x0frx0j0hmbfiv4n3nq2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174480,8 +175363,8 @@ self: { }: mkDerivation { pname = "reflex-dom-fragment-shader-canvas"; - version = "0.1.0.1"; - sha256 = "17b023xjz29n673q4a5bd9r5bj8hb7b1q6ms6qppmwdimk3glz4z"; + version = "0.2"; + sha256 = "08ayk3y22mmgrpd03128h60wmg698d0c1cxack9akm636hp83y7z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176847,6 +177730,7 @@ self: { libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reroute" = callPackage @@ -177119,8 +178003,8 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.2.1"; - sha256 = "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7"; + version = "1.2.2"; + sha256 = "1rfbfcv3r1h29y0yqr3x6a1s04lbc3vzm3jqnfg4f9rqp9d448qk"; libraryHaskellDepends = [ base containers exceptions mtl primitive transformers unliftio-core ]; @@ -177971,6 +178855,7 @@ self: { executableHaskellDepends = [ base ]; description = "Gloss backend for Rhine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rhythm-game-tutorial" = callPackage @@ -178717,18 +179602,18 @@ self: { }) {inherit (pkgs) rocksdb;}; "rocksdb-query" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, hspec - , resourcet, rocksdb-haskell, unliftio + ({ mkDerivation, base, bytestring, cereal, conduit, data-default + , hspec, resourcet, rocksdb-haskell, unliftio }: mkDerivation { pname = "rocksdb-query"; - version = "0.1.4"; - sha256 = "1qk3l9plpid6i9xb1im3xkvsjvj3mk74wgxv9bpd3c3d8x83gwhb"; + version = "0.2.0"; + sha256 = "01n2zlbpldhx8rxvq89i9hsp99dvlhm6s4rwlygxd3y989an8bcf"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet rocksdb-haskell unliftio ]; testHaskellDepends = [ - base cereal hspec rocksdb-haskell unliftio + base cereal data-default hspec rocksdb-haskell unliftio ]; description = "RocksDB database querying library for Haskell"; license = stdenv.lib.licenses.publicDomain; @@ -179215,6 +180100,8 @@ self: { pname = "roundtrip"; version = "0.2.0.5"; sha256 = "10b57yfcnsgrkx4djgiinnyh46hwbysskmlh27bajp82p91v7xfa"; + revision = "1"; + editedCabalFile = "1kxlgbgwlrln9pal7yq4i487yy6jyf04s6fpb63w7z16anxly4bs"; libraryHaskellDepends = [ base containers pretty safe template-haskell text xml-types ]; @@ -179230,8 +180117,8 @@ self: { }: mkDerivation { pname = "roundtrip-aeson"; - version = "0.2.0.0"; - sha256 = "0m96447l2m0y4aapil077xpnzlkjla0yp2bzajfijik9gkjbiih4"; + version = "0.3.0.2"; + sha256 = "0qlsmmcidiagjyb3kfp1hplkkzpibgxw31j7cxhma3l2gs2yal6f"; libraryHaskellDepends = [ aeson base bytestring containers lens lens-aeson roundtrip scientific text unordered-containers vector @@ -180139,8 +181026,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "safe-coerce"; - version = "0.1.0.0"; - sha256 = "0qv4a6p547cnyvchnjrya8paq39gqpnbska9v5l64lqn3a28yk8p"; + version = "0.2.0.0"; + sha256 = "059mn68pj57dvjzmv3vypv0askx02f4hlalbzsr34cn2h7ndw6df"; libraryHaskellDepends = [ base ]; description = "A friendly shorthand for an old friend"; license = stdenv.lib.licenses.bsd3; @@ -180704,8 +181591,8 @@ self: { }: mkDerivation { pname = "saltine"; - version = "0.1.0.1"; - sha256 = "05m3w0xibnhk3whzp7rzn2y2hv9f2i8pyvjnmzsxwbs8ws30cac5"; + version = "0.1.0.2"; + sha256 = "0253m8n6s39fnr8wz1z240kaizw3chfm1fgwp51dgqgk0nwrv67x"; libraryHaskellDepends = [ base bytestring profunctors ]; libraryPkgconfigDepends = [ libsodium ]; testHaskellDepends = [ @@ -183082,21 +183969,21 @@ self: { "secp256k1-haskell" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cereal - , entropy, hspec, hspec-discover, HUnit, mtl, QuickCheck, secp256k1 - , string-conversions + , entropy, hashable, hspec, hspec-discover, HUnit, mtl, QuickCheck + , secp256k1, string-conversions }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.1.2"; - sha256 = "1kap1jjhqqmp8f067z9z8dw39gswn37bkj5j3byyvv4cn077ihva"; + version = "0.1.3"; + sha256 = "0wdxz8vmk5yfhjrwpynk1zpmvgl1rnwz7zvkx7g7pxxvz3z8rpbz"; libraryHaskellDepends = [ - base base16-bytestring bytestring cereal entropy QuickCheck - string-conversions + base base16-bytestring bytestring cereal entropy hashable + QuickCheck string-conversions ]; librarySystemDepends = [ secp256k1 ]; testHaskellDepends = [ - base base16-bytestring bytestring cereal entropy hspec HUnit mtl - QuickCheck string-conversions + base base16-bytestring bytestring cereal entropy hashable hspec + HUnit mtl QuickCheck string-conversions ]; testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1 library from Bitcoin Core"; @@ -184152,34 +185039,29 @@ self: { }) {}; "serialise" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring - , base64-bytestring, binary, bytestring, cborg, cereal - , cereal-vector, containers, criterion, deepseq, directory + ({ mkDerivation, aeson, array, base, binary, bytestring, cborg + , cereal, cereal-vector, containers, criterion, deepseq, directory , filepath, ghc-prim, half, hashable, pretty, primitive, QuickCheck - , quickcheck-instances, scientific, store, tar, tasty, tasty-hunit + , quickcheck-instances, semigroups, store, tar, tasty, tasty-hunit , tasty-quickcheck, text, time, unordered-containers, vector, zlib }: mkDerivation { pname = "serialise"; - version = "0.2.0.0"; - sha256 = "1iqkawxy946dhldam30cc1k9h4g2w4cp34fg57ln9k7507mvcns0"; - revision = "2"; - editedCabalFile = "1wvqzrbf80ry5xc2s9va24024gfgwi6xj1yvm7578f7mq0k1zqvf"; + version = "0.2.1.0"; + sha256 = "19ary6ivzk8z7wcxhm860qmh7pwqj0qjqzav1h42y85l608zqgh4"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive text time unordered-containers vector ]; testHaskellDepends = [ - aeson array base base16-bytestring base64-bytestring binary - bytestring cborg containers deepseq directory filepath ghc-prim - half hashable primitive QuickCheck quickcheck-instances scientific - tasty tasty-hunit tasty-quickcheck text time unordered-containers - vector + base bytestring cborg containers directory filepath primitive + QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck + text time unordered-containers vector ]; benchmarkHaskellDepends = [ aeson array base binary bytestring cborg cereal cereal-vector containers criterion deepseq directory filepath ghc-prim half - pretty store tar text time vector zlib + pretty semigroups store tar text time vector zlib ]; description = "A binary serialisation library for Haskell values"; license = stdenv.lib.licenses.bsd3; @@ -186676,8 +187558,8 @@ self: { ({ mkDerivation, base, containers, deepseq }: mkDerivation { pname = "set-monad"; - version = "0.2.0.0"; - sha256 = "1nxgn8d0qff4s66gcvfrnxjh0aq5q5jk0s453km28457qh946azb"; + version = "0.3.0.0"; + sha256 = "0iv1mphhhqla4bbr2lhy6zj8bp963jlcxqkib2nnl7vyw1ya1cd1"; libraryHaskellDepends = [ base containers deepseq ]; description = "Set monad"; license = stdenv.lib.licenses.bsd3; @@ -187225,6 +188107,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shake_0_17" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, directory + , extra, filepath, hashable, heaps, js-flot, js-jquery, primitive + , process, QuickCheck, random, time, transformers, unix + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "shake"; + version = "0.17"; + sha256 = "18nlnxd8vad5vs4399lz1875dvapmk4fimpz3sp4b6z590d68rs1"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + heaps js-flot js-jquery primitive process random time transformers + unix unordered-containers utf8-string + ]; + executableHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + heaps js-flot js-jquery primitive process random time transformers + unix unordered-containers utf8-string + ]; + testHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + heaps js-flot js-jquery primitive process QuickCheck random time + transformers unix unordered-containers utf8-string + ]; + description = "Build system library, like Make, but more accurate dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hs2ats , language-ats, microlens, shake, shake-c, shake-cabal, shake-ext @@ -187465,8 +188380,8 @@ self: { }: mkDerivation { pname = "shakers"; - version = "0.0.49"; - sha256 = "0zhysqnr5vbmj04ippyipyqpml2zx3av3d5ikprdwksrsjhfgbp3"; + version = "0.0.50"; + sha256 = "0n1cr2bn2ar0iifjzmg714wa55r5dr0q8ygrs0lrdvanbg9s0ml6"; libraryHaskellDepends = [ base basic-prelude directory lifted-base shake ]; @@ -187852,10 +188767,8 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.4"; - sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13"; - revision = "1"; - editedCabalFile = "0hm3nlr9a3n18f7y0pnw4q4x3s8y1jxz9mify7hplpj2fq23wpdm"; + version = "0.6.5"; + sha256 = "0vg2g65km3i963scyj7fn17g562wg0mh88syxqrf7favnljid1bk"; libraryHaskellDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; @@ -189001,8 +189914,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.7"; - sha256 = "018rzapbmkkfhqzwdv2vgj4wbqi4wn2bgml0kd3khq3p06mhpnc5"; + version = "0.9.8"; + sha256 = "1yn2nnvmzfw4v7bi6jchsd8y27vpd8m4in0shydyyglpjmaq751k"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -190266,8 +191179,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.7.3"; - sha256 = "1pwawhfl2w9d06sv44lxa5hvh4lz9d5l0n8j7zjm08jibl30fc8g"; + version = "0.7.4"; + sha256 = "0w1cv21rm4ssmr2zbn7bamlfc2pkswxg5plvqzrf7rs4h1y43672"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190290,8 +191203,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.7.3"; - sha256 = "0qk2g86b0avd24q7hbkdjj0l2r5ma7kbzf3cj4sjwmh7wmx0ss7c"; + version = "0.7.4"; + sha256 = "1awddq9cn5gyafz97ir21rncq97k2gzfxijn2xmxw35qhr2kbfl0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192566,12 +193479,12 @@ self: { }) {}; "snipcheck" = callPackage - ({ mkDerivation, base, containers, pandoc, process }: + ({ mkDerivation, base, containers, pandoc, process, text }: mkDerivation { pname = "snipcheck"; - version = "0.1.0.2"; - sha256 = "15n6dwkkbr7yh1xvl0xj1kba5s3qy4s8zq01px552fm1qqa8wdzk"; - libraryHaskellDepends = [ base containers pandoc process ]; + version = "0.1.0.3"; + sha256 = "1x9jjfznvzz9pa4n54q6xja0axifnlgbp9aw93hvcr4w8f94gfp0"; + libraryHaskellDepends = [ base containers pandoc process text ]; description = "Markdown tester"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -196365,8 +197278,8 @@ self: { pname = "statestack"; version = "0.2.0.5"; sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl"; - revision = "2"; - editedCabalFile = "0c10cv107ls0wm7gs3gvknd8a1gqvrkk97frn8lp1ch697mz44rp"; + revision = "3"; + editedCabalFile = "0s9v88gcc5wnfj4c6xq86asadmh4y8z8ycv2wz5nwfwfazfgzcy3"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -196496,8 +197409,8 @@ self: { }: mkDerivation { pname = "static-text"; - version = "0.2.0.2"; - sha256 = "04sbf0zydgf18ajb20wd8wfbw4gdjmxx3f4h62w0qmafgvrr8w5c"; + version = "0.2.0.3"; + sha256 = "189x85skhzms3iydzh4gd5hmklx7ps2skzymls514drg8cz7m7ar"; libraryHaskellDepends = [ base bytestring template-haskell text vector ]; @@ -196549,6 +197462,34 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "statistics_0_15_0_0" = callPackage + ({ mkDerivation, aeson, base, base-orphans, binary + , data-default-class, deepseq, dense-linear-algebra, erf, HUnit + , ieee754, math-functions, monad-par, mwc-random, primitive + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms + , vector-binary-instances, vector-th-unbox + }: + mkDerivation { + pname = "statistics"; + version = "0.15.0.0"; + sha256 = "0wk4pv4fjpqq49vf8zanb9801lbgcbbfhhvlpp3ka6p8jmfc9scm"; + libraryHaskellDepends = [ + aeson base base-orphans binary data-default-class deepseq + dense-linear-algebra math-functions monad-par mwc-random primitive + vector vector-algorithms vector-binary-instances vector-th-unbox + ]; + testHaskellDepends = [ + aeson base binary dense-linear-algebra erf HUnit ieee754 + math-functions mwc-random primitive QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 vector + vector-algorithms + ]; + description = "A library of statistical types, data, and functions"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "statistics-dirichlet" = callPackage ({ mkDerivation, base, deepseq, hmatrix-special , nonlinear-optimization, vector @@ -198139,6 +199080,7 @@ self: { ]; description = "online streaming fft"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-histogram" = callPackage @@ -198523,10 +199465,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "strict-concurrency"; - version = "0.2.4.2"; - sha256 = "0vzqhd0sqcs2ci3zw7rm3ydmc9brl2sdc8k3jq47kd9l878xanmz"; - revision = "1"; - editedCabalFile = "12m1jbf01d4k7w1wiqcpdsbhlxi6ssbz9nx0ax2mrjjq2l0011ny"; + version = "0.2.4.3"; + sha256 = "1h2nk5fn6gclzkwn5mbkb7gcqisms8y5m3kr64hd9lska3n39n82"; libraryHaskellDepends = [ base deepseq ]; description = "Strict concurrency abstractions"; license = stdenv.lib.licenses.bsd3; @@ -198913,6 +199853,8 @@ self: { pname = "stringsearch"; version = "0.3.6.6"; sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9"; + revision = "1"; + editedCabalFile = "0z5pz5dccapz9k39r2zmf056m0x2m2lj3jahhnw3mfxlmps07378"; libraryHaskellDepends = [ array base bytestring containers ]; description = "Fast searching, splitting and replacing of ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -199306,18 +200248,19 @@ self: { "stutter" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit - , conduit-combinators, conduit-extra, mtl, optparse-applicative - , resourcet, snipcheck, tasty, tasty-ant-xml, tasty-hunit, text + , conduit-combinators, conduit-extra, exceptions, mtl + , optparse-applicative, resourcet, snipcheck, tasty, tasty-ant-xml + , tasty-hunit, text }: mkDerivation { pname = "stutter"; - version = "0.1.0.1"; - sha256 = "1s3bwwylbf7mcjzpnl8681aaw92q8kcyp074gns5cazsi0slfzl4"; + version = "0.1.0.2"; + sha256 = "1cha46fnx9balwkvwcc5b7irq410mr357rqvw85g91vv8ww209sj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring conduit conduit-combinators - conduit-extra mtl resourcet text + conduit-extra exceptions mtl resourcet text ]; executableHaskellDepends = [ attoparsec base conduit conduit-combinators optparse-applicative @@ -199739,6 +200682,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Tool for creating completely configured production Haskell projects"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sump" = callPackage @@ -200251,6 +201195,8 @@ self: { pname = "svg-builder"; version = "0.1.1"; sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g"; + revision = "1"; + editedCabalFile = "1bhp9gvid2iis411k1vvyj5krzc4ahxcqcd9cwx9h37jxg180xw1"; libraryHaskellDepends = [ base blaze-builder bytestring hashable text unordered-containers ]; @@ -200281,8 +201227,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.6.2.2"; - sha256 = "1iva5vb76z2laygvlh31zbhhcfzympk9s765499j7p356ycl0s1s"; + version = "0.6.2.3"; + sha256 = "0snvv2l7fpj7nl1sxnpxz5h2xpskjxxl0l2c7bqkwhcj7571br99"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -200510,19 +201456,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "swagger2_2_3" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat-batteries - , bytestring, Cabal, cabal-doctest, containers, doctest - , generics-sop, Glob, hashable, hspec, hspec-discover, http-media - , HUnit, insert-ordered-containers, lens, mtl, network, QuickCheck + "swagger2_2_3_0_1" = callPackage + ({ mkDerivation, aeson, base, base-compat-batteries, bytestring + , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob + , hashable, hspec, hspec-discover, http-media, HUnit + , insert-ordered-containers, lens, mtl, network, QuickCheck , quickcheck-instances, scientific, template-haskell, text, time , transformers, transformers-compat, unordered-containers - , uuid-types, vector + , utf8-string, uuid-types, vector }: mkDerivation { pname = "swagger2"; - version = "2.3"; - sha256 = "0r1bkx667727h4wvcq1l6295c78s24s6qk9p62jdiafq3844bwm3"; + version = "2.3.0.1"; + sha256 = "1l8piv2phl8kq3rgna8wld80b569vazqk2ll1rgs5iakm42lxr1f"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring containers generics-sop @@ -200531,10 +201477,10 @@ self: { transformers-compat unordered-containers uuid-types vector ]; testHaskellDepends = [ - aeson aeson-qq base base-compat-batteries bytestring containers - doctest Glob hashable hspec HUnit insert-ordered-containers lens - mtl QuickCheck quickcheck-instances text time unordered-containers - vector + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector ]; testToolDepends = [ hspec-discover ]; description = "Swagger 2.0 data model"; @@ -203093,8 +204039,8 @@ self: { }: mkDerivation { pname = "tasty"; - version = "1.1.0.3"; - sha256 = "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22"; + version = "1.1.0.4"; + sha256 = "1gzf1gqi5p78m8rc21g9a8glc69r68igxr9n4qn4bs6wqyi3ykiv"; libraryHaskellDepends = [ ansi-terminal async base clock containers mtl optparse-applicative stm tagged unbounded-delays unix wcwidth @@ -207294,8 +208240,8 @@ self: { }: mkDerivation { pname = "themoviedb"; - version = "1.1.4.0"; - sha256 = "0sx59hi3cv5b71x6gdm8vpj5hchw52vndhksnshblndm8kgxnfa6"; + version = "1.1.5.0"; + sha256 = "05za904yimkf9vpkksyxw6j488xyd0wigjdkj25hf2xx4nw36j0v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207674,8 +208620,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.8.2.4"; - sha256 = "0fy8mwg4h78c7h1k6igc9i8k5r7avj59jkljbg47wlr0x8fs06yb"; + version = "0.8.3.0"; + sha256 = "173aacscvf2llk6n5nnxvww22673cg2hclkb3s18av3xk03b4qf6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -207835,6 +208781,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thumbnail" = callPackage @@ -209893,10 +210840,11 @@ self: { }: mkDerivation { pname = "toodles"; - version = "0.1.0.0"; - sha256 = "0hbmnyym6hrwvacc783hl7s26yqbw8vcify4vna0mmp8y67rwjfx"; + version = "0.1.0.6"; + sha256 = "18i8y9bmpysyz8mbjc1wksw1m35z78ljv0b3k5qxjav8fswfv0la"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base blaze-html bytestring cmdargs directory filepath http-types megaparsec MissingH regex-posix servant servant-blaze @@ -210942,6 +211890,7 @@ self: { ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trasa-reflex" = callPackage @@ -213813,8 +214762,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.0.1"; - sha256 = "1v8kzhjyxznj9xj4x5n34ybhzy5nmldsscawnmcaqf96f4w0i178"; + version = "0.7.1.1"; + sha256 = "1csg945w81qqa5fipj9fyzqy1f2n6blf55cjcqg7gm1k1jln768k"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -213857,6 +214806,33 @@ self: { license = "GPL"; }) {}; + "typograffiti" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath, freetype2 + , gl, linear, mtl, pretty-show, sdl2, stm, template-haskell, vector + }: + mkDerivation { + pname = "typograffiti"; + version = "0.1.0.0"; + sha256 = "0wd7p6hyn0v8rkvcpbqyjarhv47hi1r3fjzmrldfkylfwnhzj0lf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers freetype2 gl linear mtl pretty-show stm + template-haskell vector + ]; + executableHaskellDepends = [ + base bytestring containers filepath freetype2 gl linear mtl + pretty-show sdl2 stm template-haskell vector + ]; + testHaskellDepends = [ + base bytestring containers freetype2 gl linear mtl pretty-show stm + template-haskell vector + ]; + description = "Display TTF fonts in OpenGL. Includes caching for fast rendering."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typography-geometry" = callPackage ({ mkDerivation, base, containers, parallel, polynomials-bernstein , vector @@ -214399,8 +215375,8 @@ self: { }: mkDerivation { pname = "unbound"; - version = "0.5.1"; - sha256 = "0cjfd6fdxpi94dac5aslgfggm81fdspbywfyl5m20ah5drgpsr12"; + version = "0.5.1.1"; + sha256 = "1pr06iii1pm6dkdm4rxc4cr817p5iri877573p06kj53w1xk5scj"; libraryHaskellDepends = [ base binary containers mtl RepLib transformers ]; @@ -214586,6 +215562,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unfix-binders" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "unfix-binders"; + version = "0.1.0"; + sha256 = "0aw4ihkzwz220pgg84p47zp37i5dqn7cxqcqa2lfzi23y9sp5iss"; + libraryHaskellDepends = [ base ]; + description = "Unfixing and recursion schemes for data types with binders"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unfoldable" = callPackage ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck , random, transformers @@ -214952,6 +215940,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "union_0_1_2" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, lens + , profunctors, tagged, vinyl + }: + mkDerivation { + pname = "union"; + version = "0.1.2"; + sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3"; + libraryHaskellDepends = [ + base deepseq hashable profunctors tagged vinyl + ]; + benchmarkHaskellDepends = [ base criterion deepseq lens ]; + description = "Extensible type-safe unions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "union-find" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { @@ -215193,8 +216198,8 @@ self: { }: mkDerivation { pname = "units-parser"; - version = "0.1.1.2"; - sha256 = "06kmrqswlivsas183jswsnqi21rmdh6cqw392b3ycj2x5avghqqa"; + version = "0.1.1.3"; + sha256 = "0lyy8nh86b0nq2znkli8y1zcg87l6acaaxi8b1m6falb6xnfi0nw"; libraryHaskellDepends = [ base containers mtl multimap parsec ]; testHaskellDepends = [ base containers mtl multimap parsec syb tasty tasty-hunit @@ -216273,6 +217278,7 @@ self: { libraryHaskellDepends = [ base parsec safe utf8-string ]; description = "Library for working with URIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-bytestring" = callPackage @@ -216285,8 +217291,8 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.3.2.0"; - sha256 = "1q04j5ybvk37zk2m0bkjwyhblz0ymdj0cn4rvsvdca1ikn5xdv5c"; + version = "0.3.2.1"; + sha256 = "1z61l4l8sg8vyrf7cri0awj5pnpzly8gp7dw9j26v9pcs6z1dgb4"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers template-haskell th-lift-instances @@ -216566,6 +217572,7 @@ self: { ]; description = "Painfully simple URL deployment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "urlpath_9_0_0_1" = callPackage @@ -217591,6 +218598,8 @@ self: { pname = "validation"; version = "1"; sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh"; + revision = "1"; + editedCabalFile = "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3"; libraryHaskellDepends = [ base bifunctors deepseq lens semigroupoids semigroups ]; @@ -218337,14 +219346,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-algorithms_0_8_0_0" = callPackage + "vector-algorithms_0_8_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, mwc-random , primitive, QuickCheck, vector }: mkDerivation { pname = "vector-algorithms"; - version = "0.8.0.0"; - sha256 = "1czili52fsjfz2d19c4v6p1qw8jya4gcqsfan1njiydrzplw18np"; + version = "0.8.0.1"; + sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -218496,6 +219505,7 @@ self: { ]; description = "Utilities for the \"vector\" library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-fftw" = callPackage @@ -219171,8 +220181,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.2.4.0"; - sha256 = "1pa1l1rirj19cnvdaqkf5jscsfkfyam60yk3gqiypbpd102zas6d"; + version = "0.2.5.0"; + sha256 = "03ykd8pz7wn9dcj78zgq15ip04g8b4b7945g6fj5a7bfz0y9asbf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219540,6 +220550,20 @@ self: { license = "GPL"; }) {}; + "vivid-osc_0_4_0_0" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, microspec, time + }: + mkDerivation { + pname = "vivid-osc"; + version = "0.4.0.0"; + sha256 = "10wbl11xwkahjsnvy14ysvkbylh615x7i8v4hwrji81rfy2bs29n"; + libraryHaskellDepends = [ base binary bytestring cereal time ]; + testHaskellDepends = [ base bytestring cereal microspec time ]; + description = "Open Sound Control encode/decode"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vivid-supercollider" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, microspec , QuickCheck, split, utf8-string, vivid-osc @@ -219781,7 +220805,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_24" = callPackage + "vty_5_24_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , deepseq, directory, filepath, hashable, HUnit, microlens , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck @@ -219792,8 +220816,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.24"; - sha256 = "177yj12cgvmiq62z7kdkqbhmr98awyi3njp1xsbdr3p81k5arwrw"; + version = "5.24.1"; + sha256 = "0xd9p9p1bfma5mvn9k4hv4h7sji2hq27b4lg6czgiwf97dmdw3yc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221832,8 +222856,8 @@ self: { }: mkDerivation { pname = "warped"; - version = "0.0.7"; - sha256 = "04090z3sz551q604kkpaqwy2i0wsnzbqrnanvkw0wg3nikh9a3s6"; + version = "0.0.8"; + sha256 = "13s9z1vlgi29rb4ay5d508snh982gp04vclv6y4fsga2gia4sbhz"; libraryHaskellDepends = [ aeson base blaze-builder conduit http-types lifted-async monad-control preamble uuid wai wai-conduit wai-cors warp @@ -222059,6 +223083,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Mutable bag backed by weak pointers to each item"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "weather-api" = callPackage @@ -222154,6 +223179,7 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-mongrel2" = callPackage @@ -224870,6 +225896,7 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ws-chans" = callPackage @@ -227586,6 +228613,7 @@ self: { testHaskellDepends = [ base bytestring hspec ]; description = "A strongly typed IRC library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yall" = callPackage @@ -227797,7 +228825,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yaml_0_10_2_0" = callPackage + "yaml_0_11_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, mtl, raw-strings-qq, resourcet, scientific @@ -227806,27 +228834,26 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.10.2.0"; - sha256 = "0yklc3fz18h9gawp00ff2qhmymh2g25dsf08si935rjd1wadhf23"; + version = "0.11.0.0"; + sha256 = "1gr72lb3zan7g9pxqzxn3zxcbnrkc0vapm2dvp1mdlm4576ncr76"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit containers directory - filepath mtl resourcet scientific template-haskell text + filepath libyaml mtl resourcet scientific template-haskell text transformers unordered-containers vector ]; - librarySystemDepends = [ libyaml ]; testHaskellDepends = [ aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit mockery mtl raw-strings-qq resourcet - scientific template-haskell temporary text transformers + directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq + resourcet scientific template-haskell temporary text transformers unordered-containers vector ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libyaml;}; + }) {}; "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop @@ -228029,8 +229056,8 @@ self: { pname = "yampa-canvas"; version = "0.2.2"; sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; - revision = "5"; - editedCabalFile = "18my271nsvb26sh5l45ng2zvwnm6fzw589cr9cipbpdaaqhyppfg"; + revision = "6"; + editedCabalFile = "05bfjzmfvy4ir1bkky8iq4m988z4yww2k7h8s1na5i9w60c26d20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -228388,6 +229415,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yeshql-core_4_1_0_2" = callPackage + ({ mkDerivation, base, containers, convertible, filepath, parsec + , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "yeshql-core"; + version = "4.1.0.2"; + sha256 = "1zhpccdqy8y5ynyn2ax7p9l2lvz573f559iqkip26ijq84pjmny0"; + libraryHaskellDepends = [ + base containers convertible filepath parsec template-haskell + ]; + testHaskellDepends = [ + base containers stm tasty tasty-hunit tasty-quickcheck + ]; + description = "YesQL-style SQL database abstraction (core)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yeshql-hdbc" = callPackage ({ mkDerivation, base, containers, convertible, filepath, HDBC , parsec, stm, tasty, tasty-hunit, tasty-quickcheck @@ -228408,6 +229454,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yeshql-hdbc_4_1_0_2" = callPackage + ({ mkDerivation, base, containers, convertible, filepath, HDBC + , parsec, stm, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, yeshql-core + }: + mkDerivation { + pname = "yeshql-hdbc"; + version = "4.1.0.2"; + sha256 = "1p2j0fys7kdgb9882hiifnc1r4768c8jp7qy69ns1nbhd4f55b7l"; + libraryHaskellDepends = [ + base containers convertible filepath HDBC parsec template-haskell + yeshql-core + ]; + testHaskellDepends = [ + base containers HDBC stm tasty tasty-hunit tasty-quickcheck + ]; + description = "YesQL-style SQL database abstraction (HDBC backend)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yeshql-postgresql-simple" = callPackage ({ mkDerivation, base, bytestring, containers, convertible , filepath, parsec, postgresql-simple, stm, tasty, tasty-hunit @@ -228415,8 +229482,8 @@ self: { }: mkDerivation { pname = "yeshql-postgresql-simple"; - version = "4.1.0.1"; - sha256 = "09sypmx1w5shn8sazhll02a4yjdhrrxr3cic74vr7ch08pjpkkyq"; + version = "4.1.0.2"; + sha256 = "0mpha4lwb8z89cqlqly6ipssx37abpq10wbrhl979gm25s9yp4ab"; libraryHaskellDepends = [ base containers convertible filepath parsec postgresql-simple template-haskell yeshql-core @@ -228580,6 +229647,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_6_5" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , cryptonite, data-default, email-validate, file-embed, http-client + , http-client-tls, http-conduit, http-types, memory, network-uri + , nonce, persistent, random, safe, shakespeare, template-haskell + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.5"; + sha256 = "1crpqcx8zynwmas4ja5yv1jg4xvcv0hw7h11d5m8vld4fcs9dpdr"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory network-uri nonce persistent random safe shakespeare + template-haskell text time transformers unliftio unliftio-core + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -228850,15 +229946,15 @@ self: { "yesod-auth-oauth" = callPackage ({ mkDerivation, authenticate-oauth, base, bytestring, text - , transformers, unliftio, yesod-auth, yesod-core, yesod-form + , unliftio, yesod-auth, yesod-core, yesod-form }: mkDerivation { pname = "yesod-auth-oauth"; - version = "1.6.0"; - sha256 = "1czm2zs9w8aicpqxmcn97c6skrhcy7g57q51vvnf40pffblvh33g"; + version = "1.6.0.1"; + sha256 = "0b9sp2rbj8yd343whcgg1ph4ybfk136d0ln09q7z56xqxn4brl3s"; libraryHaskellDepends = [ - authenticate-oauth base bytestring text transformers unliftio - yesod-auth yesod-core yesod-form + authenticate-oauth base bytestring text unliftio yesod-auth + yesod-core yesod-form ]; description = "OAuth Authentication for Yesod"; license = stdenv.lib.licenses.bsd3; @@ -229110,42 +230206,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.6"; - sha256 = "0xahf6m5c7mkl74p0gimy4wb5w4s3lh92wwxmk517fbq666c92kb"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_7" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, byteable, bytestring, case-insensitive, cereal , clientsession, conduit, conduit-extra, containers, cookie @@ -229158,8 +230218,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.7"; - sha256 = "0smjkfidavm1iggdi4wd47ykbx7jw1qknj6glyjq8cc3p75zc3w7"; + version = "1.6.8"; + sha256 = "010wjhf053bhivxascvlrxfmsqirhx6mf54aph3xblrkq8sx64hy"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit conduit-extra @@ -229179,7 +230239,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -229462,6 +230521,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form_1_6_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, text, time, transformers, wai + , xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.6.3"; + sha256 = "15wvgrkqp57wrh8xv1ix86navy6llvagwp393w4b6azv758dims0"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare text time + transformers wai xss-sanitize yesod-core yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, text, yesod-core, yesod-form }: mkDerivation { @@ -229845,6 +230927,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-persistent_1_6_0_1" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.6.0.1"; + sha256 = "0kxxm43d64lp4p7kmmpc9c0rany9nblf5dd1424m8wg3105cr2kl"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + description = "Some helpers for using Persistent from Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate @@ -230301,6 +231405,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-static_1_6_0_1" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, conduit, containers, cryptonite + , cryptonite-conduit, css-text, data-default, directory, file-embed + , filepath, hashable, hjsmin, hspec, http-types, HUnit, memory + , mime-types, process, template-haskell, text, transformers + , unix-compat, unordered-containers, wai, wai-app-static, wai-extra + , yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-static"; + version = "1.6.0.1"; + sha256 = "1jd0ryfr2vyrwasyvbqmc6j4ngv1lgz78w427f169l7gyl1firxb"; + libraryHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder bytestring + conduit containers cryptonite cryptonite-conduit css-text + data-default directory file-embed filepath hashable hjsmin + http-types memory mime-types process template-haskell text + transformers unix-compat unordered-containers wai wai-app-static + yesod-core + ]; + testHaskellDepends = [ + async base base64-bytestring bytestring conduit containers + cryptonite cryptonite-conduit data-default directory file-embed + filepath hjsmin hspec http-types HUnit memory mime-types process + template-haskell text transformers unix-compat unordered-containers + wai wai-app-static wai-extra yesod-core yesod-test + ]; + description = "Static file serving subsite for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-static-angular" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-markup , bytestring, data-default, directory, filepath, hamlet, hspec @@ -230405,6 +231542,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_5_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , bytestring, case-insensitive, conduit, containers, cookie, hspec + , hspec-core, html-conduit, http-types, HUnit, network, pretty-show + , semigroups, text, time, transformers, unliftio, wai, wai-extra + , xml-conduit, xml-types, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.5.1"; + sha256 = "080m46nbjblna2b9gq8j4ngqsv0r5ww06p1v8cj3ia1qiqgjygsj"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit network pretty-show semigroups text time + transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit text + unliftio wai wai-extra xml-conduit yesod-core yesod-form + ]; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -231188,8 +232351,8 @@ self: { ({ mkDerivation, base, bindings-DSL, ieee754 }: mkDerivation { pname = "yoga"; - version = "0.0.0.2"; - sha256 = "1gkql9c7dd7h0wfq98mfhgjmqlxkdf4b66qympc7r8vyx38jps1c"; + version = "0.0.0.5"; + sha256 = "14az05jh60ncsyw859b9v9m7lb5xcgsv2478pa3if93vxy1h40ih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bindings-DSL ieee754 ]; From c6c29def605191f17f1de17418103b3c01875426 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Oct 2018 11:06:26 +0200 Subject: [PATCH 762/992] cabal2nix: update overrides for latest yaml version --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 86c0b93917e7..2971b941e156 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1060,11 +1060,11 @@ self: super: { # The tool needs a newer hpack version than the one mandated by LTS-12.x. cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_31_0; - yaml = self.yaml_0_10_2_0; + yaml = self.yaml_0_11_0_0; }); stack2nix = super.stack2nix.overrideScope (self: super: { hpack = self.hpack_0_31_0; - yaml = self.yaml_0_10_2_0; + yaml = self.yaml_0_11_0_0; }); # Break out of "aeson <1.3, temporary <1.3". From 1e44702fc01ba746a21ff4c633be84d8361125ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Oct 2018 16:14:51 +0200 Subject: [PATCH 763/992] git-annex: update sha256 hash for the new 6.20181011 version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2971b941e156..98521cce4ea7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "09rhss1s6gxmqvb8k2l0f55mv38igyvikmm6d07zxkw6049q3maz"; + sha256 = "069w4gdb104lc3vp48k3wywmgql56yc5g2g2i240xrr88in3qvqw"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From fe91334fbf2dffed16e59e9903efbae899818dab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2018 11:36:57 +0200 Subject: [PATCH 764/992] haskell-yesod-core: disable broken test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 98521cce4ea7..6f654c32dbb2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1148,4 +1148,7 @@ self: super: { arbtt = doJailbreak super.arbtt; + # https://github.com/yesodweb/yesod/issues/1563 + yesod-core = dontCheck super.yesod-core; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 6a4967d61fb0735bae309ae0981dc56deaf31cd3 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 15 Oct 2018 13:44:16 +0200 Subject: [PATCH 765/992] python.pkgs.pymediainfo: fix test --- pkgs/development/python-modules/pymediainfo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 3245c3d3c48f..2169f23295a7 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -22,6 +22,11 @@ buildPythonPackage rec { 'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \ --replace 'CDLL("libmediainfo.so.0")' \ 'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0")' + + # Fix test, remove after version 2.3.0 + substituteInPlace tests/test_pymediainfo.py \ + --replace 'codec, "AVC"' 'format, "AVC"' \ + --replace 'codec, "AAC LC"' 'format, "AAC"' ''; nativeBuildInputs = [ setuptools_scm ]; From 6032bdd532c46dc11915c77d4992101b6a91221d Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 15 Oct 2018 13:45:10 +0200 Subject: [PATCH 766/992] rapid-photo-downloader: 0.9.10 -> 0.9.12 --- pkgs/applications/graphics/rapid-photo-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index d47f08c90b9c..d4edbae1d28e 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.10"; + version = "0.9.12"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1i0lfj9gnfya49gxx59ls364z651fqagd4krnz9jhg9m0l48ljdf"; + sha256 = "0nzahps7hs120xv2r55k293kialf83nx44x3jg85yh349rpqrii8"; }; # Disable version check and fix install tests From c7214bd17eae1cfcb13aafc214c7172ce7f38c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Oct 2018 12:56:23 +0100 Subject: [PATCH 767/992] postfix: enable openldap by default Ldap authentication is fairly common in any reasonable sized mail setup. Our dovecot also comes with ldap support. Other distributions like debian, archlinux, ubuntu and fedora also provide ldap support along with there postfix server. It might be also useful to have database support, but this is a different pull request. --- pkgs/servers/mail/postfix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index d88b9f8b0dbc..796d5696ebfa 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl , coreutils, findutils, gnugrep, gawk, icu, pcre +, withLDAP ? true, openldap , withPgSQL ? false, postgresql , withMySQL ? false, mysql , withSQLite ? false, sqlite -, withLDAP ? false, openldap }: let From 455e0ed88527d69a9c4a52e1238d35ec61556257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 14 Oct 2018 02:55:00 +0900 Subject: [PATCH 768/992] generators: make toPretty handle floats correctly --- lib/generators.nix | 1 + lib/tests/misc.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/generators.nix b/lib/generators.nix index f5faf7007860..863ba847423e 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -143,6 +143,7 @@ rec { }@args: v: with builtins; let isPath = v: typeOf v == "path"; in if isInt v then toString v + else if isFloat v then "~${toString v}" else if isString v then ''"${libStr.escape [''"''] v}"'' else if true == v then "true" else if false == v then "false" diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index d89bcfde4819..853d911cdc81 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -369,6 +369,7 @@ runTests { testToPretty = { expr = mapAttrs (const (generators.toPretty {})) rec { int = 42; + float = 0.1337; bool = true; string = ''fno"rd''; path = /. + "/foo"; @@ -381,6 +382,7 @@ runTests { }; expected = rec { int = "42"; + float = "~0.133700"; bool = "true"; string = ''"fno\"rd"''; path = "/foo"; From 91ddc9d27f669e1dc09012cc7577377bf4e90e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Oct 2018 13:12:06 +0100 Subject: [PATCH 769/992] postfix: add setgid wrapper for postqueue/postdrop Both postqueue[1] and postdrop[2] implement a subset of administration task that are supposed to be run unprivileged users and require the setgid bit to full-fill this task. [1] http://www.postfix.org/postqueue.1.html [2] http://www.postfix.org/postdrop.1.html --- nixos/modules/services/mail/postfix.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 33249aa3e554..d43733484ffa 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -602,7 +602,7 @@ in target = "postfix"; }; - # This makes comfortable for root to run 'postqueue' for example. + # This makes it comfortable to run 'postqueue/postdrop' for example. systemPackages = [ pkgs.postfix ]; }; @@ -616,6 +616,22 @@ in setgid = true; }; + security.wrappers.postqueue = { + program = "postqueue"; + source = "${pkgs.postfix}/bin/postqueue"; + group = setgidGroup; + setuid = false; + setgid = true; + }; + + security.wrappers.postdrop = { + program = "postdrop"; + source = "${pkgs.postfix}/bin/postdrop"; + group = setgidGroup; + setuid = false; + setgid = true; + }; + users.users = optional (user == "postfix") { name = "postfix"; description = "Postfix mail server user"; From f028f77abe3faad0a2883ea10deca614d93cbc84 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 15 Oct 2018 14:30:45 +0200 Subject: [PATCH 770/992] Revert "protobuf3: support cross compilation" --- pkgs/development/libraries/protobuf/generic-v3.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 883dff56f2ee..79e4c387cdf5 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -1,12 +1,11 @@ { stdenv , fetchFromGitHub -, autoreconfHook, zlib, gmock, which, buildPackages +, autoreconfHook, zlib, gmock , version, sha256 , ... }: -let -mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "protobuf-${version}"; # make sure you test also -A pythonPackages.protobuf @@ -29,10 +28,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ]; - + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib ]; - configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ]; enableParallelBuilding = true; @@ -57,7 +54,4 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { }; passthru.version = version; -}; -in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform) - then (mkProtobufDerivation null buildPackages.stdenv) - else null) stdenv +} From 5fe8bb506cd43425837346d16caa0595cfa946da Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Tue, 28 Aug 2018 16:01:58 +0200 Subject: [PATCH 771/992] python.packages.tensorboard: 1.9.0 -> 1.11.0 --- .../python-modules/tensorflow-tensorboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 5cd0e9266022..7f2c2539a738 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "1.9.0"; + version = "1.11.0"; format = "wheel"; src = fetchPypi ({ @@ -22,10 +22,10 @@ buildPythonPackage rec { format = "wheel"; } // (if isPy3k then { python = "py3"; - sha256 = "42a04637a636e16054b065907c81396b83a9702948ecd14218f19dc5cf85de98"; + sha256 = "1nkd37zq9mk0gc9x6d4x8whahbx2cn0wl94lir3g1pibdzx9hc4v"; } else { python = "py2"; - sha256 = "97661706fbe857c372405e0f5bd7c3db2197b5e70cec88f6924b726fde65c2c1"; + sha256 = "1mkyb5gn952i4s7fmc9ay4yh74ysrqbiqna6dl1qmahjpbaavbf5"; })); propagatedBuildInputs = [ numpy werkzeug protobuf markdown grpcio ] ++ lib.optional (!isPy3k) futures; From a8a3928a34146b3f6ad6152cf41e936ffb3ec625 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Tue, 28 Aug 2018 16:02:28 +0200 Subject: [PATCH 772/992] python.packages.tensorflow: 1.9.0 -> 1.11.0 --- .../python-modules/tensorflow/bin.nix | 11 +++--- .../python-modules/tensorflow/prefetcher.sh | 2 +- .../tensorflow/tf1.11.0-hashes.nix | 34 +++++++++++++++++++ .../tensorflow/tf1.9.0-hashes.nix | 34 ------------------- 4 files changed, 41 insertions(+), 40 deletions(-) create mode 100644 pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix delete mode 100644 pkgs/development/python-modules/tensorflow/tf1.9.0-hashes.nix diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index cad2a93640ae..b925b74e03b5 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -22,6 +22,8 @@ , zlib , python , symlinkJoin +, keras-applications +, keras-preprocessing }: # We keep this binary build for two reasons: @@ -39,7 +41,7 @@ let in buildPythonPackage rec { pname = "tensorflow"; - version = "1.9.0"; + version = "1.11.0"; format = "wheel"; src = let @@ -48,12 +50,11 @@ in buildPythonPackage rec { platform = if stdenv.isDarwin then "mac" else "linux"; unit = if cudaSupport then "gpu" else "cpu"; key = "${platform}_py_${pyver}_${unit}"; - dls = import ./tf1.9.0-hashes.nix; + dls = import ./tf1.11.0-hashes.nix; in fetchurl dls.${key}; - propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-tensorboard ] - ++ lib.optional (!isPy3k) mock - ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ]; + propagatedBuildInputs = [ protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-tensorboard keras-applications keras-preprocessing ] + ++ lib.optional (!isPy3k) mock; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow # and the propageted input tensorflow-tensorboard which causes environment collisions. diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index 6b98ece974eb..0954a3810057 100644 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,4 +1,4 @@ -version=1.9.0 +version=1.11.0 hashfile=tf${version}-hashes.nix rm -f $hashfile echo "{" >> $hashfile diff --git a/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix new file mode 100644 index 000000000000..47cd25ef7571 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix @@ -0,0 +1,34 @@ +{ +linux_py_27_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp27-none-linux_x86_64.whl"; + sha256 = "0s3ar2jzz2m9ilqfl4aigfi4bq8k5n04grnfqy4nyii2y98xjy14"; +}; +linux_py_35_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp35-cp35m-linux_x86_64.whl"; + sha256 = "0vfw2v033h8wdgjlbwjx2i9fdqqnxxc3r085irq9nzkdmwzw2jl8"; +}; +linux_py_36_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp36-cp36m-linux_x86_64.whl"; + sha256 = "0zmr5bw3ki5l6jb19h70kmq3k3xnq60jkw6wqqr6par1c7b4i9c3"; +}; +linux_py_27_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp27-none-linux_x86_64.whl"; + sha256 = "1pcacy4ky7zhq7h7d93s4xp213q1yj2zxn2khlyll389lq0bcbax"; +}; +linux_py_35_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp35-cp35m-linux_x86_64.whl"; + sha256 = "04ggz7jzbhl41alnj526rp0vz88h68mcv3rbs5pmrwyg0j2cqjz3"; +}; +linux_py_36_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp36-cp36m-linux_x86_64.whl"; + sha256 = "1ywpq3n51pn7jrr231immi2s6ghdy9s0bnkk7dg4dbbxrisxg33a"; +}; +mac_py_2_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.11.0-py2-none-any.whl"; + sha256 = "1rjb6gm0spj0l5zl02zsr6x3qagf2khrjw02z7znmsshb5xhsx8j"; +}; +mac_py_3_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.11.0-py3-none-any.whl"; + sha256 = "16la41a2d29wa4i7h1g32d94g23ixzc3wc69kd9w82w45bwfv4xl"; +}; +} diff --git a/pkgs/development/python-modules/tensorflow/tf1.9.0-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.9.0-hashes.nix deleted file mode 100644 index 504ed7b5b957..000000000000 --- a/pkgs/development/python-modules/tensorflow/tf1.9.0-hashes.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ -linux_py_27_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.9.0-cp27-none-linux_x86_64.whl"; - sha256 = "1dvmajv5ddgzrazdnxpfhk9dkj0lfiviw4jmvk00d4q5v68z6ihg"; -}; -linux_py_35_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.9.0-cp35-cp35m-linux_x86_64.whl"; - sha256 = "07ilrxbhz9p3xwqhl2p8c40y1gsq68x10f34pzayrvcg2i52bvpv"; -}; -linux_py_36_cpu = { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.9.0-cp36-cp36m-linux_x86_64.whl"; - sha256 = "0x2l64ab7i8nr0dzvsryblhn869qyjb85xkhy69nwahqswb68hxl"; -}; -linux_py_27_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.9.0-cp27-none-linux_x86_64.whl"; - sha256 = "0q7i82jgy0mzn2mw8i1z0pvv7ssi6m7zqkkjg2i4zxpk8djg8k6z"; -}; -linux_py_35_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.9.0-cp35-cp35m-linux_x86_64.whl"; - sha256 = "0nhq2s8fanm095x1sc9h40dvqcv9bc2aj47crv3c2sajbj7dn43g"; -}; -linux_py_36_gpu = { - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.9.0-cp36-cp36m-linux_x86_64.whl"; - sha256 = "1m4b9cd8ghghqxaqrlzq7j9499ddidgr78bx0c20pgyrzg38jiz1"; -}; -mac_py_2_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.9.0-py2-none-any.whl"; - sha256 = "1djj0xahzrmxhfc6kyjx1lkyfh7jhq3ix0gz9j3iq4smb3ca9z01"; -}; -mac_py_3_cpu = { - url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.9.0-py3-none-any.whl"; - sha256 = "0igffy7r0d8mhkn4pybp19jmc25alfpfl4k4fxh2s3rvgii8gk22"; -}; -} From de4f6cb453640dfe156177b08e54a0a072010e6e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 15 Oct 2018 13:41:45 +0000 Subject: [PATCH 773/992] ocamlPackages.elpi: 1.0.5 -> 1.1.0 --- pkgs/development/ocaml-modules/elpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 3eecb9b45b7d..fd42cbe20c7f 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-elpi-${version}"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "LPCIC"; repo = "elpi"; rev = "v${version}"; - sha256 = "1n1m183l4ms949m2l24w0887m1rmvc9b3j8alnbw8ckn6wwnhpmk"; + sha256 = "1fd4mqggdcnbhqwrg8r0ikb1j2lv0fc9hv9xfbyjzbzxbjggf5zc"; }; buildInputs = [ ocaml findlib ppx_tools_versioned ]; From bf7600d3b568963b41124699940bda6092962910 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Mon, 15 Oct 2018 15:48:19 +0200 Subject: [PATCH 774/992] openafs: Align package name with kernel version based on modDirVersion --- pkgs/servers/openafs/1.6/module.nix | 2 +- pkgs/servers/openafs/1.8/module.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index 7ad9199b7ace..f5b735158e9c 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -8,7 +8,7 @@ let kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; in stdenv.mkDerivation rec { - name = "openafs-${version}-${kernel.version}"; + name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index cfd9f0561e99..7167cf5dec49 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -8,7 +8,7 @@ let kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; in stdenv.mkDerivation rec { - name = "openafs-${version}-${kernel.version}"; + name = "openafs-${version}-${kernel.modDirVersion}"; inherit version src; nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ] From a8623de3071d1c9333bca483dd2a687c5c06f394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 15 Oct 2018 10:58:42 -0300 Subject: [PATCH 775/992] deepin-wm: init at 1.9.32 --- pkgs/desktops/deepin/deepin-wm/default.nix | 58 ++++++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-wm/default.nix diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix new file mode 100644 index 000000000000..f936934dcc0c --- /dev/null +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, + bamf, clutter-gtk, granite, libcanberra-gtk3, libwnck3, + deepin-mutter, deepin-wallpapers, deepin-desktop-schemas, + hicolor-icon-theme }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-wm"; + version = "1.9.32"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "02vwbkfpxcwv01vqa70pg7dm0lhm1lwhdqhk057r147a9cjb3ssc"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + libtool + gnome3.gnome-common + vala + ]; + + buildInputs = [ + gnome3.gnome-desktop + gnome3.libgee + bamf + clutter-gtk + granite + libcanberra-gtk3 + libwnck3 + deepin-mutter + deepin-wallpapers + deepin-desktop-schemas + hicolor-icon-theme + ]; + + postPatch = '' + sed -i src/Background/BackgroundSource.vala \ + -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;' + ''; + + preConfigure = '' + ./autogen.sh + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Deepin Window Manager"; + homepage = https://github.com/linuxdeepin/deepin-wm; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 84f41dc3451b..d661a978d712 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -21,6 +21,7 @@ let wnck = pkgs.libwnck3; }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; + deepin-wm = callPackage ./deepin-wm { }; dtkcore = callPackage ./dtkcore { }; dtkwm = callPackage ./dtkwm { }; dtkwidget = callPackage ./dtkwidget { }; From 2a2c99673bca1d30d53c530787a10a7d1c5b1de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 15 Oct 2018 22:04:47 +0900 Subject: [PATCH 776/992] release-notes/18-09: add licenses marked as unfree --- nixos/doc/manual/release-notes/rl-1809.xml | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index c5521735428b..0ddf40acbfcc 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -475,6 +475,48 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' + + + Some licenses that were incorrectly not marked as unfree now are. This is + the case for: + + + + cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike + 2.0 + + + + + cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike + 2.5 + + + + + cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike + 3.0 + + + + + cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike + 4.0 + + + + + cc-by-nd-30: Creative Commons Attribution-No Derivative Works v3.00 + + + + + msrla: Microsoft Research License Agreement + + + + + The deprecated services.cassandra module has seen a From 02e8e56500b95159f892804a81178b636a8534f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 15 Oct 2018 22:28:19 +0900 Subject: [PATCH 777/992] package-notes: line wrap by auto-cleanup --- doc/package-notes.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0543e06a05d4..dad28d3ec8b2 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -413,7 +413,8 @@ packageOverrides = pkgs: { in your /etc/nixos/configuration.nix. You'll also need hardware.pulseaudio.support32Bit = true; if you are using PulseAudio - this will enable 32bit ALSA apps integration. - To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add + To use the Steam controller or other Steam supported controllers such as + the DualShock 4 or Nintendo Switch Pro, you need to add hardware.steam-hardware.enable = true; to your configuration. From 861b70f4839be610f16fbfdf58a9670a3f8f3296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Mon, 15 Oct 2018 22:48:28 +0900 Subject: [PATCH 778/992] nixos manual: automatic reflow --- .../manual/administration/container-networking.xml | 1 + nixos/doc/manual/release-notes/rl-1903.xml | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml index 8aca329c8f1f..2ee8bfdd50f1 100644 --- a/nixos/doc/manual/administration/container-networking.xml +++ b/nixos/doc/manual/administration/container-networking.xml @@ -52,6 +52,7 @@ $ ping -c1 10.233.4.2 networking.networkmanager.unmanaged = [ "interface-name:ve-*" ]; + You may need to restart your system for the changes to take effect. diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 9cb5b93f27cb..8b2eba9c10d6 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -106,12 +106,12 @@ - - The light module no longer uses setuid binaries, but - udev rules. As a consequence users of that module have to belong to the - video group in order to use the executable - (i.e. users.users.yourusername.extraGroups = ["video"];). - + + The light module no longer uses setuid binaries, but + udev rules. As a consequence users of that module have to belong to the + video group in order to use the executable (i.e. + users.users.yourusername.extraGroups = ["video"];). + From ff937fd06c5fff1017ef80573edb6e943ae10b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 14 Oct 2018 21:44:26 +0900 Subject: [PATCH 779/992] webassemblyjs tool suite: init at 1.7.8 --- .../node-packages/node-packages-v10.nix | 56 +- .../node-packages/node-packages-v6.nix | 56 +- .../node-packages/node-packages-v8.json | 5 + .../node-packages/node-packages-v8.nix | 2322 +++++++++-------- pkgs/top-level/all-packages.nix | 6 + 5 files changed, 1308 insertions(+), 1137 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index ae7130375524..e94e8bfff1ed 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -1246,13 +1246,13 @@ let sha512 = "mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w=="; }; }; - "minizlib-1.1.0" = { + "minizlib-1.1.1" = { name = "minizlib"; packageName = "minizlib"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; - sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz"; + sha512 = "TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg=="; }; }; "mixin-deep-1.3.1" = { @@ -1327,13 +1327,13 @@ let sha512 = "m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g=="; }; }; - "npm-packlist-1.1.11" = { + "npm-packlist-1.1.12" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz"; - sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz"; + sha512 = "WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g=="; }; }; "npmlog-4.1.2" = { @@ -1719,17 +1719,17 @@ let packageName = "semver"; version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + url = "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; }; - "semver-5.5.1" = { + "semver-5.6.0" = { name = "semver"; packageName = "semver"; - version = "5.5.1"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz"; - sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="; + url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz"; + sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="; }; }; "set-blocking-2.0.0" = { @@ -1831,13 +1831,13 @@ let sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; }; - "sshpk-1.14.2" = { + "sshpk-1.15.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.2"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz"; + sha512 = "mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA=="; }; }; "static-extend-0.1.2" = { @@ -1872,7 +1872,7 @@ let packageName = "strip-ansi"; version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; @@ -2475,7 +2475,7 @@ in sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -2502,10 +2502,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz"; - sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz"; + sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -2555,13 +2555,13 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.3.4" - sources."minizlib-1.1.0" + sources."minizlib-1.1.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.5" - sources."npm-packlist-1.1.11" + sources."npm-packlist-1.1.12" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -2581,7 +2581,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -2606,10 +2606,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.16.2"; + version = "2.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz"; - sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.3.tgz"; + sha512 = "W63qZOC9YGr+33JYvZjvhzvYL4YKT2gAywDJQrHvKTL6vmnnSh+GdM3ZdGIIZ6A57YB3NgvQaq/BJ2uYjwn3ZQ=="; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 842e1a165314..dc028435ad0a 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1246,13 +1246,13 @@ let sha512 = "mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w=="; }; }; - "minizlib-1.1.0" = { + "minizlib-1.1.1" = { name = "minizlib"; packageName = "minizlib"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; - sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz"; + sha512 = "TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg=="; }; }; "mixin-deep-1.3.1" = { @@ -1327,13 +1327,13 @@ let sha512 = "m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g=="; }; }; - "npm-packlist-1.1.11" = { + "npm-packlist-1.1.12" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz"; - sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz"; + sha512 = "WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g=="; }; }; "npmlog-4.1.2" = { @@ -1719,17 +1719,17 @@ let packageName = "semver"; version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + url = "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; }; - "semver-5.5.1" = { + "semver-5.6.0" = { name = "semver"; packageName = "semver"; - version = "5.5.1"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz"; - sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="; + url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz"; + sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="; }; }; "set-blocking-2.0.0" = { @@ -1831,13 +1831,13 @@ let sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; }; - "sshpk-1.14.2" = { + "sshpk-1.15.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.2"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz"; + sha512 = "mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA=="; }; }; "static-extend-0.1.2" = { @@ -1872,7 +1872,7 @@ let packageName = "strip-ansi"; version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; @@ -2475,7 +2475,7 @@ in sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -2502,10 +2502,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz"; - sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz"; + sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -2555,13 +2555,13 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.3.4" - sources."minizlib-1.1.0" + sources."minizlib-1.1.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."needle-2.2.4" sources."nopt-4.0.1" sources."npm-bundled-1.0.5" - sources."npm-packlist-1.1.11" + sources."npm-packlist-1.1.12" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -2581,7 +2581,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -2606,10 +2606,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.16.2"; + version = "2.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz"; - sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.3.tgz"; + sha512 = "W63qZOC9YGr+33JYvZjvhzvYL4YKT2gAywDJQrHvKTL6vmnnSh+GdM3ZdGIIZ6A57YB3NgvQaq/BJ2uYjwn3ZQ=="; }; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 779e6389bd39..f297614ec38f 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -125,6 +125,11 @@ , "ungit" , "vue-cli" , "@vue/cli" +, "@webassemblyjs/cli" +, "@webassemblyjs/repl" +, "@webassemblyjs/wasm-strip" +, "@webassemblyjs/wasm-text-gen" +, "@webassemblyjs/wast-refmt" , "webdrvr" , "webpack" , "webtorrent-cli" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index de90e1d188c5..4a6c248e2952 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,6 +49,15 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; + "@babel/generator-7.1.3" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz"; + sha512 = "ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ=="; + }; + }; "@babel/highlight-7.0.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; @@ -58,6 +67,15 @@ let sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw=="; }; }; + "@babel/parser-7.1.3" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.1.3.tgz"; + sha512 = "gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w=="; + }; + }; "@babel/runtime-7.1.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -76,6 +94,15 @@ let sha512 = "drxaPByExlcRDKW4ZLubUO4ZkI8/8ax9k9wve1aEthdLKFzjB7XRkOQ0xoTIWGxqdDnWDElkjYq77bt7yrcYJQ=="; }; }; + "@babel/template-7.1.2" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz"; + sha512 = "SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag=="; + }; + }; "@babel/types-7.0.0-beta.38" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -85,6 +112,15 @@ let sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q=="; }; }; + "@babel/types-7.1.3" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz"; + sha512 = "RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA=="; + }; + }; "@cliqz-oss/firefox-client-0.3.1" = { name = "_at_cliqz-oss_slash_firefox-client"; packageName = "@cliqz-oss/firefox-client"; @@ -103,13 +139,13 @@ let sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA=="; }; }; - "@commitlint/cli-7.2.0" = { + "@commitlint/cli-7.2.1" = { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.2.0.tgz"; - sha512 = "qFTXZoyi+XFkUXRj1pgcfRw5ao31kPkP/V3c7O8SU52GUVxFo2LM8sFiTF9WEqlgSd7WJA0SGl5tOX/VtCMYEA=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.2.1.tgz"; + sha512 = "PUHWGoQOx8m6ZSpZPSHb+YISFAvW7jiWvCJOQiViKHZC8CLKu4bjyc/AwP8gBte0RsTGAu1ekiitp5Q0NcLGcA=="; }; }; "@commitlint/config-conventional-7.1.2" = { @@ -139,40 +175,40 @@ let sha512 = "EP/SqX2U2L4AQHglZ2vGM1pvHJOh3sbYtHn1QhtllqEpsdmhuNpVPSGHP/r9OD2h4i90vtnWgZQoskt2MkbknA=="; }; }; - "@commitlint/format-7.2.0" = { + "@commitlint/format-7.2.1" = { name = "_at_commitlint_slash_format"; packageName = "@commitlint/format"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-7.2.0.tgz"; - sha512 = "Vx10wFyP3yfE4tq1x0HWb/vqkZc5+79uWak91sARSu5wG5JVzBvQXxfqOhefOKbVqXGKXlP2yXrSq8fM6YUQ3w=="; + url = "https://registry.npmjs.org/@commitlint/format/-/format-7.2.1.tgz"; + sha512 = "1YcL+ZWB8V52oDFQBhSBJjiJOZDt4Vl06O5TkG70BMpre3EQru5KYIN16eEPqfihNw0bj8gSIWcf87Gvh3OrOw=="; }; }; - "@commitlint/is-ignored-7.2.0" = { + "@commitlint/is-ignored-7.2.1" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.2.0.tgz"; - sha512 = "6HCkLSuh4hms72x0EJp9mt9UXq27MRpZtmf7exhBnYqNyd76vMMA7/nGjdULxldr2xyzlzKNjMbh2lpQRD4aog=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.2.1.tgz"; + sha512 = "3DsEEKRnj8Bv9qImsxWcGf9BwerDnk5Vs+oK6ELzIwkndHaAZLHyATjmaz/rsc+U+DWiVjgKrrw3xvd/UsoazA=="; }; }; - "@commitlint/lint-7.2.0" = { + "@commitlint/lint-7.2.1" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.2.0.tgz"; - sha512 = "aZAiQggpF638/XmY7EJe5yTEhg4C4GrxWktcdEDMQrRG1phFUPp+AKXBqljDYzrpmptiL9glY3fLO1m5XzA+BA=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.2.1.tgz"; + sha512 = "rM7nUyNUJyuKw1MTwJG/wk4twB5YCAG2wzJMn5NqVpGD/qmLOzlZoBl0+CYmuOsbIRAA2rlEV6KZHBk9tTfAdQ=="; }; }; - "@commitlint/load-7.2.0" = { + "@commitlint/load-7.2.1" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-7.2.0.tgz"; - sha512 = "+7rh1jeYhSMj6+zzZVbo5bMnuWx1nL4c5JJdEq3rMQT6ILI169xlL94sPdkz0to6dDmi4yLgC4/kipyLyynriA=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-7.2.1.tgz"; + sha512 = "FnfmfhPGJqGwILVRznduBejOicNey6p/byfcyxtcBkN2+X96gDuNtqcnGcngCrzPIAgaIrQQcTQDA1/KMtW21A=="; }; }; "@commitlint/message-7.1.2" = { @@ -688,13 +724,13 @@ let sha512 = "eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ=="; }; }; - "@lerna/publish-3.4.1" = { + "@lerna/publish-3.4.3" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.4.1"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.1.tgz"; - sha512 = "Nd5PT2Ksngo1GHqT6ccmGVfMvoA9MplBvqyzPFIjFIJOgODrJ9IGJAMobxgBQ6xXXShflQ/1dHWk8faTOYKLoQ=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.3.tgz"; + sha512 = "baeRL8xmOR25p86cAaS9mL0jdRzdv4dUo04PlK2Wes+YlL705F55cSXeC9npNie+9rGwFyLzCTQe18WdbZyLuw=="; }; }; "@lerna/resolve-symlink-3.3.0" = { @@ -918,7 +954,7 @@ let packageName = "@types/accepts"; version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz"; + url = "http://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz"; sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; }; }; @@ -927,7 +963,7 @@ let packageName = "@types/async"; version = "2.0.49"; src = fetchurl { - url = "https://registry.npmjs.org/@types/async/-/async-2.0.49.tgz"; + url = "http://registry.npmjs.org/@types/async/-/async-2.0.49.tgz"; sha512 = "Benr3i5odUkvpFkOpzGqrltGdbSs+EVCkEBGXbuR7uT0VzhXKIkhem6PDzHdx5EonA+rfbB3QvP6aDOw5+zp5Q=="; }; }; @@ -958,15 +994,6 @@ let sha512 = "a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w=="; }; }; - "@types/commander-2.12.2" = { - name = "_at_types_slash_commander"; - packageName = "@types/commander"; - version = "2.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/commander/-/commander-2.12.2.tgz"; - sha512 = "0QEFiR8ljcHp9bAbWxecjVRuAMr16ivPiGOw6KFQBVrVd0RQIcM3xKdRisH2EDWgVWujiYtHwhSkSUoAAGzH7Q=="; - }; - }; "@types/connect-3.4.32" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; @@ -999,7 +1026,7 @@ let packageName = "@types/events"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz"; + url = "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz"; sha512 = "KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA=="; }; }; @@ -1039,22 +1066,22 @@ let sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA=="; }; }; - "@types/node-10.11.4" = { + "@types/node-10.11.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.11.4"; + version = "10.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.11.4.tgz"; - sha512 = "ojnbBiKkZFYRfQpmtnnWTMw+rzGp/JiystjluW9jgN3VzRwilXddJ6aGQ9V/7iuDG06SBgn7ozW9k3zcAnYjYQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.11.7.tgz"; + sha512 = "yOxFfkN9xUFLyvWaeYj90mlqTJ41CsQzWKS3gXdOMOyPVacUsymejKxJ4/pMW7exouubuEeZLJawGgcNGYlTeg=="; }; }; - "@types/node-8.10.34" = { + "@types/node-8.10.36" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.34"; + version = "8.10.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.34.tgz"; - sha512 = "alypNiaAEd0RBGXoWehJ2gchPYCITmw4CYBoB5nDlji8l8on7FsklfdfIs4DDmgpKLSX3OF3ha6SV+0W7cTzUA=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.36.tgz"; + sha512 = "SL6KhfM7PTqiFmbCW3eVNwVBZ+88Mrzbuvn9olPsfv43mbiWaFY+nRcz/TGGku0/lc2FepdMbImdMY1JrQ+zbw=="; }; }; "@types/range-parser-1.2.2" = { @@ -1111,31 +1138,31 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.0.4" = { + "@vue/cli-shared-utils-3.0.5" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.0.4.tgz"; - sha512 = "st6f/s1nCo45r3yZDYCuWaFME/ECB9Mz4bPxlC9cl/3McMSESJvhnJAlh75DVdsp5teNr8HSzHwfTRfmQtKKyw=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.0.5.tgz"; + sha512 = "z5vPzUQGZJnRkojqVbDYar8NvGSvB0kUcO0O+Y+xkxVbjZxrq78e9bJFB4PR4QsqQbuBS9v3zawLWY4MhKwKOA=="; }; }; - "@vue/cli-ui-3.0.4" = { + "@vue/cli-ui-3.0.5" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.0.4.tgz"; - sha512 = "tdqcHDyXm/sqO7LQWJ8g1DItez6dJQyeiTn/xJIU/vsTOoUhi2s+PslTB7acPrzgya3j1ORDPJ9nHfkpE0xM8Q=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.0.5.tgz"; + sha512 = "lQ/xdtX/p+yER6tLxAt1oeudsQ4el/BWKqqGolKKydv78nk8AQlcVVH5AsojqqICuDpHO20XFKIp45lXhJ4YnA=="; }; }; - "@vue/cli-ui-addon-webpack-3.0.4" = { + "@vue/cli-ui-addon-webpack-3.0.5" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.0.4.tgz"; - sha512 = "93cZaZxPUUg/hxxkFNUTrtMNP8Yk2KzI3ndX25yPi2THm5gNPYMXiDE/9s8lzs6kzX2VOO1bxbukOdkJ0ZdkNw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.0.5.tgz"; + sha512 = "DhZ+wIaJnLzcVmkZMWxy0If9Rh68YWhsxeXuxIbcL4tpGBbIdd+44A5CqHWFkTkVma5zWlqckhVuTXUYdstEZw=="; }; }; "@webassemblyjs/ast-1.7.8" = { @@ -1183,6 +1210,15 @@ let sha512 = "TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA=="; }; }; + "@webassemblyjs/helper-flaten-ast-1.7.8" = { + name = "_at_webassemblyjs_slash_helper-flaten-ast"; + packageName = "@webassemblyjs/helper-flaten-ast"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-flaten-ast/-/helper-flaten-ast-1.7.8.tgz"; + sha512 = "Z6U67Havfc1LsCysc2Wb7FKjSxBXgaEp39wfzjPA86mcctxYv6T+6udzmgD872/s24TZoV4cC65eC78JT0kaeg=="; + }; + }; "@webassemblyjs/helper-fsm-1.7.8" = { name = "_at_webassemblyjs_slash_helper-fsm"; packageName = "@webassemblyjs/helper-fsm"; @@ -1246,6 +1282,15 @@ let sha512 = "9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA=="; }; }; + "@webassemblyjs/validation-1.7.8" = { + name = "_at_webassemblyjs_slash_validation"; + packageName = "@webassemblyjs/validation"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.7.8.tgz"; + sha512 = "UmEQX0TMA+uCbaQYA+Z8YwwIr+Y5W5UMaROEh4V+7Ef6HpkFZBn8sHRo5xNQORy2rxkkOSR25tjUK62n6iQlDA=="; + }; + }; "@webassemblyjs/wasm-edit-1.7.8" = { name = "_at_webassemblyjs_slash_wasm-edit"; packageName = "@webassemblyjs/wasm-edit"; @@ -1368,7 +1413,7 @@ let packageName = "JSONStream"; version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz"; + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz"; sha1 = "74349d0d89522b71f30f0a03ff9bd20ca6f12ac0"; }; }; @@ -1377,17 +1422,17 @@ let packageName = "JSONStream"; version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz"; + url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz"; sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; }; }; - "JSONStream-1.3.4" = { + "JSONStream-1.3.5" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.4.tgz"; - sha512 = "Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg=="; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"; + sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; }; }; "JSV-4.0.2" = { @@ -1719,7 +1764,7 @@ let packageName = "adm-zip"; version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; + url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; }; }; @@ -3010,6 +3055,15 @@ let sha512 = "oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw=="; }; }; + "ast-types-0.11.6" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.11.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.6.tgz"; + sha512 = "nHiuV14upVGl7MWwFUYbzJ6YlfwWS084CU9EA8HajfYQjMSli5TQi3UTRygGF58LFWVkXxS1rbgRhROEqlQkXg=="; + }; + }; "ast-types-0.9.6" = { name = "ast-types"; packageName = "ast-types"; @@ -3262,13 +3316,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.330.0" = { + "aws-sdk-2.334.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.330.0"; + version = "2.334.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.330.0.tgz"; - sha512 = "biW3J8S9/b9uqeED2jbBHEbscwIclc0PBiylUkd3lJ5s226Yuv7mwSOfoI2Eogpyg/i97phK3uiUb/Q89/pCpQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.334.0.tgz"; + sha512 = "JiqtB2t/PklHCfo86HA6g6a8CXu5SDNa8XiaQ0rYyVBlzDR41p/s/yNlva3D1/QGiBTojl2fd9ZxBUxKa2Q9cg=="; }; }; "aws-sign-0.2.1" = { @@ -3469,6 +3523,15 @@ let sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; }; }; + "azure-arm-resource-7.0.0" = { + name = "azure-arm-resource"; + packageName = "azure-arm-resource"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.0.0.tgz"; + sha512 = "LW1OmW49d5xQo/KDBK2BNfoFVOlP8Gq9yKqP2kz0e6RURl5UXhIfN65Y4GeJramuyGIOXeGPV+NrXrzl1k4d4g=="; + }; + }; "azure-arm-servermanagement-1.1.0" = { name = "azure-arm-servermanagement"; packageName = "azure-arm-servermanagement"; @@ -3496,13 +3559,13 @@ let sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50"; }; }; - "azure-arm-website-0.11.5" = { + "azure-arm-website-5.3.0" = { name = "azure-arm-website"; packageName = "azure-arm-website"; - version = "0.11.5"; + version = "5.3.0"; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz"; - sha1 = "51942423e1238ec19e551926353a8e9f73bc534a"; + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-5.3.0.tgz"; + sha512 = "R2x44/SIGCuTBkRvnZuEjagIMAqcec38HnCl1AEO9NwpEh0HiD9eIa1XEM7j6wa7vHqyQdL7hNwYnCS0QRDkNQ=="; }; }; "azure-asm-compute-0.18.0" = { @@ -3631,13 +3694,13 @@ let sha512 = "ab0LlM5Q3pcKm+V6F6yx2ShzGOTYMcmJvLdL3PQsC9hF+hrYsBdkTCdNZdlPBgrSB8jp5vzhmK83qHGRs14hHw=="; }; }; - "azure-keyvault-1.0.0" = { + "azure-keyvault-3.0.4" = { name = "azure-keyvault"; packageName = "azure-keyvault"; - version = "1.0.0"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-1.0.0.tgz"; - sha1 = "d630f98032aadbb5e72fb04d2da49b368e441c9e"; + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-3.0.4.tgz"; + sha1 = "b7733d8f58d99a66f9ae766451556eb3b058dae5"; }; }; "azure-monitoring-0.10.6" = { @@ -3649,13 +3712,13 @@ let sha512 = "6HNA8VuC5qYvQMjcQt2/zlB7oyAJ7n6KGIYGstS6KS9Orux0peqxlrGPDeQRa4jDNq6ili83KiGc7RhWcgsE4Q=="; }; }; - "azure-servicefabric-0.1.5" = { + "azure-servicefabric-2.0.0" = { name = "azure-servicefabric"; packageName = "azure-servicefabric"; - version = "0.1.5"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz"; - sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6"; + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-2.0.0.tgz"; + sha512 = "SkMg4vVrQ7Vd7/h8h3qZzURQysV4KJqUIy4pjs/XRjVbCduSePlJ3EOgAl9ed739RWkT906xIAU3tu2Pf5RKFQ=="; }; }; "azure-storage-2.10.1" = { @@ -4297,13 +4360,13 @@ let sha512 = "DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw=="; }; }; - "binstall-1.2.0" = { + "binstall-1.2.1" = { name = "binstall"; packageName = "binstall"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "http://registry.npmjs.org/binstall/-/binstall-1.2.0.tgz"; - sha1 = "6b2c0f580b9e3c607f50ef7a22a54ce9fdc8d933"; + url = "https://registry.npmjs.org/binstall/-/binstall-1.2.1.tgz"; + sha512 = "mRTtOHr76uwiHuMjAxgK2TY10M99NgeXBFitGrOGXdGyTcAXOq5brPdzVz8y361TO3Chgnce9iQ9jVyv4xMW+Q=="; }; }; "bitfield-0.1.0" = { @@ -5935,15 +5998,6 @@ let sha512 = "Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA=="; }; }; - "chokidar-1.6.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "1.6.0"; - src = fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz"; - sha1 = "90c32ad4802901d7713de532dc284e96a63ad058"; - }; - }; "chokidar-1.7.0" = { name = "chokidar"; packageName = "chokidar"; @@ -6646,6 +6700,15 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; + "colornames-1.1.1" = { + name = "colornames"; + packageName = "colornames"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz"; + sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; + }; + }; "colors-0.5.1" = { name = "colors"; packageName = "colors"; @@ -6700,6 +6763,15 @@ let sha512 = "rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ=="; }; }; + "colorspace-1.1.1" = { + name = "colorspace"; + packageName = "colorspace"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.1.tgz"; + sha512 = "pI3btWyiuz7Ken0BWh9Elzsmv2bM9AhA7psXib4anUXy/orfZ/E0MbQwhSOG/9L8hLlalqrU0UhOuqxW1YjmVw=="; + }; + }; "colour-0.7.1" = { name = "colour"; packageName = "colour"; @@ -6772,13 +6844,13 @@ let sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w=="; }; }; - "command-exists-1.2.7" = { + "command-exists-1.2.8" = { name = "command-exists"; packageName = "command-exists"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.7.tgz"; - sha512 = "doWDvhXCcW5LK0cIUWrOQ8oMFXJv3lEQCkJpGVjM8v9SV0uhqYXB943538tEA2CiaWqSyuYUGAm5ezDwEx9xlw=="; + url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.8.tgz"; + sha512 = "PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw=="; }; }; "commander-0.6.1" = { @@ -6862,15 +6934,6 @@ let sha512 = "b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="; }; }; - "commander-2.13.0" = { - name = "commander"; - packageName = "commander"; - version = "2.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz"; - sha512 = "MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="; - }; - }; "commander-2.14.1" = { name = "commander"; packageName = "commander"; @@ -8843,13 +8906,13 @@ let sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; - "debug-3.2.5" = { + "debug-3.2.6" = { name = "debug"; packageName = "debug"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz"; - sha512 = "D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg=="; + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; "debug-4.1.0" = { @@ -9464,6 +9527,15 @@ let sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; }; }; + "diagnostics-1.1.1" = { + name = "diagnostics"; + packageName = "diagnostics"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz"; + sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ=="; + }; + }; "dicer-0.2.5" = { name = "dicer"; packageName = "dicer"; @@ -9500,13 +9572,13 @@ let sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; }; }; - "diff2html-2.3.3" = { + "diff2html-2.4.0" = { name = "diff2html"; packageName = "diff2html"; - version = "2.3.3"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.3.tgz"; - sha1 = "31bb815881c975634c7f3907a5e789341e1560bc"; + url = "https://registry.npmjs.org/diff2html/-/diff2html-2.4.0.tgz"; + sha1 = "de632384eefa5a7f6b0e92eafb1fa25d22dc88ab"; }; }; "diffie-hellman-5.0.3" = { @@ -10013,13 +10085,13 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "duplexify-3.6.0" = { + "duplexify-3.6.1" = { name = "duplexify"; packageName = "duplexify"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz"; - sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ=="; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz"; + sha512 = "vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA=="; }; }; "dynamic-dijkstra-1.0.0" = { @@ -10148,13 +10220,13 @@ let sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; }; }; - "editorconfig-0.15.0" = { + "editorconfig-0.15.2" = { name = "editorconfig"; packageName = "editorconfig"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.0.tgz"; - sha512 = "j7JBoj/bpNzvoTQylfRZSc85MlLNKWQiq5y6gwKhmqD2h1eZ+tH4AXbkhEJD468gjDna/XMx2YtSkCxBRX9OGg=="; + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.2.tgz"; + sha512 = "GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ=="; }; }; "ee-first-1.1.0" = { @@ -10302,6 +10374,15 @@ let sha1 = "9eba6837d16d0982b59f87d889bf754443d52931"; }; }; + "enabled-1.0.2" = { + name = "enabled"; + packageName = "enabled"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz"; + sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; + }; + }; "encodeurl-1.0.2" = { name = "encodeurl"; packageName = "encodeurl"; @@ -10518,6 +10599,15 @@ let sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; }; }; + "env-variable-0.0.5" = { + name = "env-variable"; + packageName = "env-variable"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz"; + sha512 = "zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA=="; + }; + }; "envconf-0.0.4" = { name = "envconf"; packageName = "envconf"; @@ -10869,13 +10959,13 @@ let sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.6.1" = { + "eslint-5.7.0" = { name = "eslint"; packageName = "eslint"; - version = "5.6.1"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.6.1.tgz"; - sha512 = "hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.7.0.tgz"; + sha512 = "zYCeFQahsxffGl87U2aJ7DPyH8CbWgxBC213Y8+TCanhUTf2gEvfq3EKpHmEcozTLyPmGe9LZdMAwC/CpJBM5A=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -11166,15 +11256,6 @@ let sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; }; }; - "eventemitter3-1.2.0" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; - }; - }; "eventemitter3-3.1.0" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -11472,6 +11553,15 @@ let sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; }; }; + "express-4.16.4" = { + name = "express"; + packageName = "express"; + version = "4.16.4"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz"; + sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg=="; + }; + }; "express-5.0.0-alpha.6" = { name = "express"; packageName = "express"; @@ -11531,7 +11621,7 @@ let packageName = "express-session"; version = "1.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz"; sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; }; }; @@ -11967,6 +12057,15 @@ let sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; }; + "fecha-2.3.3" = { + name = "fecha"; + packageName = "fecha"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz"; + sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="; + }; + }; "feedparser-2.2.9" = { name = "feedparser"; packageName = "feedparser"; @@ -12516,13 +12615,13 @@ let sha512 = "8QBannTFLICARmflhHpXNeR5hh6IzIyJz4XhKTofzmxq/hXEn1un7aF6P6dRQkOwthENDTbSB07eWKqwnYDKtw=="; }; }; - "flumeview-query-7.0.0" = { + "flumeview-query-7.1.0" = { name = "flumeview-query"; packageName = "flumeview-query"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.0.0.tgz"; - sha512 = "lk3Gs5wf6BwZKDafjE95/r0wv4nkMRsZULmulDCybFu1mPFeqUMR4H+ENcg+fgOpQBGaiNRTyHPQyg0OLur2wA=="; + url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.1.0.tgz"; + sha512 = "z/23qWuRW5dj7yNJ1i61R0RgnUWn4rdaf9Fr1Ckz3CzKpwJBWR1MqnABuGY3k1PZg1T11Busm2aRdb6oH1ZLsQ=="; }; }; "flumeview-reduce-1.3.14" = { @@ -12552,13 +12651,13 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "follow-redirects-1.5.8" = { + "follow-redirects-1.5.9" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.8.tgz"; - sha512 = "sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz"; + sha512 = "Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w=="; }; }; "for-each-0.3.3" = { @@ -14745,17 +14844,17 @@ let packageName = "highlight.js"; version = "8.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz"; + url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz"; sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88"; }; }; - "highlight.js-9.12.0" = { + "highlight.js-9.13.0" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.12.0"; + version = "9.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz"; - sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.13.0.tgz"; + sha512 = "2B90kcNnErqRTmzdZw6IPLEC9CdsiIMhj+r8L3LJKRCgtEJ+LY5yzWuQCVnADTI0wwocQinFzaaL/JjTQNqI/g=="; }; }; "hiredis-0.4.1" = { @@ -15028,15 +15127,6 @@ let sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254"; }; }; - "http-proxy-1.16.2" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz"; - sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; - }; - }; "http-proxy-1.17.0" = { name = "http-proxy"; packageName = "http-proxy"; @@ -15181,13 +15271,13 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; - "hypercore-6.19.2" = { + "hypercore-6.20.2" = { name = "hypercore"; packageName = "hypercore"; - version = "6.19.2"; + version = "6.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.19.2.tgz"; - sha512 = "AQS6mtwI7RDKRT3u68EEcehtI1VpaavWXxfnGDyOrR/AVBDUMdIUw8wcYCZdiZZVHarh5xKS4+VRCdJjS67LuA=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.20.2.tgz"; + sha512 = "VALfzDCqS0cIxoRvlQmCn4QYnQcUDCazyOQq3c0lbp1AvzEjaq62BvYDH28pmWeASokBszuysgsrPFTn704DbA=="; }; }; "hypercore-crypto-1.0.0" = { @@ -15370,6 +15460,15 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; + "ignore-5.0.2" = { + name = "ignore"; + packageName = "ignore"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.0.2.tgz"; + sha512 = "ilxkgh36cTqJxlipxQdCOxkbQae5dIeCwo5fSw6pBDW8m8GiMTnadClKST2+aATqjs9BTHsi0IqOsTp0jiihAw=="; + }; + }; "ignore-by-default-1.0.1" = { name = "ignore-by-default"; packageName = "ignore-by-default"; @@ -15798,7 +15897,7 @@ let packageName = "into-stream"; version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; + url = "http://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; }; }; @@ -16981,13 +17080,13 @@ let sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; }; }; - "jaeger-client-3.12.0" = { + "jaeger-client-3.13.0" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.12.0.tgz"; - sha512 = "TRwzui1D0OdNREHKWGw0Iuz2EkyTmlPVnzpIEXgPeiEbr/8j164Xvpfc1eCpbfGjNStcWj7Ipcvba/JBSy+q8w=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.13.0.tgz"; + sha512 = "ykrXLxcmSHSdDXqK6/DY+IObekfj4kbONC3QPu/ln7sbY5bsA+Yu4LYVlW9/vLm0lxLlsz52mSyC+sjiqM8xCw=="; }; }; "javascript-stringify-1.6.0" = { @@ -17990,6 +18089,15 @@ let sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw=="; }; }; + "kuler-1.0.1" = { + name = "kuler"; + packageName = "kuler"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz"; + sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ=="; + }; + }; "kvgraph-0.1.0" = { name = "kvgraph"; packageName = "kvgraph"; @@ -18044,13 +18152,13 @@ let sha512 = "On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw=="; }; }; - "layered-graph-1.1.0" = { + "layered-graph-1.1.1" = { name = "layered-graph"; packageName = "layered-graph"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/layered-graph/-/layered-graph-1.1.0.tgz"; - sha512 = "PSQEdXbmwffcwZ0i7HNfJI/cGnUqVTyt2caanHH/ixxzBqapONxAWYlnj13r3Q79V5ALiCtGrkRnaUo3zwKfzA=="; + url = "https://registry.npmjs.org/layered-graph/-/layered-graph-1.1.1.tgz"; + sha512 = "YqnSwwiLxLdvJBi6ZrUEQEdjv+Z3S5fO1mT6ItWCfZu2tsBG22gr49Bj+hgtMeose/74apZeCx+/T9j4NgMDNA=="; }; }; "lazy-1.0.11" = { @@ -18602,15 +18710,6 @@ let sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; }; }; - "lodash-4.13.1" = { - name = "lodash"; - packageName = "lodash"; - version = "4.13.1"; - src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"; - sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68"; - }; - }; "lodash-4.14.2" = { name = "lodash"; packageName = "lodash"; @@ -19700,6 +19799,15 @@ let sha512 = "ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ=="; }; }; + "logform-1.10.0" = { + name = "logform"; + packageName = "logform"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz"; + sha512 = "em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg=="; + }; + }; "lokijs-1.5.3" = { name = "lokijs"; packageName = "lokijs"; @@ -20591,13 +20699,13 @@ let sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; }; }; - "merge2-1.2.2" = { + "merge2-1.2.3" = { name = "merge2"; packageName = "merge2"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz"; - sha512 = "bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg=="; + url = "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz"; + sha512 = "gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA=="; }; }; "merkle-tree-stream-3.0.3" = { @@ -20987,13 +21095,13 @@ let sha512 = "mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w=="; }; }; - "minizlib-1.1.0" = { + "minizlib-1.1.1" = { name = "minizlib"; packageName = "minizlib"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz"; - sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz"; + sha512 = "TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg=="; }; }; "mirror-folder-3.0.0" = { @@ -21473,13 +21581,13 @@ let sha512 = "JHdEoxkA/5NgZRo91RNn4UT+HdcJV9XUo01DTkKC7vo1erNIngtuaw9Y0WI8RdTlyi+wMIbunflhghzVLuGJyw=="; }; }; - "multer-1.4.0" = { + "multer-1.4.1" = { name = "multer"; packageName = "multer"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.4.0.tgz"; - sha512 = "/JATgsDPdb/D9u8A2dFD8MhZYqgDKrWibpA9etSUt8CVzSHtsA13Y8LH9pR2/crsaYFua9g29UBgZB/g6nmOEg=="; + url = "https://registry.npmjs.org/multer/-/multer-1.4.1.tgz"; + sha512 = "zzOLNRxzszwd+61JFuAo0fxdQfvku12aNJgnla0AQ+hHxFmfc/B7jBVuPr5Rmvu46Jze/iJrFpSOsD7afO8SDw=="; }; }; "multi-random-access-2.1.1" = { @@ -21842,13 +21950,13 @@ let sha512 = "N1IBreECNaxmsaOLMqqm01K7XIp+sMvoVX8mvmT/p1VjM2FLcBU0lj0FalKooi2/2i+ph9WsEoEogOJevqQ6LQ=="; }; }; - "nanoid-1.2.6" = { + "nanoid-1.3.0" = { name = "nanoid"; packageName = "nanoid"; - version = "1.2.6"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.6.tgz"; - sha512 = "um9vXiM407BaRbBNa0aKPzFBSD2fDbVmmA9TzCWWlxZvEBzTbixM7ss6GDS4G/cNMYeZSNFx5SzAgWoG1uHU9g=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.3.0.tgz"; + sha512 = "OP8SoC91Kyjl1sdSTEnM1xYh4gUEOSkUl6wRBUklWOPyfPRbeJbhvdhQYXEjVtZ1LI9amVMkIWQI2nO8O7DL9A=="; }; }; "nanolru-1.0.0" = { @@ -21945,13 +22053,13 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "natives-1.1.5" = { + "natives-1.1.6" = { name = "natives"; packageName = "natives"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.5.tgz"; - sha512 = "1pJ+02gl2KJgCPFtpZGtuD4lGSJnIZvvFHCQTOeDRMSXjfu2GmYWuhI8NFMA4W2I5NNFRbfy/YCiVt4CgNpP8A=="; + url = "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz"; + sha512 = "6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA=="; }; }; "natural-compare-1.4.0" = { @@ -22144,13 +22252,13 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; - "neo-async-2.5.2" = { + "neo-async-2.6.0" = { name = "neo-async"; packageName = "neo-async"; - version = "2.5.2"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.2.tgz"; - sha512 = "vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw=="; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz"; + sha512 = "MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA=="; }; }; "net-browserify-alt-1.1.0" = { @@ -22378,6 +22486,15 @@ let sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; }; }; + "node-gyp-build-3.5.0" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz"; + sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ=="; + }; + }; "node-int64-0.4.0" = { name = "node-int64"; packageName = "node-int64"; @@ -22783,13 +22900,13 @@ let sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; - "npm-6.1.0" = { + "npm-6.4.1" = { name = "npm"; packageName = "npm"; - version = "6.1.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz"; - sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w=="; + url = "https://registry.npmjs.org/npm/-/npm-6.4.1.tgz"; + sha512 = "mXJL1NTVU136PtuopXCUQaNWuHlXCTp4McwlSW8S9/Aj8OEPAlSBgo8og7kJ01MjCDrkmqFQTvN5tTEhBMhXQg=="; }; }; "npm-bundled-1.0.5" = { @@ -22900,6 +23017,15 @@ let sha512 = "7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg=="; }; }; + "npm-registry-client-8.6.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "8.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.6.0.tgz"; + sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; + }; + }; "npm-registry-fetch-3.8.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -23441,6 +23567,15 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "one-time-0.0.4" = { + name = "one-time"; + packageName = "one-time"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz"; + sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; + }; + }; "onetime-1.1.0" = { name = "onetime"; packageName = "onetime"; @@ -24058,7 +24193,7 @@ let packageName = "packet-stream"; version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/packet-stream/-/packet-stream-2.0.4.tgz"; + url = "http://registry.npmjs.org/packet-stream/-/packet-stream-2.0.4.tgz"; sha512 = "7+oxHdMMs6VhLvvbrDUc8QNuelE9fPKLDdToXBIKLPKOlnoBeMim+/35edp+AnFTLzk3xcogVvQ/jrZyyGsEiw=="; }; }; @@ -24918,13 +25053,13 @@ let sha512 = "w7UohXesFggN77UyTnt0A7FqkEiq6TbeXgTvY7g1wFGXoGbxmF780uFm8oQKaWlFi7vnzDRkBnYHNaaHFUKEoQ=="; }; }; - "pino-std-serializers-2.2.1" = { + "pino-std-serializers-2.3.0" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.2.1.tgz"; - sha512 = "QqL7kkF7eMCpFG4hpZD8UPQga/kxkkh3E62HzMzTIL4OQyijyisAnBL8msBEAml8xcb/ioGhH7UUzGxuHqczhQ=="; + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.3.0.tgz"; + sha512 = "klfGoOsP6sJH7ON796G4xoUSx2fkpFgKHO4YVVO2zmz31jR+etzc/QzGJILaOIiCD6HTCFgkPx+XN8nk+ruqPw=="; }; }; "pkg-dir-2.0.0" = { @@ -25274,7 +25409,7 @@ let packageName = "pretty-hrtime"; version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; + url = "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"; sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; @@ -26628,15 +26763,6 @@ let sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"; }; }; - "qs-6.3.2" = { - name = "qs"; - packageName = "qs"; - version = "6.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; - sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; - }; - }; "qs-6.4.0" = { name = "qs"; packageName = "qs"; @@ -26871,13 +26997,13 @@ let sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q=="; }; }; - "raven-js-3.26.4" = { + "raven-js-3.27.0" = { name = "raven-js"; packageName = "raven-js"; - version = "3.26.4"; + version = "3.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/raven-js/-/raven-js-3.26.4.tgz"; - sha512 = "5VmC3IWhTQJkaiQaCY0S5V8za4bpUgbbuVT1MkDH7JVqgu8CPQ750XaFF8BVRbLV9F5nvoz7n0UT0CKteDuZAg=="; + url = "https://registry.npmjs.org/raven-js/-/raven-js-3.27.0.tgz"; + sha512 = "vChdOL+yzecfnGA+B5EhEZkJ3kY3KlMzxEhShKh6Vdtooyl0yZfYNFQfYzgMf2v4pyQa+OTZ5esTxxgOOZDHqw=="; }; }; "raw-body-0.0.3" = { @@ -27636,15 +27762,6 @@ let sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; - "request-2.79.0" = { - name = "request"; - packageName = "request"; - version = "2.79.0"; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.79.0.tgz"; - sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; - }; - }; "request-2.81.0" = { name = "request"; packageName = "request"; @@ -28482,13 +28599,13 @@ let sha512 = "e4hiMTahaLiN5XKap1YrifoyT8yRu9yQEZrMTglTBgq8Lv8iChFKLpbmXYeNxy2rCnutuWaQDFbp3sBgl4NQ4g=="; }; }; - "secret-stack-4.2.1" = { + "secret-stack-4.2.4" = { name = "secret-stack"; packageName = "secret-stack"; - version = "4.2.1"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.2.1.tgz"; - sha512 = "R4pn1zVaspQUqpC3iKLvA476pfftzE8AZTfMnd7TQpuVdGML0wsLYp4wmU4NZERHYsr0g99JnwUH5ll9n0APjg=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.2.4.tgz"; + sha512 = "HUG0YujOk20t7CeQz75dz79XmQQl1qsxEVngF+3l5ZNEHNEO6TJHNKo0OAxAWGKzSWiJDkzKLSnHqqZFNKcrPA=="; }; }; "secure-keys-1.0.0" = { @@ -28500,13 +28617,13 @@ let sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; }; }; - "secure-scuttlebutt-18.4.0" = { + "secure-scuttlebutt-18.5.0" = { name = "secure-scuttlebutt"; packageName = "secure-scuttlebutt"; - version = "18.4.0"; + version = "18.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.4.0.tgz"; - sha512 = "v74wJIcscPYRG+OF7cQPUi3wCBIy0lRT0e7w+bleFpAPvPL3LTlKtPqt9Stbjrtj5LKV7yWALjoLrkWT0eg+xg=="; + url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.5.0.tgz"; + sha512 = "b50xp0XAWtd6y4ygw2RRgDxaFNgGqC7XahRt/mC4XhiCe6HoTjpt6j07HVnTDcRtLzNiCPKlFJnYySFTFay2lQ=="; }; }; "seek-bzip-1.0.5" = { @@ -28541,7 +28658,7 @@ let packageName = "semver"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; + url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e"; }; }; @@ -28550,7 +28667,7 @@ let packageName = "semver"; version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; }; }; @@ -28559,7 +28676,7 @@ let packageName = "semver"; version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; + url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; }; }; @@ -28568,7 +28685,7 @@ let packageName = "semver"; version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; + url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz"; sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da"; }; }; @@ -28577,7 +28694,7 @@ let packageName = "semver"; version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; + url = "http://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; @@ -28586,7 +28703,7 @@ let packageName = "semver"; version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; + url = "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; }; }; @@ -28595,7 +28712,7 @@ let packageName = "semver"; version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.1.1.tgz"; + url = "http://registry.npmjs.org/semver/-/semver-5.1.1.tgz"; sha1 = "a3292a373e6f3e0798da0b20641b9a9c5bc47e19"; }; }; @@ -28604,7 +28721,7 @@ let packageName = "semver"; version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + url = "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; }; @@ -28626,6 +28743,15 @@ let sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="; }; }; + "semver-5.6.0" = { + name = "semver"; + packageName = "semver"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz"; + sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="; + }; + }; "semver-compare-1.0.0" = { name = "semver-compare"; packageName = "semver-compare"; @@ -28671,13 +28797,13 @@ let sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8"; }; }; - "semver-utils-1.1.2" = { + "semver-utils-1.1.4" = { name = "semver-utils"; packageName = "semver-utils"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.2.tgz"; - sha512 = "+RvtdCZJdLJXN6ozVqbypYII/m4snihgWvmFHW8iWusxqGVdEP31QdUVVaC6GeJ9EYE0JCMdWiNlLF3edjifEw=="; + url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz"; + sha512 = "EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA=="; }; }; "send-0.0.3" = { @@ -29211,13 +29337,13 @@ let sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw=="; }; }; - "simple-git-1.104.0" = { + "simple-git-1.105.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.104.0"; + version = "1.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.104.0.tgz"; - sha512 = "KTELLFyhLhN1qZGQkglx1e0YezYKNabCY4oKrTVb9y0BllkWwruK2qFCQDm2zpT7rE4IPd4/hzZt/6+0ykQIdA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.105.0.tgz"; + sha512 = "ZrGcCPRIKCm6Q8gNJ+gx+leHqaokKpXae6K9lZpVD4sfeA2/rVvxcIR4KVVujNOmA6wHE2xaQ0GQWuIY88o6pA=="; }; }; "simple-lru-cache-0.0.2" = { @@ -29580,13 +29706,13 @@ let sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg=="; }; }; - "snyk-1.102.0" = { + "snyk-1.103.4" = { name = "snyk"; packageName = "snyk"; - version = "1.102.0"; + version = "1.103.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.102.0.tgz"; - sha512 = "OZfjEJeMdrYj7KVXaNhLwVi1vv5omRyrLv469BD6Bc6mvOK4/JVEcJGoNgn3MyWazgpOy8/4Xi9mMQvrdwfRfQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.103.4.tgz"; + sha512 = "ynLlsLDjAkzymd0qi1il6f34S4oNTfIgvFCFvkYxvqfBkedfOoDQT4TLU8gi+55MGM6iornf2iefC2FW92BwnQ=="; }; }; "snyk-config-2.2.0" = { @@ -29598,13 +29724,13 @@ let sha512 = "mq0wbP/AgjcmRq5i5jg2akVVV3iSYUPTowZwKn7DChRLDL8ySOzWAwan+ImXiyNbrWo87FNI/15O6MpOnTxOIg=="; }; }; - "snyk-docker-plugin-1.11.0" = { + "snyk-docker-plugin-1.12.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.11.0.tgz"; - sha512 = "rJrSj4FfGtaFGNybWTb0bULEqoQEeZfZBpGoDumiXsGqoSWf61Tr1V/Ck9NGcmHWNEVsLZLcE9CXp6Y6Kbo8qA=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.12.0.tgz"; + sha512 = "QqKq2bGdnf1L2PNGQrHoqcoaV/PIlJv1qjKIzwA93gfhToKGkgJ31oPXwfef/l9N+ui0Y44c4POBHFbFf8PlJw=="; }; }; "snyk-go-plugin-1.5.2" = { @@ -29643,13 +29769,13 @@ let sha512 = "9jAhZhv+7YcqtoQYCYlgMoxK+dWBKlk+wkX27Ebg3vNddNop9q5jZitRXTjsXwfSUZHRt+Ptw1f8vei9kjzZVg=="; }; }; - "snyk-nodejs-lockfile-parser-1.5.1" = { + "snyk-nodejs-lockfile-parser-1.5.3" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.5.1.tgz"; - sha512 = "rfFcW+ZrOEH3NxufUCpMBpNLSb4BPOxLbAM6MoRqfYH5DhSdTHsecwRDf1gU6XzQok/9Koav+1qtP8+welJC2A=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.5.3.tgz"; + sha512 = "hVUUxRm7f8mN3RdTbeZGJn+w4VMKb7ke4/OB8Qhr4O5S04AMb4YOcsZ80niur05VUykPT32IyFwyGRTBi99WUw=="; }; }; "snyk-nuget-plugin-1.6.5" = { @@ -29697,13 +29823,13 @@ let sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw=="; }; }; - "snyk-resolve-deps-4.0.1" = { + "snyk-resolve-deps-4.0.2" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.1.tgz"; - sha512 = "gieaYoOuJLXzUmDDKfQJAqfwaxa43KmSqN2d9abRfgMXnLlX9IqyoZ1wqZMbd3WN7tsHSkpWvVwc4FHdQEkUKA=="; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.2.tgz"; + sha512 = "nlw62wiWhGOTw3BD3jVIwrUkRR4iNxEkkO4Y/PWs8BsUWseGu1H6QgLesFXJb3qx7ANJ5UbUCJMgV+eL0Lf9cA=="; }; }; "snyk-sbt-plugin-2.0.0" = { @@ -30048,13 +30174,13 @@ let sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006"; }; }; - "source-list-map-2.0.0" = { + "source-list-map-2.0.1" = { name = "source-list-map"; packageName = "source-list-map"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz"; - sha512 = "I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A=="; + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; }; }; "source-map-0.1.31" = { @@ -30435,13 +30561,13 @@ let sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA=="; }; }; - "ssb-config-2.3.4" = { + "ssb-config-2.3.5" = { name = "ssb-config"; packageName = "ssb-config"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.4.tgz"; - sha512 = "Yp0DKsc9eSaU+9+5xMO4/NVdOFyBtHD+QgraZ+1Id2K4f0eUiKpJ2ogLNmGanTvkLVhm/vq27TLI27Fq83njWQ=="; + url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.5.tgz"; + sha512 = "lT30POSTXX6nsACYwMkNto0M74YMoEzLqpSpZqK+AwaRWlNvFqGmjEMwLb5G5jz7deCrXJFo87O3IubiQrwdGg=="; }; }; "ssb-ebt-5.2.3" = { @@ -30467,7 +30593,7 @@ let packageName = "ssb-git"; version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-git/-/ssb-git-0.5.0.tgz"; + url = "http://registry.npmjs.org/ssb-git/-/ssb-git-0.5.0.tgz"; sha1 = "5f4f712e42a23b895b128d61bc70dfb3bd5b40b4"; }; }; @@ -30485,7 +30611,7 @@ let packageName = "ssb-issues"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-issues/-/ssb-issues-1.0.0.tgz"; + url = "http://registry.npmjs.org/ssb-issues/-/ssb-issues-1.0.0.tgz"; sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5"; }; }; @@ -30503,7 +30629,7 @@ let packageName = "ssb-links"; version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz"; + url = "http://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz"; sha512 = "x09ShIMjwvdZI7aDZm8kc1v5YCGZa9ulCOoxrf/RYJ98s5gbTfO9CBCzeMBAeQ5kRwSuKjiOxJHdeEBkj4Y6hw=="; }; }; @@ -30557,7 +30683,7 @@ let packageName = "ssb-pull-requests"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-pull-requests/-/ssb-pull-requests-1.0.0.tgz"; + url = "http://registry.npmjs.org/ssb-pull-requests/-/ssb-pull-requests-1.0.0.tgz"; sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118"; }; }; @@ -30588,13 +30714,13 @@ let sha512 = "mZPI9HKZtqPP7Qi26B0GR7HqYmmcELEaoj5zr8TlUcULg9BOZy7f4VSzcKZ36LIkvpuK2sfA6znxIlBLq78fjg=="; }; }; - "ssb-ws-2.1.1" = { + "ssb-ws-3.0.0" = { name = "ssb-ws"; packageName = "ssb-ws"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ws/-/ssb-ws-2.1.1.tgz"; - sha512 = "1fK/jXI6lKZadRJDr49t+6yMmWynp6PFrADs3Whmy8IslnYGl83ujhlpRIBvCn1EuVHjV7yLsIiJ8a0X2Kg0DQ=="; + url = "https://registry.npmjs.org/ssb-ws/-/ssb-ws-3.0.0.tgz"; + sha512 = "Qna9Oa9+MYhv+Xtqmidb6xww2JZAdO6ZzidJleWbOLJTSV2QkkB7aAFpWdYst/N78ZhThPqT/mdgEmWpaCqTbw=="; }; }; "ssh-config-1.1.3" = { @@ -30620,17 +30746,17 @@ let packageName = "sshpk"; version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; + url = "http://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; }; }; - "sshpk-1.14.2" = { + "sshpk-1.15.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.2"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; - sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz"; + sha512 = "mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA=="; }; }; "sshpk-1.7.1" = { @@ -30638,7 +30764,7 @@ let packageName = "sshpk"; version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz"; + url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz"; sha1 = "565e386c42a77e6062fbd14c0472ff21cd53398c"; }; }; @@ -31506,6 +31632,15 @@ let sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA=="; }; }; + "superagent-4.0.0-beta.5" = { + name = "superagent"; + packageName = "superagent"; + version = "4.0.0-beta.5"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-4.0.0-beta.5.tgz"; + sha512 = "v4FTm6kg6zJOfLcot9kCTcWy/wjD/hvtUXWcv0Pd8TlUqxKDctif2rtDPRb4gW6Df9MMXU1BHB+1z5U2VFVsYg=="; + }; + }; "superagent-proxy-2.0.0" = { name = "superagent-proxy"; packageName = "superagent-proxy"; @@ -31731,6 +31866,15 @@ let sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg=="; }; }; + "table-5.1.0" = { + name = "table"; + packageName = "table"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-5.1.0.tgz"; + sha512 = "e542in22ZLhD/fOIuXs/8yDZ9W61ltF8daM88rkRNtgTIct+vI2fTnAyu/Db2TCfEcI8i7mjZz6meLq0nW7TYg=="; + }; + }; "tabtab-1.3.2" = { name = "tabtab"; packageName = "tabtab"; @@ -31939,13 +32083,22 @@ let sha1 = "a87ee424be01a1d28f2f301045043a5bcd679a05"; }; }; - "text-extensions-1.8.0" = { + "text-extensions-1.9.0" = { name = "text-extensions"; packageName = "text-extensions"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.8.0.tgz"; - sha512 = "mVzjRxuWnDKs/qH1rbOJEVHLlSX9kty9lpi7lMvLgU9S74mQ8/Ozg9UPcKxShh0qG2NZ+NyPOPpcZU4C1Eld9A=="; + url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz"; + sha512 = "wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ=="; + }; + }; + "text-hex-1.0.0" = { + name = "text-hex"; + packageName = "text-hex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"; + sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="; }; }; "text-table-0.2.0" = { @@ -32704,6 +32857,15 @@ let sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg=="; }; }; + "triple-beam-1.3.0" = { + name = "triple-beam"; + packageName = "triple-beam"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz"; + sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; + }; + }; "truncate-2.0.1" = { name = "truncate"; packageName = "truncate"; @@ -32938,13 +33100,13 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.1.1" = { + "typescript-3.1.3" = { name = "typescript"; packageName = "typescript"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.1.1.tgz"; - sha512 = "Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.1.3.tgz"; + sha512 = "+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA=="; }; }; "typewise-1.0.3" = { @@ -33181,13 +33343,13 @@ let sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; }; }; - "unbzip2-stream-1.3.0" = { + "unbzip2-stream-1.3.1" = { name = "unbzip2-stream"; packageName = "unbzip2-stream"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.0.tgz"; - sha512 = "kE2WkurNnPUMcryNioS68DDbhoPB8Qxsd8btHSj+sd5Pjh2GsjmeHLzMSqV9HHziAo8FzVxVCJl9ZYhk7yY1pA=="; + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz"; + sha512 = "fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw=="; }; }; "unc-path-regex-0.1.2" = { @@ -34639,6 +34801,15 @@ let sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; }; }; + "webassemblyjs-1.7.8" = { + name = "webassemblyjs"; + packageName = "webassemblyjs"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.7.8.tgz"; + sha512 = "7J64n2yTf2apgtRJypiHUFNRc2twQrMAFIWsm8u4qih7nG+sry2Bna1zq3qFI35fazIF1m42VGHHvdp9bBXmBA=="; + }; + }; "webidl-conversions-2.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -34972,6 +35143,24 @@ let sha512 = "NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q=="; }; }; + "winston-3.1.0" = { + name = "winston"; + packageName = "winston"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-3.1.0.tgz"; + sha512 = "FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg=="; + }; + }; + "winston-transport-4.2.0" = { + name = "winston-transport"; + packageName = "winston-transport"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.2.0.tgz"; + sha512 = "0R1bvFqxSlK/ZKTH86nymOuKv/cT1PQBMuDdA7k7f0S9fM44dNH6bXnuxwXPrN8lefJgtZq08BKdyZ0DZIy/rg=="; + }; + }; "with-4.0.3" = { name = "with"; packageName = "with"; @@ -35337,7 +35526,7 @@ let packageName = "xmlbuilder"; version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; }; }; @@ -35346,7 +35535,7 @@ let packageName = "xmlbuilder"; version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; }; }; @@ -35355,7 +35544,7 @@ let packageName = "xmlbuilder"; version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz"; sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; @@ -35364,7 +35553,7 @@ let packageName = "xmlbuilder"; version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"; sha1 = "69248673410b4ba42e1a6136551d2922335aa773"; }; }; @@ -35373,7 +35562,7 @@ let packageName = "xmlbuilder"; version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; }; @@ -35924,10 +36113,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.13.2"; + version = "1.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.13.2.tgz"; - sha512 = "XtcUf7n2nfz7tEyV2auK55d018ji3WIJYSQAowF9h69go3Jr68OPvhJiaCQikpbM5b+NNw7LBBkKUVJxA3LVsA=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.13.3.tgz"; + sha512 = "IU15/1dufp+iI9FmXshIo9z9x4HmDk5Wslo2VkHlA1k8pYzHQ3XapRflDkEdV1tZ9LXTEMJW40t8mnWLjZjDqg=="; }; dependencies = [ sources."JSV-4.0.2" @@ -35959,7 +36148,7 @@ in sources."chalk-1.1.3" sources."chmodr-1.2.0" sources."colors-1.3.2" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."convert-source-map-1.6.0" sources."core-js-2.5.7" @@ -36081,7 +36270,7 @@ in sources."chromium-pickle-js-0.2.0" sources."co-4.6.0" sources."combined-stream-1.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cuint-0.2.2" @@ -36145,7 +36334,7 @@ in }) sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."string_decoder-0.10.31" sources."tmp-0.0.28" (sources."touch-0.0.3" // { @@ -36173,13 +36362,13 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.19"; + version = "0.10.20"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.19.tgz"; - sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.20.tgz"; + sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ=="; }; dependencies = [ - sources."@types/node-8.10.34" + sources."@types/node-8.10.36" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -36202,6 +36391,7 @@ in (sources."azure-arm-datalake-analytics-1.0.2-preview" // { dependencies = [ sources."async-0.2.7" + sources."azure-arm-resource-1.6.1-preview" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" sources."request-2.74.0" @@ -36210,6 +36400,7 @@ in (sources."azure-arm-datalake-store-1.0.2-preview" // { dependencies = [ sources."async-0.2.7" + sources."azure-arm-resource-1.6.1-preview" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" sources."request-2.74.0" @@ -36225,6 +36416,7 @@ in (sources."azure-arm-powerbiembedded-0.1.1" // { dependencies = [ sources."async-0.2.7" + sources."azure-arm-resource-1.6.1-preview" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" sources."request-2.74.0" @@ -36233,30 +36425,17 @@ in (sources."azure-arm-rediscache-0.2.3" // { dependencies = [ sources."async-0.2.7" + sources."azure-arm-resource-1.6.1-preview" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" sources."request-2.74.0" ]; }) - (sources."azure-arm-resource-1.6.1-preview" // { - dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."request-2.74.0" - ]; - }) + sources."azure-arm-resource-7.0.0" sources."azure-arm-servermanagement-1.1.0" sources."azure-arm-storage-5.2.0" sources."azure-arm-trafficmanager-1.1.0-preview" - (sources."azure-arm-website-0.11.5" // { - dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."request-2.74.0" - ]; - }) + sources."azure-arm-website-5.3.0" sources."azure-asm-compute-0.18.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-mgmt-0.10.1" @@ -36284,27 +36463,13 @@ in }) sources."azure-gallery-2.0.0-pre.18" sources."azure-graph-2.2.0" - (sources."azure-keyvault-1.0.0" // { - dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."request-2.74.0" - ]; - }) + sources."azure-keyvault-3.0.4" (sources."azure-monitoring-0.10.6" // { dependencies = [ sources."underscore-1.9.1" ]; }) - (sources."azure-servicefabric-0.1.5" // { - dependencies = [ - sources."async-0.2.7" - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."request-2.74.0" - ]; - }) + sources."azure-servicefabric-2.0.0" (sources."azure-storage-2.10.1" // { dependencies = [ sources."extend-1.2.1" @@ -36391,7 +36556,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-2.0.6" // { dependencies = [ - sources."commander-2.18.0" + sources."commander-2.19.0" ]; }) sources."has-ansi-2.0.0" @@ -36536,7 +36701,7 @@ in sources."asn1-0.1.11" ]; }) - (sources."sshpk-1.14.2" // { + (sources."sshpk-1.15.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -36691,7 +36856,7 @@ in ]; }) sources."ms-2.0.0" - sources."natives-1.1.5" + sources."natives-1.1.6" sources."normalize-package-data-2.4.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -36719,7 +36884,7 @@ in sources."glob-7.1.3" ]; }) - sources."semver-5.5.1" + sources."semver-5.6.0" sources."signal-exit-3.0.2" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" @@ -36757,7 +36922,7 @@ in sha512 = "zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ=="; }; dependencies = [ - sources."JSONStream-1.3.4" + sources."JSONStream-1.3.5" sources."acorn-6.0.2" sources."acorn-node-1.6.0" sources."acorn-walk-6.1.0" @@ -36983,7 +37148,7 @@ in sources."codepage-1.4.0" sources."colour-0.7.1" sources."combined-stream-0.0.7" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."compact2string-1.4.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { @@ -37079,7 +37244,7 @@ in sources."map-obj-1.0.1" (sources."mdns-js-1.0.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -37206,7 +37371,7 @@ in sources."rx-2.5.3" sources."safe-buffer-5.1.2" sources."sax-1.2.4" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" @@ -37351,10 +37516,10 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.3.2" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.5.8" + sources."follow-redirects-1.5.9" sources."has-flag-3.0.0" sources."humanize-plus-1.8.2" sources."is-buffer-1.1.6" @@ -37384,27 +37549,60 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "3.1.1"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-3.1.1.tgz"; - sha512 = "e+fxBy5cCayuNpxt3tcigBIuFsU/+oN48eK3aQtCBV12glavbBMxJa3ut2AEDHhXa/g3pC8r2BorKthrofHGRw=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.0.1.tgz"; + sha512 = "Agj3tsKjvXD53aSdy7rmEo35vYMSHm1MiW8NssH4+z+TpifPQwJxl0y72z+v4TbTg/K1xe5IUGrMfqZ00Z82zw=="; }; dependencies = [ - sources."async-1.0.0" - sources."colors-1.0.3" - sources."commander-2.13.0" - sources."cycle-1.0.3" - sources."eventemitter3-1.2.0" - sources."eyes-0.1.8" - sources."http-proxy-1.16.2" - sources."isstream-0.1.2" + sources."async-2.6.1" + sources."color-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.5.3" + sources."colornames-1.1.1" + sources."colors-1.3.2" + sources."colorspace-1.1.1" + sources."commander-2.19.0" + sources."core-util-is-1.0.2" + sources."debug-3.1.0" + sources."diagnostics-1.1.1" + sources."enabled-1.0.2" + sources."env-variable-0.0.5" + sources."eventemitter3-3.1.0" + sources."fast-safe-stringify-2.0.6" + sources."fecha-2.3.3" + sources."follow-redirects-1.5.9" + sources."http-proxy-1.17.0" + sources."inherits-2.0.3" + sources."is-arrayish-0.3.2" + sources."is-stream-1.1.0" + sources."isarray-1.0.0" + sources."kuler-1.0.1" + sources."lodash-4.17.11" + (sources."logform-1.10.0" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) sources."lynx-0.2.0" sources."mersenne-0.0.4" + sources."ms-2.0.0" + sources."one-time-0.0.4" + sources."process-nextick-args-2.0.0" + sources."readable-stream-2.3.6" sources."requires-port-1.0.0" + sources."safe-buffer-5.1.2" + sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."statsd-parser-0.0.4" sources."strftime-0.10.0" - sources."winston-2.4.4" + sources."string_decoder-1.1.1" + sources."text-hex-1.0.0" + sources."triple-beam-1.3.0" + sources."util-deprecate-1.0.2" + sources."winston-3.1.0" + sources."winston-transport-4.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -37424,7 +37622,7 @@ in sha512 = "IfslM3MP42CA/ebVJVlit6FhQ2P6Fercwx9NNQjkVs0wahEwqamL4bcqh1gKiTti7+/ZsDtBRSVmRv+y7LcTbg=="; }; dependencies = [ - sources."JSONStream-1.3.4" + sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."acorn-5.7.3" @@ -37465,7 +37663,7 @@ in sources."big-integer-1.6.36" sources."block-stream-0.0.9" sources."bn.js-4.11.8" - sources."body-parser-1.18.2" + sources."body-parser-1.18.3" (sources."boxen-1.3.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -37612,11 +37810,7 @@ in sources."evp_bytestokey-1.0.3" sources."execa-0.7.0" sources."exit-hook-1.1.1" - (sources."express-4.16.3" // { - dependencies = [ - sources."safe-buffer-5.1.1" - ]; - }) + sources."express-4.16.4" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."falafel-2.1.0" @@ -37656,7 +37850,7 @@ in sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."https-browserify-1.0.0" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.23" sources."ieee754-1.1.12" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -37800,19 +37994,13 @@ in sources."public-encrypt-4.0.3" sources."punycode-1.4.1" sources."q-1.5.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."range-parser-1.2.0" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) + sources."raw-body-2.3.3" sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-2.1.0" @@ -37837,11 +38025,7 @@ in sources."rechoir-0.6.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - (sources."request-2.88.0" // { - dependencies = [ - sources."qs-6.5.2" - ]; - }) + sources."request-2.88.0" sources."resolve-1.8.1" sources."restore-cursor-1.0.1" (sources."rimraf-2.6.2" // { @@ -37855,7 +38039,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-0.3.5" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-diff-2.1.0" sources."send-0.16.2" sources."serve-static-1.13.2" @@ -37881,7 +38065,7 @@ in sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."statuses-1.4.0" sources."stream-browserify-2.0.1" sources."stream-buffers-2.2.0" @@ -37990,7 +38174,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.0" - sources."@types/node-10.11.4" + sources."@types/node-10.11.7" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -38017,7 +38201,7 @@ in sources."custom-error-instance-2.1.1" sources."cycle-onionify-4.0.0" sources."d-1.0.0" - sources."debug-3.2.5" + sources."debug-3.2.6" sources."delayed-stream-1.0.0" sources."es5-ext-0.10.46" sources."es6-iterator-2.0.3" @@ -38121,10 +38305,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.0.3.tgz"; - sha512 = "HpApfnkI/kc8mfqN9JkPUZ0MmaqsKkvhJzUWjXg/PqeeGNrO4NKXmWzc2QUncszl/o+jfaqxy8ajgO0BQuRcow=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.0.4.tgz"; + sha512 = "8FP0i8GNAVADIH6zc1INmpkxDZADi+wWNOveq/ja/vjpkfgXcHd0bglNC5mg03cVmJUZWm/Am9qNY1IsUW+PGQ=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -38232,7 +38416,7 @@ in sources."path-exists-3.0.0" sources."pseudomap-1.0.2" sources."regenerator-runtime-0.11.1" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."source-map-0.5.7" @@ -38383,7 +38567,7 @@ in sources."dat-secret-storage-4.0.1" sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.1" - (sources."debug-3.2.5" // { + (sources."debug-3.2.6" // { dependencies = [ sources."ms-2.1.1" ]; @@ -38411,7 +38595,7 @@ in sources."dom-walk-0.1.1" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" - sources."duplexify-3.6.0" + sources."duplexify-3.6.1" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" @@ -38455,7 +38639,7 @@ in sources."has-flag-3.0.0" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.19.2" // { + (sources."hypercore-6.20.2" // { dependencies = [ sources."process-nextick-args-1.0.7" sources."unordered-set-2.0.1" @@ -38568,7 +38752,7 @@ in sources."neat-tasks-1.1.1" sources."nets-3.2.0" sources."network-address-1.1.2" - sources."node-gyp-build-3.4.0" + sources."node-gyp-build-3.5.0" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -38631,7 +38815,7 @@ in sources."rusha-0.8.13" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-diff-2.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -38651,7 +38835,7 @@ in sources."sorted-indexof-1.0.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.1.0" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."stack-trace-0.0.10" sources."stream-collector-1.0.1" sources."stream-each-1.2.3" @@ -38924,7 +39108,7 @@ in sources."cors-2.8.4" sources."deferred-leveldown-0.2.0" sources."docker-parse-image-3.0.1" - (sources."duplexify-3.6.0" // { + (sources."duplexify-3.6.1" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.6" @@ -39068,13 +39252,13 @@ in sha512 = "Rxbsh4LWdIlMUO+NxET9g1xHZ9Q93i7jtPESYcCyEOnRiSsZXi/AF6UmCdvmM38IgHrklI2e4DwuG1OwRIGQAA=="; }; dependencies = [ - sources."JSONStream-1.3.4" + sources."JSONStream-1.3.5" sources."ajv-5.5.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.330.0" + sources."aws-sdk-2.334.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -39137,7 +39321,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."through-2.3.8" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -39183,53 +39367,52 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.18.13-beta"; + version = "0.18.13-beta3"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.13-beta.tgz"; - sha512 = "bD2euTGjq4GFHqG2AWOrXXYidqYgz/NU3RVZB3d0qvDwZ8GItlv2ReCtU4D2RuqY40+sCTUT4Tiq2gpV13GThg=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.13-beta3.tgz"; + sha512 = "qKYcejb/fXOaZ1dg6N2JQqMc1QLuk1SKZHN2uP4eg+HQIlxWkQ7HQE2Kgo3bojMfdo0t0ZbGS6yhe06NmdeGmg=="; }; dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."anymatch-1.3.2" - sources."arr-diff-2.0.0" + sources."ajv-5.5.2" + sources."ansi-styles-3.2.1" + sources."anymatch-2.0.0" + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-unique-0.2.1" + sources."array-unique-0.3.2" sources."asn1-0.2.4" - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."async-each-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.12.0" - sources."binstall-1.2.0" + sources."binstall-1.2.1" sources."block-stream-0.0.9" - sources."boom-2.10.1" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" - (sources."cache-base-1.0.1" // { + (sources."braces-2.3.2" // { dependencies = [ - sources."isobject-3.0.1" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - sources."caseless-0.11.0" - (sources."chalk-2.1.0" // { + sources."cache-base-1.0.1" + sources."caseless-0.12.0" + sources."chalk-2.1.0" + (sources."chokidar-2.0.4" // { dependencies = [ - sources."ansi-styles-3.2.1" + sources."fsevents-1.2.4" ]; }) - sources."chokidar-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -39244,262 +39427,30 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) + sources."co-4.6.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."commander-2.18.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cross-spawn-4.0.0" - sources."cryptiles-2.0.5" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" - (sources."define-property-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."extglob-0.3.2" - sources."extsprintf-1.3.0" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" - (sources."find-elm-dependencies-1.0.2" // { - dependencies = [ - sources."firstline-1.2.0" - sources."lodash-4.14.2" - ]; - }) - sources."find-parent-dir-0.3.0" - sources."firstline-1.2.1" - sources."for-in-1.0.2" - sources."for-own-0.1.5" - sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."fragment-cache-0.2.1" - sources."fs-extra-0.30.0" - sources."fs.realpath-1.0.0" - sources."fsevents-1.1.2" - sources."fstream-1.0.11" - sources."generate-function-2.3.1" - sources."generate-object-property-1.2.0" - sources."get-value-2.0.6" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."glob-7.1.3" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" - sources."graceful-fs-4.1.11" - (sources."har-validator-2.0.6" // { - dependencies = [ - sources."chalk-1.1.3" - sources."supports-color-2.0.0" - ]; - }) - sources."has-ansi-2.0.0" - sources."has-flag-2.0.0" - (sources."has-value-1.0.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" - sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.19.0" - sources."is-number-2.1.0" - (sources."is-plain-object-2.0.4" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" - sources."is-property-1.0.2" - sources."is-typedarray-1.0.0" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-2.1.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsonpointer-4.0.1" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."kind-of-3.2.2" - sources."klaw-1.3.1" - sources."lodash-4.13.1" - sources."lru-cache-4.1.3" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."math-random-1.0.1" - sources."micromatch-2.3.11" - sources."mime-db-1.36.0" - sources."mime-types-2.1.20" - sources."minimatch-3.0.4" - sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."ms-2.0.0" - sources."murmur-hash-js-1.0.0" - sources."nan-2.11.1" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."kind-of-6.0.2" - ]; - }) - (sources."node-elm-compiler-4.3.3" // { - dependencies = [ - sources."lodash-4.14.2" - ]; - }) - sources."normalize-path-2.1.1" - sources."oauth-sign-0.8.2" - (sources."object-copy-0.1.0" // { + (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - ]; - }) - (sources."object-visit-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."object.omit-2.0.1" - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."once-1.4.0" - sources."os-tmpdir-1.0.2" - sources."parse-glob-3.0.4" - sources."pascalcase-0.1.1" - sources."path-is-absolute-1.0.1" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."posix-character-classes-0.1.1" - sources."preserve-0.2.0" - sources."process-nextick-args-2.0.0" - sources."pseudomap-1.0.2" - sources."punycode-1.4.1" - sources."qs-6.3.2" - (sources."randomatic-3.1.0" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.2" - ]; - }) - sources."readable-stream-2.3.6" - (sources."readdirp-2.2.1" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { dependencies = [ sources."kind-of-3.2.2" @@ -39510,27 +39461,159 @@ in sources."kind-of-3.2.2" ]; }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" + ]; + }) + sources."extend-3.0.2" + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + (sources."find-elm-dependencies-1.0.2" // { + dependencies = [ + sources."firstline-1.2.0" + sources."lodash-4.14.2" + ]; + }) + sources."find-parent-dir-0.3.0" + sources."firstline-1.2.1" + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + (sources."form-data-2.3.2" // { + dependencies = [ + sources."combined-stream-1.0.6" + ]; + }) + sources."fragment-cache-0.2.1" + sources."fs-extra-0.30.0" + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.2" + sources."fstream-1.0.11" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-7.1.3" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."graceful-fs-4.1.11" + sources."har-schema-2.0.0" + sources."har-validator-5.1.0" + sources."has-flag-2.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."http-signature-1.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-typedarray-1.0.0" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-2.4.0" + sources."jsprim-1.4.1" + sources."kind-of-6.0.2" + sources."klaw-1.3.1" + sources."lodash-4.17.11" + sources."lodash.debounce-4.0.8" + sources."lru-cache-4.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."micromatch-3.1.10" + sources."mime-db-1.36.0" + sources."mime-types-2.1.20" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mixin-deep-1.3.1" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."ms-2.0.0" + sources."murmur-hash-js-1.0.0" + sources."nan-2.11.1" + sources."nanomatch-1.2.13" + (sources."node-elm-compiler-4.3.3" // { + dependencies = [ + sources."lodash-4.14.2" + ]; + }) + sources."normalize-path-2.1.1" + sources."oauth-sign-0.9.0" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" (sources."is-descriptor-0.1.6" // { dependencies = [ sources."kind-of-5.1.0" ]; }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.2" - sources."micromatch-3.1.10" + sources."kind-of-3.2.2" ]; }) - sources."regex-cache-0.4.4" + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."os-tmpdir-1.0.2" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."posix-character-classes-0.1.1" + sources."process-nextick-args-2.0.0" + sources."pseudomap-1.0.2" + sources."psl-1.1.29" + sources."punycode-1.4.1" + sources."qs-6.5.2" + sources."readable-stream-2.3.6" + sources."readdirp-2.2.1" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.79.0" + sources."request-2.88.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."rimraf-2.6.2" @@ -39540,6 +39623,7 @@ in (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) (sources."snapdragon-0.8.2" // { @@ -39557,27 +39641,26 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" ]; }) (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) - sources."snapdragon-util-3.0.1" - sources."sntp-1.0.9" + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" sources."split-1.0.1" sources."split-string-3.1.0" - (sources."sshpk-1.14.2" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."sshpk-1.15.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -39596,8 +39679,6 @@ in ]; }) sources."string_decoder-1.1.1" - sources."stringstream-0.0.6" - sources."strip-ansi-3.0.1" sources."supports-color-4.2.0" sources."tar-2.2.1" (sources."temp-0.8.3" // { @@ -39606,19 +39687,20 @@ in ]; }) sources."through-2.3.8" - sources."to-object-path-0.3.0" - sources."to-regex-3.0.2" - (sources."to-regex-range-2.1.1" // { + (sources."to-object-path-0.3.0" // { dependencies = [ - sources."is-number-3.0.0" + sources."kind-of-3.2.2" ]; }) - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.4.3" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."tough-cookie-2.4.3" + sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" sources."set-value-0.4.3" ]; }) @@ -39630,22 +39712,17 @@ in ]; }) sources."has-values-0.1.4" - sources."isobject-3.0.1" ]; }) + sources."upath-1.1.0" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.3.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" sources."xmlbuilder-8.2.2" - sources."xtend-4.0.1" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -39841,7 +39918,7 @@ in sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" sources."safe-buffer-5.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -39896,10 +39973,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.6.1"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.6.1.tgz"; - sha512 = "hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.7.0.tgz"; + sha512 = "zYCeFQahsxffGl87U2aJ7DPyH8CbWgxBC213Y8+TCanhUTf2gEvfq3EKpHmEcozTLyPmGe9LZdMAwC/CpJBM5A=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" @@ -39907,7 +39984,6 @@ in sources."acorn-5.7.3" sources."acorn-jsx-4.1.1" sources."ajv-6.5.4" - sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -40006,7 +40082,7 @@ in sources."run-async-2.3.0" sources."rxjs-6.3.3" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -40016,7 +40092,7 @@ in sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."table-4.0.3" + sources."table-5.1.0" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -40051,7 +40127,6 @@ in sources."acorn-5.7.3" sources."acorn-jsx-4.1.1" sources."ajv-6.5.4" - sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -40077,7 +40152,7 @@ in sources."del-2.2.2" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - sources."eslint-5.6.1" + sources."eslint-5.7.0" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -40154,7 +40229,7 @@ in sources."run-async-2.3.0" sources."rxjs-6.3.3" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -40164,7 +40239,7 @@ in sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."table-4.0.3" + sources."table-5.1.0" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -40353,13 +40428,13 @@ in sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."signal-exit-3.0.2" sources."spdx-correct-3.0.2" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -40848,7 +40923,7 @@ in sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.1.1" - sources."simple-git-1.104.0" + sources."simple-git-1.105.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -40884,7 +40959,7 @@ in sources."git-remote-ssb-2.0.4" sources."git-ssb-web-2.8.0" sources."hashlru-2.2.1" - sources."highlight.js-9.12.0" + sources."highlight.js-9.13.0" sources."increment-buffer-1.0.1" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -40915,7 +40990,7 @@ in sources."multiserver-1.13.5" sources."muxrpc-6.4.1" sources."nan-2.11.1" - sources."node-gyp-build-3.4.0" + sources."node-gyp-build-3.5.0" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."options-0.0.6" @@ -40974,7 +41049,7 @@ in sources."remove-markdown-0.1.0" sources."safe-buffer-5.1.2" sources."secret-handshake-1.1.14" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.0.1" @@ -40990,7 +41065,7 @@ in sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-client-4.6.0" - sources."ssb-config-2.3.4" + sources."ssb-config-2.3.5" sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" @@ -41100,9 +41175,9 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bluebird-3.5.2" - (sources."body-parser-1.18.2" // { + (sources."body-parser-1.18.3" // { dependencies = [ - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.23" ]; }) sources."boxen-1.3.0" @@ -41137,8 +41212,8 @@ in ]; }) sources."combined-stream-1.0.7" - sources."command-exists-1.2.7" - sources."commander-2.18.0" + sources."command-exists-1.2.8" + sources."commander-2.19.0" sources."common-tags-1.8.0" sources."concat-map-0.0.1" sources."configstore-3.1.2" @@ -41206,20 +41281,12 @@ in ]; }) sources."expand-tilde-2.0.2" - sources."express-4.16.3" + sources."express-4.16.4" (sources."express-request-proxy-2.2.2" // { dependencies = [ - (sources."body-parser-1.18.3" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."debug-3.2.5" - sources."iconv-lite-0.4.23" + sources."debug-3.2.6" sources."ms-2.1.1" sources."path-to-regexp-1.7.0" - sources."qs-6.5.2" - sources."raw-body-2.3.3" ]; }) sources."extend-3.0.2" @@ -41254,7 +41321,7 @@ in sources."graphcool-json-schema-1.2.1" (sources."graphcool-yml-0.4.15" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."dotenv-4.0.0" sources."fs-extra-4.0.3" sources."ms-2.1.1" @@ -41300,7 +41367,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-2.2.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -41350,7 +41417,7 @@ in sources."json-schema-0.2.3" (sources."json-schema-ref-parser-3.3.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -41455,7 +41522,7 @@ in sources."prisma-json-schema-0.1.1" (sources."prisma-yml-1.0.93" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."dotenv-4.0.0" sources."ms-2.1.1" ]; @@ -41467,14 +41534,11 @@ in sources."pseudomap-1.0.2" sources."psl-1.1.29" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."range-parser-1.2.0" - (sources."raw-body-2.3.2" // { + (sources."raw-body-2.3.3" // { dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."iconv-lite-0.4.19" - sources."setprototypeof-1.0.3" + sources."iconv-lite-0.4.23" ]; }) (sources."rc-1.2.8" // { @@ -41493,12 +41557,7 @@ in sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."replaceall-0.1.6" - (sources."request-2.88.0" // { - dependencies = [ - sources."qs-6.5.2" - sources."safe-buffer-5.1.2" - ]; - }) + sources."request-2.88.0" sources."request-promise-4.2.2" sources."request-promise-core-1.1.1" sources."require-directory-2.1.1" @@ -41509,10 +41568,10 @@ in sources."rimraf-2.6.2" sources."run-async-2.3.0" sources."rxjs-5.5.12" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."scuid-1.1.0" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-diff-2.1.0" sources."send-0.16.2" sources."sentence-case-2.1.1" @@ -41536,7 +41595,7 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."statuses-1.4.0" sources."stealthy-require-1.1.1" (sources."string-width-2.1.1" // { @@ -42200,7 +42259,7 @@ in sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.13" - sources."natives-1.1.5" + sources."natives-1.1.6" sources."object-assign-3.0.0" (sources."object-copy-0.1.0" // { dependencies = [ @@ -42609,7 +42668,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { @@ -42754,7 +42813,7 @@ in sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."ast-types-0.11.5" + sources."ast-types-0.11.6" sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -42800,7 +42859,7 @@ in sources."dashdash-1.14.1" sources."data-uri-to-buffer-1.2.0" sources."date-now-0.1.4" - sources."debug-3.2.5" + sources."debug-3.2.6" sources."decamelize-1.2.0" sources."deep-is-0.1.3" sources."degenerator-1.0.4" @@ -43043,7 +43102,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."secure-keys-1.0.0" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."setprototypeof-1.1.0" (sources."shallow-clone-0.1.2" // { dependencies = [ @@ -43053,14 +43112,14 @@ in sources."shelljs-0.3.0" sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" - sources."snyk-1.102.0" + sources."snyk-1.103.4" sources."snyk-config-2.2.0" - sources."snyk-docker-plugin-1.11.0" + sources."snyk-docker-plugin-1.12.0" sources."snyk-go-plugin-1.5.2" sources."snyk-gradle-plugin-2.1.0" sources."snyk-module-1.8.2" sources."snyk-mvn-plugin-2.0.0" - (sources."snyk-nodejs-lockfile-parser-1.5.1" // { + (sources."snyk-nodejs-lockfile-parser-1.5.3" // { dependencies = [ sources."lodash-4.17.10" ]; @@ -43070,7 +43129,7 @@ in sources."snyk-policy-1.12.0" sources."snyk-python-plugin-1.8.2" sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-4.0.1" + sources."snyk-resolve-deps-4.0.2" sources."snyk-sbt-plugin-2.0.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.3.1" @@ -43080,7 +43139,7 @@ in sources."source-map-support-0.5.9" sources."split-1.0.1" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."stack-trace-0.0.10" sources."statuses-1.5.0" sources."string-width-2.1.1" @@ -43206,7 +43265,7 @@ in sources."debug-3.1.0" sources."ecstatic-3.3.0" sources."eventemitter3-3.1.0" - sources."follow-redirects-1.5.8" + sources."follow-redirects-1.5.9" sources."he-1.2.0" sources."http-proxy-1.17.0" sources."mime-1.6.0" @@ -43261,7 +43320,7 @@ in sources."ansi-escapes-3.1.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."ast-types-0.11.5" + sources."ast-types-0.11.6" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" @@ -43346,7 +43405,7 @@ in }) (sources."https-proxy-agent-2.2.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" ]; }) sources."iconv-lite-0.4.24" @@ -43410,7 +43469,7 @@ in sources."yallist-3.0.2" ]; }) - sources."minizlib-1.1.0" + sources."minizlib-1.1.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -43430,7 +43489,7 @@ in sources."p-finally-1.0.0" (sources."pac-proxy-agent-3.0.0" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" ]; }) sources."pac-resolver-3.0.0" @@ -43444,7 +43503,7 @@ in sources."process-nextick-args-2.0.0" (sources."proxy-agent-3.0.3" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" ]; }) sources."proxy-from-env-1.0.0" @@ -43467,7 +43526,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-diff-2.1.0" sources."setprototypeof-1.1.0" sources."shebang-command-1.2.0" @@ -43497,12 +43556,12 @@ in sources."strip-json-comments-2.0.1" (sources."superagent-3.8.3" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" ]; }) (sources."superagent-proxy-2.0.0" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" ]; }) sources."supports-color-5.5.0" @@ -43757,7 +43816,7 @@ in sha512 = "Kkal2i0jcXsgwgn61gnhVJuh0R0J+HqyzREVaeBvZHgMCAQVW02kYwVbY8xzpBfcZmDBYcT5LrPBBQa27C9tRA=="; }; dependencies = [ - (sources."@commitlint/cli-7.2.0" // { + (sources."@commitlint/cli-7.2.1" // { dependencies = [ sources."chalk-2.3.1" ]; @@ -43765,10 +43824,10 @@ in sources."@commitlint/config-conventional-7.1.2" sources."@commitlint/ensure-7.2.0" sources."@commitlint/execute-rule-7.1.2" - sources."@commitlint/format-7.2.0" - sources."@commitlint/is-ignored-7.2.0" - sources."@commitlint/lint-7.2.0" - sources."@commitlint/load-7.2.0" + sources."@commitlint/format-7.2.1" + sources."@commitlint/is-ignored-7.2.1" + sources."@commitlint/lint-7.2.1" + sources."@commitlint/load-7.2.1" sources."@commitlint/message-7.1.2" sources."@commitlint/parse-7.1.2" sources."@commitlint/read-7.1.2" @@ -43777,7 +43836,7 @@ in sources."@commitlint/to-lines-7.1.2" sources."@commitlint/top-level-7.1.2" sources."@marionebl/sander-0.6.1" - sources."JSONStream-1.3.4" + sources."JSONStream-1.3.5" sources."ansi-color-0.2.1" sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" @@ -43806,7 +43865,7 @@ in sources."check-error-1.0.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."compare-func-1.3.2" sources."concat-map-0.0.1" sources."conventional-changelog-angular-1.6.6" @@ -43860,7 +43919,7 @@ in sources."is-text-path-1.0.1" sources."isarray-1.0.0" sources."iterare-0.0.8" - (sources."jaeger-client-3.12.0" // { + (sources."jaeger-client-3.13.0" // { dependencies = [ sources."opentracing-0.13.0" ]; @@ -43938,7 +43997,7 @@ in sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."semaphore-async-await-1.5.1" - sources."semver-5.5.0" + sources."semver-5.6.0" sources."signal-exit-3.0.2" sources."spdx-correct-3.0.2" sources."spdx-exceptions-2.2.0" @@ -43953,7 +44012,7 @@ in sources."strip-indent-2.0.0" sources."supports-color-5.5.0" sources."symbol-observable-1.0.1" - sources."text-extensions-1.8.0" + sources."text-extensions-1.9.0" sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."thriftrw-3.11.3" @@ -44171,7 +44230,7 @@ in sources."safer-buffer-2.1.2" sources."shelljs-0.3.0" sources."split-1.0.1" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."stack-trace-0.0.10" sources."string_decoder-0.10.31" sources."strip-json-comments-1.0.4" @@ -44218,18 +44277,18 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.8.6"; + version = "1.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.6.tgz"; - sha512 = "TYDZa+lg8vEC5U0OmGQEEwiZ0XFBfvZAUeNOtqflLe+woKuIqF4JzlsBx/C1KVYW5lUewZy2ODL4Obq6sH7a4Q=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.7.tgz"; + sha512 = "yhAMCTv0L9GNg6Gql7i+g4C1z9rQhfHXy4J0TGYFoBzzHR4reWYS573gkRrPuE58dYOH451LmBeAb8L1pLEfdA=="; }; dependencies = [ - sources."@types/commander-2.12.2" + sources."@types/node-10.11.7" sources."@types/semver-5.5.0" sources."abbrev-1.1.1" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."config-chain-1.1.12" - sources."editorconfig-0.15.0" + sources."editorconfig-0.15.2" sources."ini-1.3.5" sources."lru-cache-4.1.3" sources."minimist-0.0.8" @@ -44240,7 +44299,7 @@ in sources."osenv-0.1.5" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."sigmund-1.0.1" sources."yallist-2.1.2" ]; @@ -44334,7 +44393,7 @@ in sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."debug-3.2.5" + sources."debug-3.2.6" sources."delayed-stream-1.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" @@ -44440,19 +44499,8 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-0.7.0" - (sources."express-4.16.3" // { + (sources."express-4.16.4" // { dependencies = [ - sources."body-parser-1.18.2" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - sources."raw-body-2.3.2" - sources."safe-buffer-5.1.1" sources."statuses-1.4.0" ]; }) @@ -44539,7 +44587,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nanoid-1.2.6" + sources."nanoid-1.3.0" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -44578,7 +44626,7 @@ in sources."require-main-filename-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" (sources."send-0.16.2" // { @@ -44593,7 +44641,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."statuses-1.5.0" sources."steno-0.4.4" sources."string-width-2.1.1" @@ -44821,7 +44869,7 @@ in sources."statuses-1.3.1" ]; }) - (sources."follow-redirects-1.5.8" // { + (sources."follow-redirects-1.5.9" // { dependencies = [ sources."debug-3.1.0" ]; @@ -44879,7 +44927,7 @@ in sources."lodash.debounce-4.0.8" (sources."log4js-3.0.6" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -45024,7 +45072,7 @@ in sources."statuses-1.5.0" (sources."streamroller-0.7.0" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -45259,7 +45307,7 @@ in sources."convert-source-map-1.6.0" sources."core-util-is-1.0.2" sources."define-properties-1.1.3" - sources."duplexify-3.6.0" + sources."duplexify-3.6.1" sources."end-of-stream-1.4.1" sources."extend-3.0.2" sources."flush-write-stream-1.0.3" @@ -45527,7 +45575,7 @@ in sources."sntp-2.1.0" sources."source-map-0.6.1" sources."sprintf-js-1.1.1" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."stack-trace-0.0.10" sources."string-width-1.0.2" sources."string_decoder-0.10.31" @@ -45598,10 +45646,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.4.1"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.4.1.tgz"; - sha512 = "00X2mYuwJk/bvxdjJceUxTjUgUg7MIMWllo2zGfDVGPijLadrg8QCtJASZqVE7HDQbBLDxLGPjswk29HF5JS2Q=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.4.3.tgz"; + sha512 = "tWq1LvpHqkyB+FaJCmkEweivr88yShDMmauofPVdh0M5gU1cVucszYnIgWafulKYu2LMQ3IfUMUU5Pp3+MvADQ=="; }; dependencies = [ sources."@lerna/add-3.4.1" @@ -45641,7 +45689,7 @@ in sources."@lerna/package-graph-3.1.2" sources."@lerna/project-3.0.0" sources."@lerna/prompt-3.3.1" - sources."@lerna/publish-3.4.1" + sources."@lerna/publish-3.4.3" sources."@lerna/resolve-symlink-3.3.0" sources."@lerna/rimraf-dir-3.3.0" sources."@lerna/run-3.3.2" @@ -45654,7 +45702,7 @@ in sources."@lerna/write-log-file-3.0.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.2" - sources."JSONStream-1.3.4" + sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.2.1" sources."agentkeepalive-3.5.1" @@ -45805,7 +45853,7 @@ in sources."dir-glob-2.0.0" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" - sources."duplexify-3.6.0" + sources."duplexify-3.6.1" sources."ecc-jsbn-0.1.2" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" @@ -45942,7 +45990,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-2.2.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -46040,7 +46088,7 @@ in sources."read-pkg-up-3.0.0" ]; }) - sources."merge2-1.2.2" + sources."merge2-1.2.3" sources."micromatch-3.1.10" sources."mime-db-1.36.0" sources."mime-types-2.1.20" @@ -46053,7 +46101,7 @@ in sources."yallist-3.0.2" ]; }) - sources."minizlib-1.1.0" + sources."minizlib-1.1.1" sources."mississippi-3.0.0" (sources."mixin-deep-1.3.1" // { dependencies = [ @@ -46224,7 +46272,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { dependencies = [ @@ -46279,7 +46327,7 @@ in sources."split-string-3.1.0" sources."split2-2.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."ssri-6.0.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -46320,7 +46368,7 @@ in }) sources."temp-dir-1.0.0" sources."temp-write-3.4.0" - sources."text-extensions-1.8.0" + sources."text-extensions-1.9.0" sources."through-2.3.8" sources."through2-2.0.3" sources."tmp-0.0.33" @@ -46474,7 +46522,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."source-map-0.6.1" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."tough-cookie-2.4.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -47030,19 +47078,8 @@ in sources."etag-1.8.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - (sources."express-4.16.3" // { + (sources."express-4.16.4" // { dependencies = [ - sources."body-parser-1.18.2" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - sources."raw-body-2.3.2" - sources."safe-buffer-5.1.1" sources."statuses-1.4.0" ]; }) @@ -47359,7 +47396,7 @@ in sources."source-map-url-0.4.0" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -47534,7 +47571,7 @@ in dependencies = [ sources."glob-7.1.3" sources."minimatch-3.0.4" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."uglify-js-2.8.29" ]; }) @@ -47645,7 +47682,7 @@ in sources."debug-2.6.9" (sources."debug-fabulous-1.1.0" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -47665,7 +47702,7 @@ in sources."readable-stream-1.1.14" ]; }) - (sources."duplexify-3.6.0" // { + (sources."duplexify-3.6.1" // { dependencies = [ sources."end-of-stream-1.4.1" sources."once-1.4.0" @@ -47961,7 +47998,7 @@ in sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.13" - sources."natives-1.1.5" + sources."natives-1.1.6" sources."next-tick-1.0.0" sources."normalize-path-2.1.1" sources."now-and-later-2.0.0" @@ -48088,7 +48125,7 @@ in sources."source-map-url-0.4.0" sources."sparkles-1.0.1" sources."split-string-3.1.0" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -48142,7 +48179,7 @@ in sources."tough-cookie-2.4.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."typescript-3.1.1" + sources."typescript-3.1.3" (sources."uglify-js-3.4.9" // { dependencies = [ sources."source-map-0.6.1" @@ -48261,11 +48298,11 @@ in sources."argparse-1.0.10" sources."asynckit-0.4.0" sources."combined-stream-1.0.6" - sources."commander-2.18.0" + sources."commander-2.19.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."debug-3.2.5" + sources."debug-3.2.6" sources."delayed-stream-1.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" @@ -48408,7 +48445,7 @@ in sources."mime-types-2.1.20" sources."minimist-0.0.8" sources."minipass-2.3.4" - sources."minizlib-1.1.0" + sources."minizlib-1.1.1" sources."mkdirp-0.5.1" sources."ncp-0.4.2" sources."nijs-0.0.25" @@ -48452,7 +48489,7 @@ in sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."ssri-5.3.0" sources."string-width-1.0.2" sources."string_decoder-1.1.1" @@ -48577,7 +48614,7 @@ in sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -48604,10 +48641,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz"; - sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz"; + sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -48648,7 +48685,7 @@ in sources."biased-opener-0.2.8" sources."big-integer-1.6.36" sources."block-stream-0.0.9" - sources."body-parser-1.18.2" + sources."body-parser-1.18.3" sources."boom-2.10.1" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" @@ -48691,7 +48728,7 @@ in sources."error-ex-1.3.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.16.3" + sources."express-4.16.4" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."finalhandler-1.1.1" @@ -48721,7 +48758,7 @@ in sources."hosted-git-info-2.7.1" sources."http-errors-1.6.3" sources."http-signature-1.1.1" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.23" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -48773,7 +48810,7 @@ in dependencies = [ sources."glob-7.1.3" sources."rimraf-2.6.2" - sources."semver-5.5.1" + sources."semver-5.6.0" ]; }) sources."nopt-4.0.1" @@ -48803,15 +48840,9 @@ in sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.4" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."range-parser-1.2.0" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) + sources."raw-body-2.3.3" sources."rc-1.2.8" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -48824,13 +48855,14 @@ in ]; }) sources."rimraf-2.2.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-4.3.6" sources."send-0.16.2" (sources."serve-favicon-2.5.0" // { dependencies = [ sources."ms-2.1.1" + sources."safe-buffer-5.1.1" ]; }) sources."serve-static-1.13.2" @@ -48842,7 +48874,7 @@ in sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" - (sources."sshpk-1.14.2" // { + (sources."sshpk-1.15.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -48955,7 +48987,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.3.4" - sources."minizlib-1.1.0" + sources."minizlib-1.1.1" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."needle-2.2.4" @@ -48981,7 +49013,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -49074,7 +49106,7 @@ in sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" - (sources."debug-3.2.5" // { + (sources."debug-3.2.6" // { dependencies = [ sources."ms-2.1.1" ]; @@ -49238,7 +49270,7 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-diff-2.1.0" (sources."set-value-2.0.0" // { dependencies = [ @@ -49455,7 +49487,7 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.4.2" sources."domutils-1.5.1" - sources."duplexify-3.6.0" + sources."duplexify-3.6.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" @@ -49535,7 +49567,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-2.2.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -49716,7 +49748,7 @@ in sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."statuses-1.5.0" sources."stream-shift-1.0.0" sources."streamsearch-0.1.2" @@ -50022,7 +50054,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" - sources."natives-1.1.5" + sources."natives-1.1.6" sources."ncp-0.4.2" sources."nopt-2.2.1" (sources."npm-registry-client-0.2.27" // { @@ -50060,7 +50092,7 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -50131,7 +50163,7 @@ in sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" - sources."debug-3.2.5" + sources."debug-3.2.6" sources."deep-extend-0.6.0" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" @@ -50201,9 +50233,9 @@ in sources."registry-url-3.1.0" sources."require-from-string-2.0.2" sources."safe-buffer-5.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-diff-2.1.0" - sources."semver-utils-1.1.2" + sources."semver-utils-1.1.4" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -50274,7 +50306,7 @@ in sources."colors-1.3.2" sources."cross-spawn-5.1.0" sources."cvss-1.0.4" - sources."debug-3.2.5" + sources."debug-3.2.6" sources."decamelize-1.2.0" sources."error-ex-1.3.2" sources."es6-promise-4.2.5" @@ -50343,7 +50375,7 @@ in sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -50510,20 +50542,9 @@ in sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - (sources."express-4.16.3" // { + (sources."express-4.16.4" // { dependencies = [ - sources."body-parser-1.18.2" sources."content-type-1.0.4" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - sources."raw-body-2.3.2" - sources."safe-buffer-5.1.1" sources."statuses-1.4.0" ]; }) @@ -50686,7 +50707,7 @@ in sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" (sources."send-0.16.2" // { dependencies = [ sources."statuses-1.4.0" @@ -50709,7 +50730,7 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" @@ -50972,7 +50993,7 @@ in sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."server-destroy-1.0.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" @@ -51580,7 +51601,7 @@ in sources."rimraf-2.6.2" sources."safer-buffer-2.1.2" sources."sntp-1.0.9" - (sources."sshpk-1.14.2" // { + (sources."sshpk-1.15.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -51617,10 +51638,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.16.2"; + version = "2.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz"; - sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.3.tgz"; + sha512 = "W63qZOC9YGr+33JYvZjvhzvYL4YKT2gAywDJQrHvKTL6vmnnSh+GdM3ZdGIIZ6A57YB3NgvQaq/BJ2uYjwn3ZQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -51657,7 +51678,7 @@ in sha512 = "Sm1XQg2h2JBVHWK3bxSHnmMdMoM0hEi5cbGfBBLpM6E2qU1vjJhDJsO/8bEkxC2RvNAAEOWROKMI3tTzmVxLbQ=="; }; dependencies = [ - sources."JSONStream-1.3.4" + sources."JSONStream-1.3.5" sources."acorn-6.0.2" sources."acorn-node-1.6.0" sources."acorn-walk-6.1.0" @@ -51913,7 +51934,7 @@ in sources."mute-stream-0.0.7" sources."nan-2.11.1" sources."nanomatch-1.2.13" - sources."neo-async-2.5.2" + sources."neo-async-2.6.0" sources."node-static-0.7.11" sources."normalize-path-2.1.1" (sources."object-copy-0.1.0" // { @@ -52147,11 +52168,7 @@ in sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" - (sources."basic-auth-2.0.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.2.1" sources."bl-1.2.2" @@ -52210,18 +52227,8 @@ in sources."etag-1.8.1" sources."eventemitter2-3.0.2" sources."expand-template-1.1.1" - (sources."express-4.16.3" // { + (sources."express-4.16.4" // { dependencies = [ - sources."body-parser-1.18.2" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - sources."raw-body-2.3.2" sources."statuses-1.4.0" ]; }) @@ -52364,9 +52371,9 @@ in }) sources."resolve-1.8.1" sources."right-align-0.1.3" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" (sources."send-0.16.2" // { dependencies = [ sources."statuses-1.4.0" @@ -52386,7 +52393,7 @@ in sources."simple-get-1.4.3" sources."sntp-1.0.9" sources."source-map-0.5.7" - (sources."sshpk-1.14.2" // { + (sources."sshpk-1.15.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -52540,7 +52547,7 @@ in sources."read-1.0.7" sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."stack-trace-0.0.10" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" @@ -52676,7 +52683,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."send-0.1.4" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."stream-counter-0.2.0" sources."string-1.6.1" sources."string_decoder-0.10.31" @@ -52699,10 +52706,10 @@ in scuttlebot = nodeEnv.buildNodePackage { name = "scuttlebot"; packageName = "scuttlebot"; - version = "12.2.3"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-12.2.3.tgz"; - sha512 = "Y40HTj8B8DHdGUCbup//Ge/BiVcmp6fVPCGHnn5Jmq0QyQitlnFUaeMlv2fdqealM4xB3xuCTS2KChbiRJOWtw=="; + url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-13.0.0.tgz"; + sha512 = "niRO3ySzMcXXIrx88zBMdLZ53zvC3DALiFZL42hELL0nE3ohGlhSYQNYefgPB1KiVyMomuNvlhusw9yQsYs/dQ=="; }; dependencies = [ sources."abstract-leveldown-4.0.3" @@ -52991,7 +52998,7 @@ in sources."isobject-2.1.0" sources."json-buffer-2.0.11" sources."kind-of-3.2.2" - (sources."layered-graph-1.1.0" // { + (sources."layered-graph-1.1.1" // { dependencies = [ sources."pull-cont-0.1.1" ]; @@ -53098,7 +53105,7 @@ in }) sources."ncp-2.0.0" sources."node-abi-2.4.5" - sources."node-gyp-build-3.4.0" + sources."node-gyp-build-3.5.0" (sources."non-private-ip-1.4.4" // { dependencies = [ sources."ip-1.1.5" @@ -53320,17 +53327,17 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."secret-handshake-1.1.14" - (sources."secret-stack-4.2.1" // { + (sources."secret-stack-4.2.4" // { dependencies = [ sources."ip-1.1.5" ]; }) - (sources."secure-scuttlebutt-18.4.0" // { + (sources."secure-scuttlebutt-18.5.0" // { dependencies = [ sources."deep-equal-0.2.2" ]; }) - sources."semver-5.5.1" + sources."semver-5.6.0" sources."separator-escape-0.0.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.0" // { @@ -53391,7 +53398,7 @@ in sources."split-string-3.1.0" sources."ssb-blobs-1.1.5" sources."ssb-client-4.6.0" - sources."ssb-config-2.3.4" + sources."ssb-config-2.3.5" sources."ssb-ebt-5.2.3" (sources."ssb-friends-3.1.3" // { dependencies = [ @@ -53403,7 +53410,7 @@ in sources."ssb-msgs-5.2.0" (sources."ssb-query-2.3.0" // { dependencies = [ - sources."flumeview-query-7.0.0" + sources."flumeview-query-7.1.0" sources."map-filter-reduce-3.2.1" ]; }) @@ -53413,7 +53420,7 @@ in ]; }) sources."ssb-validate-3.0.11" - sources."ssb-ws-2.1.1" + sources."ssb-ws-3.0.0" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -53531,10 +53538,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "5.5.1"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz"; - sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="; + url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz"; + sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="; }; buildInputs = globalBuildInputs; meta = { @@ -53665,7 +53672,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.2" - sources."body-parser-1.18.2" + sources."body-parser-1.18.3" sources."bytes-3.0.0" sources."callsite-1.0.0" sources."caseless-0.12.0" @@ -53714,7 +53721,7 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."event-stream-3.3.6" - sources."express-4.16.3" + sources."express-4.16.4" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" @@ -53744,7 +53751,7 @@ in }) sources."http-errors-1.6.3" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.19" + sources."iconv-lite-0.4.23" sources."indexof-0.0.1" sources."inherits-2.0.3" sources."ipaddr.js-1.8.0" @@ -53788,24 +53795,13 @@ in sources."proxy-addr-2.0.4" sources."psl-1.1.29" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."range-parser-1.2.0" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) + sources."raw-body-2.3.3" sources."read-1.0.7" sources."readable-stream-1.1.14" - (sources."request-2.88.0" // { - dependencies = [ - sources."qs-6.5.2" - sources."safe-buffer-5.1.2" - ]; - }) - sources."safe-buffer-5.1.1" + sources."request-2.88.0" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."send-0.16.2" sources."serve-static-1.13.2" @@ -53839,7 +53835,7 @@ in ]; }) sources."split-1.0.1" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."statuses-1.4.0" sources."stream-combiner-0.2.2" sources."string_decoder-0.10.31" @@ -53881,7 +53877,7 @@ in sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ - sources."JSONStream-1.3.4" + sources."JSONStream-1.3.5" sources."accepts-1.3.5" sources."ajv-5.5.2" sources."amdefine-1.0.1" @@ -54098,7 +54094,7 @@ in sources."source-map-0.1.43" sources."sprintf-js-1.0.3" sources."srcset-1.0.0" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."statuses-1.3.1" sources."string_decoder-1.1.1" sources."supports-color-5.5.0" @@ -54525,10 +54521,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.102.0"; + version = "1.103.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.102.0.tgz"; - sha512 = "OZfjEJeMdrYj7KVXaNhLwVi1vv5omRyrLv469BD6Bc6mvOK4/JVEcJGoNgn3MyWazgpOy8/4Xi9mMQvrdwfRfQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.103.4.tgz"; + sha512 = "ynLlsLDjAkzymd0qi1il6f34S4oNTfIgvFCFvkYxvqfBkedfOoDQT4TLU8gi+55MGM6iornf2iefC2FW92BwnQ=="; }; dependencies = [ sources."@yarnpkg/lockfile-1.1.0" @@ -54541,7 +54537,7 @@ in sources."archy-1.0.0" sources."argparse-1.0.10" sources."asap-2.0.6" - sources."ast-types-0.11.5" + sources."ast-types-0.11.6" sources."async-1.5.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -54571,7 +54567,7 @@ in sources."core-util-is-1.0.2" sources."crypto-random-string-1.0.0" sources."data-uri-to-buffer-1.2.0" - sources."debug-3.2.5" + sources."debug-3.2.6" sources."decamelize-1.2.0" sources."deep-is-0.1.3" sources."degenerator-1.0.4" @@ -54718,7 +54714,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."secure-keys-1.0.0" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."setprototypeof-1.1.0" (sources."shallow-clone-0.1.2" // { dependencies = [ @@ -54728,12 +54724,12 @@ in sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" sources."snyk-config-2.2.0" - sources."snyk-docker-plugin-1.11.0" + sources."snyk-docker-plugin-1.12.0" sources."snyk-go-plugin-1.5.2" sources."snyk-gradle-plugin-2.1.0" sources."snyk-module-1.8.2" sources."snyk-mvn-plugin-2.0.0" - (sources."snyk-nodejs-lockfile-parser-1.5.1" // { + (sources."snyk-nodejs-lockfile-parser-1.5.3" // { dependencies = [ sources."lodash-4.17.10" ]; @@ -54743,7 +54739,7 @@ in sources."snyk-policy-1.12.0" sources."snyk-python-plugin-1.8.2" sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-4.0.1" + sources."snyk-resolve-deps-4.0.2" sources."snyk-sbt-plugin-2.0.0" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.3.1" @@ -55409,14 +55405,14 @@ in }) sources."mpath-0.2.1" sources."ms-2.0.0" - sources."multer-1.4.0" + sources."multer-1.4.1" sources."mute-stream-0.0.5" sources."nan-2.11.1" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" (sources."nodemon-1.18.4" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" sources."supports-color-5.5.0" ]; @@ -55455,7 +55451,7 @@ in sources."path-key-2.0.1" (sources."path-loader-1.0.9" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" sources."qs-6.5.2" sources."superagent-3.8.3" @@ -55506,7 +55502,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."sanitize-filename-1.6.1" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-diff-2.1.0" (sources."send-0.16.2" // { dependencies = [ @@ -55863,7 +55859,7 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.9" sources."sprintf-0.1.5" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."stack-trace-0.0.10" sources."temp-0.8.3" sources."tough-cookie-2.3.4" @@ -56077,10 +56073,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.1.1.tgz"; - sha512 = "Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.1.3.tgz"; + sha512 = "+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA=="; }; buildInputs = globalBuildInputs; meta = { @@ -56221,7 +56217,7 @@ in sources."p-finally-1.0.0" (sources."package-json-4.0.1" // { dependencies = [ - sources."semver-5.5.1" + sources."semver-5.6.0" ]; }) sources."parse-json-2.2.0" @@ -56332,10 +56328,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.32"; + version = "1.4.34"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.32.tgz"; - sha512 = "qPsvjAYgdeO2Zrx5KvW8oxI8Vof3iK+x/0SfHxKbs+CJjbY5nzpaGI2wCoyiS8nWykcxAmy3RjZKpzOpzBnW0A=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.34.tgz"; + sha512 = "7sgDDNaWakL7tzp5NwENWHV0SekB6LzcW99nVv0CLthggQnw7wWDnSFAz9iHbBINNj14Sh3gscO7nd73qBtlgA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -56427,7 +56423,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-3.5.0" - sources."diff2html-2.3.3" + sources."diff2html-2.4.0" sources."dnd-page-scroll-0.0.4" (sources."eachr-3.2.0" // { dependencies = [ @@ -56459,18 +56455,8 @@ in sources."etag-1.8.1" sources."eve-0.5.4" sources."execa-0.10.0" - (sources."express-4.16.3" // { + (sources."express-4.16.4" // { dependencies = [ - sources."body-parser-1.18.2" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - sources."raw-body-2.3.2" sources."statuses-1.4.0" ]; }) @@ -56527,7 +56513,7 @@ in sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" - sources."ignore-3.3.10" + sources."ignore-5.0.2" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -56589,9 +56575,9 @@ in sources."node-cache-4.2.0" sources."nopt-1.0.10" sources."normalize-package-data-2.4.0" - sources."npm-6.1.0" + sources."npm-6.4.1" sources."npm-package-arg-6.1.0" - sources."npm-registry-client-8.5.1" + sources."npm-registry-client-8.6.0" sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" sources."nprogress-0.2.0" @@ -56603,7 +56589,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."once-1.4.0" - sources."opn-5.3.0" + sources."opn-5.4.0" sources."os-homedir-1.0.2" sources."os-locale-3.0.1" sources."os-tmpdir-1.0.2" @@ -56634,7 +56620,7 @@ in sources."qs-6.5.2" sources."random-bytes-1.0.0" sources."range-parser-1.2.0" - sources."raven-js-3.26.4" + sources."raven-js-3.27.0" sources."raw-body-2.3.3" (sources."rc-1.2.8" // { dependencies = [ @@ -56653,14 +56639,13 @@ in sources."combined-stream-1.0.6" ]; }) - sources."safe-buffer-5.1.2" ]; }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."retry-0.10.1" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.1" (sources."send-0.16.2" // { @@ -56701,7 +56686,7 @@ in sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."ssri-5.3.0" sources."stack-trace-0.0.10" sources."statuses-1.5.0" @@ -56710,19 +56695,18 @@ in sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - (sources."superagent-3.8.3" // { + (sources."superagent-4.0.0-beta.5" // { dependencies = [ sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" sources."cookiejar-2.1.2" - sources."debug-3.2.5" + sources."debug-4.1.0" sources."delayed-stream-1.0.0" - sources."extend-3.0.2" sources."form-data-2.3.2" sources."formidable-1.2.1" - sources."isarray-1.0.0" + sources."mime-2.3.1" sources."ms-2.1.1" - sources."readable-stream-2.3.6" + sources."readable-stream-3.0.6" sources."string_decoder-1.1.1" ]; }) @@ -57010,11 +56994,11 @@ in sources."commander-2.8.1" ]; }) - sources."semver-5.5.1" + sources."semver-5.6.0" sources."signal-exit-3.0.2" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" sources."stat-mode-0.2.2" sources."string-width-2.1.1" sources."string_decoder-1.1.1" @@ -57042,7 +57026,7 @@ in ]; }) sources."uid-0.0.2" - sources."unbzip2-stream-1.3.0" + sources."unbzip2-stream-1.3.1" sources."unyield-0.0.1" sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" @@ -57073,10 +57057,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.0.4.tgz"; - sha512 = "HC7u3pIjzPV7/5vdZYRpY1VtBsp8xpTxzZLVF61ijQ61bt+cTpF17qOdPW0Tu1muRzD1Qc5d6K15USvtvWg5YQ=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.0.5.tgz"; + sha512 = "wNwK6oosaMY5gCmzONatVAVLf8dMmpGqxoT1Z6ne0aBRg6gOUZ+XrLN6MiF34tlETvQ/XhHUC5d+YVWoBVlllQ=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -57106,18 +57090,18 @@ in sources."@types/express-serve-static-core-4.16.0" sources."@types/long-4.0.0" sources."@types/mime-2.0.0" - sources."@types/node-10.11.4" + sources."@types/node-10.11.7" sources."@types/range-parser-1.2.2" sources."@types/serve-static-1.13.2" sources."@types/ws-5.1.2" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-3.0.4" - (sources."@vue/cli-ui-3.0.4" // { + sources."@vue/cli-shared-utils-3.0.5" + (sources."@vue/cli-ui-3.0.5" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.0.4" + sources."@vue/cli-ui-addon-webpack-3.0.5" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."ajv-5.5.2" @@ -57274,7 +57258,7 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."dashdash-1.14.1" - (sources."debug-3.2.5" // { + (sources."debug-3.2.6" // { dependencies = [ sources."ms-2.1.1" ]; @@ -57362,19 +57346,9 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."express-4.16.3" // { + (sources."express-4.16.4" // { dependencies = [ - sources."body-parser-1.18.2" sources."debug-2.6.9" - (sources."http-errors-1.6.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."setprototypeof-1.0.3" - ]; - }) - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - sources."raw-body-2.3.2" sources."statuses-1.4.0" ]; }) @@ -57564,7 +57538,7 @@ in sources."media-typer-0.3.0" sources."merge-1.2.0" sources."merge-descriptors-1.0.1" - sources."merge2-1.2.2" + sources."merge2-1.2.3" sources."methods-1.1.2" (sources."micromatch-3.1.10" // { dependencies = [ @@ -57592,7 +57566,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.11.1" - sources."nanoid-1.2.6" + sources."nanoid-1.3.0" (sources."nanomatch-1.2.13" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -57702,11 +57676,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - (sources."request-2.88.0" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."request-2.88.0" sources."request-promise-core-1.1.1" sources."request-promise-native-1.0.5" sources."resolve-1.8.1" @@ -57717,7 +57687,7 @@ in sources."rimraf-2.6.2" sources."run-async-2.3.0" sources."rxjs-6.3.3" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -57726,7 +57696,7 @@ in ]; }) sources."select-1.1.2" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-diff-2.1.0" (sources."send-0.16.2" // { dependencies = [ @@ -57788,7 +57758,7 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -57865,7 +57835,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.16" - sources."unbzip2-stream-1.3.0" + sources."unbzip2-stream-1.3.1" (sources."undefsafe-2.0.2" // { dependencies = [ sources."debug-2.6.9" @@ -57934,6 +57904,196 @@ in production = true; bypassCache = true; }; + "@webassemblyjs/cli" = nodeEnv.buildNodePackage { + name = "_at_webassemblyjs_slash_cli"; + packageName = "@webassemblyjs/cli"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.7.8.tgz"; + sha512 = "/zEE5vL2lVlZVv3XYLo6+yeEU5pqi8AByBWBVYSuPSRBu0bY9cTCRU4exS/Jd7bdbF9I3s1Moa1FRG1wCQErfA=="; + }; + dependencies = [ + sources."@webassemblyjs/ast-1.7.8" + sources."@webassemblyjs/floating-point-hex-parser-1.7.8" + sources."@webassemblyjs/helper-api-error-1.7.8" + sources."@webassemblyjs/helper-code-frame-1.7.8" + sources."@webassemblyjs/helper-flaten-ast-1.7.8" + sources."@webassemblyjs/helper-fsm-1.7.8" + sources."@webassemblyjs/helper-module-context-1.7.8" + sources."@webassemblyjs/helper-wasm-bytecode-1.7.8" + sources."@webassemblyjs/ieee754-1.7.8" + sources."@webassemblyjs/leb128-1.7.8" + sources."@webassemblyjs/utf8-1.7.8" + sources."@webassemblyjs/validation-1.7.8" + sources."@webassemblyjs/wasm-parser-1.7.8" + sources."@webassemblyjs/wast-parser-1.7.8" + sources."@webassemblyjs/wast-printer-1.7.8" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.1" + sources."webassemblyjs-1.7.8" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Toolbox for WebAssembly"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + "@webassemblyjs/repl" = nodeEnv.buildNodePackage { + name = "_at_webassemblyjs_slash_repl"; + packageName = "@webassemblyjs/repl"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.7.8.tgz"; + sha512 = "IClmDKT+XgTiJ3lNaaXbHBAt2LqabugJmsabtF8TIlulG5Y5NEOOeJGjm56/rmwuW3/ul/zvaLQ1pFpU3WEIXg=="; + }; + dependencies = [ + sources."@webassemblyjs/ast-1.7.8" + sources."@webassemblyjs/floating-point-hex-parser-1.7.8" + sources."@webassemblyjs/helper-api-error-1.7.8" + sources."@webassemblyjs/helper-code-frame-1.7.8" + sources."@webassemblyjs/helper-flaten-ast-1.7.8" + sources."@webassemblyjs/helper-fsm-1.7.8" + sources."@webassemblyjs/helper-module-context-1.7.8" + sources."@webassemblyjs/helper-wasm-bytecode-1.7.8" + sources."@webassemblyjs/ieee754-1.7.8" + sources."@webassemblyjs/leb128-1.7.8" + sources."@webassemblyjs/utf8-1.7.8" + sources."@webassemblyjs/validation-1.7.8" + sources."@webassemblyjs/wasm-parser-1.7.8" + sources."@webassemblyjs/wast-parser-1.7.8" + sources."@webassemblyjs/wast-printer-1.7.8" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.1" + sources."webassemblyjs-1.7.8" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "WebAssembly REPL"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + "@webassemblyjs/wasm-strip" = nodeEnv.buildNodePackage { + name = "_at_webassemblyjs_slash_wasm-strip"; + packageName = "@webassemblyjs/wasm-strip"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-strip/-/wasm-strip-1.7.8.tgz"; + sha512 = "ZhPzbEX3UKaLjJ7hjPVjNG3tNjiD7B8eriTR11yrctdyD5vAOVoyrUEsBPX0WadxDOzOsGZmSbFD1SHBjJT8jQ=="; + }; + dependencies = [ + sources."@webassemblyjs/ast-1.7.8" + sources."@webassemblyjs/floating-point-hex-parser-1.7.8" + sources."@webassemblyjs/helper-api-error-1.7.8" + sources."@webassemblyjs/helper-buffer-1.7.8" + sources."@webassemblyjs/helper-code-frame-1.7.8" + sources."@webassemblyjs/helper-fsm-1.7.8" + sources."@webassemblyjs/helper-module-context-1.7.8" + sources."@webassemblyjs/helper-wasm-bytecode-1.7.8" + sources."@webassemblyjs/helper-wasm-section-1.7.8" + sources."@webassemblyjs/ieee754-1.7.8" + sources."@webassemblyjs/leb128-1.7.8" + sources."@webassemblyjs/utf8-1.7.8" + sources."@webassemblyjs/wasm-gen-1.7.8" + sources."@webassemblyjs/wasm-parser-1.7.8" + sources."@webassemblyjs/wast-parser-1.7.8" + sources."@webassemblyjs/wast-printer-1.7.8" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "> Strips custom sections"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage { + name = "_at_webassemblyjs_slash_wasm-text-gen"; + packageName = "@webassemblyjs/wasm-text-gen"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.7.8.tgz"; + sha512 = "cDzQh/rniwchQfzGQriAg7Io2xqEu5s1Po29jMkRfJse4OFbh54aWcbKk2DO0ph+9lbNQZ0VYTPBP5NGIKqNmw=="; + }; + dependencies = [ + sources."@babel/code-frame-7.0.0" + sources."@babel/generator-7.1.3" + sources."@babel/highlight-7.0.0" + sources."@babel/parser-7.1.3" + sources."@babel/template-7.1.2" + sources."@babel/types-7.1.3" + sources."@webassemblyjs/ast-1.7.8" + sources."@webassemblyjs/floating-point-hex-parser-1.7.8" + sources."@webassemblyjs/helper-api-error-1.7.8" + sources."@webassemblyjs/helper-code-frame-1.7.8" + sources."@webassemblyjs/helper-fsm-1.7.8" + sources."@webassemblyjs/helper-module-context-1.7.8" + sources."@webassemblyjs/helper-wasm-bytecode-1.7.8" + sources."@webassemblyjs/ieee754-1.7.8" + sources."@webassemblyjs/leb128-1.7.8" + sources."@webassemblyjs/utf8-1.7.8" + sources."@webassemblyjs/wasm-parser-1.7.8" + sources."@webassemblyjs/wast-parser-1.7.8" + sources."@webassemblyjs/wast-printer-1.7.8" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.1" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-2.19.0" + sources."escape-string-regexp-1.0.5" + sources."esutils-2.0.2" + sources."has-flag-3.0.0" + sources."js-tokens-4.0.0" + sources."jsesc-2.5.1" + sources."lodash-4.17.11" + sources."source-map-0.5.7" + sources."supports-color-5.5.0" + sources."to-fast-properties-2.0.0" + sources."trim-right-1.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Emit documentation/code for your WASM binary Edit"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage { + name = "_at_webassemblyjs_slash_wast-refmt"; + packageName = "@webassemblyjs/wast-refmt"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.7.8.tgz"; + sha512 = "eSkc1/NnfbMYQP/DQaC2W0/DEY/TO4reAS/F/v2cnafFMBrwJ8xQCQwr9IAMiez1aKKYZmL4kyRRbU/0Q9Qbtg=="; + }; + dependencies = [ + sources."@webassemblyjs/ast-1.7.8" + sources."@webassemblyjs/floating-point-hex-parser-1.7.8" + sources."@webassemblyjs/helper-api-error-1.7.8" + sources."@webassemblyjs/helper-code-frame-1.7.8" + sources."@webassemblyjs/helper-fsm-1.7.8" + sources."@webassemblyjs/helper-module-context-1.7.8" + sources."@webassemblyjs/helper-wasm-bytecode-1.7.8" + sources."@webassemblyjs/wast-parser-1.7.8" + sources."@webassemblyjs/wast-printer-1.7.8" + sources."@xtuc/long-4.2.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "WAST refmt"; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; webdrvr = nodeEnv.buildNodePackage { name = "webdrvr"; packageName = "webdrvr"; @@ -58062,7 +58222,7 @@ in sources."safer-buffer-2.1.2" sources."semver-2.3.2" sources."sntp-1.0.9" - (sources."sshpk-1.14.2" // { + (sources."sshpk-1.15.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -58221,7 +58381,7 @@ in sources."des.js-1.0.0" sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" - sources."duplexify-3.6.0" + sources."duplexify-3.6.1" sources."elliptic-6.4.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -58349,7 +58509,7 @@ in sources."ms-2.0.0" sources."nan-2.11.1" sources."nanomatch-1.2.13" - sources."neo-async-2.5.2" + sources."neo-async-2.6.0" (sources."node-libs-browser-2.1.0" // { dependencies = [ sources."punycode-1.4.1" @@ -58451,7 +58611,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."source-list-map-2.0.0" + sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -58573,21 +58733,21 @@ in sources."bitfield-2.0.0" (sources."bittorrent-dht-9.0.0" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) sources."bittorrent-peerid-1.3.0" (sources."bittorrent-protocol-3.0.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" sources."readable-stream-2.3.6" ]; }) (sources."bittorrent-tracker-9.10.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" sources."simple-get-3.0.3" ]; @@ -58769,7 +58929,7 @@ in sources."record-cache-1.1.0" (sources."render-media-3.1.3" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -58785,7 +58945,7 @@ in sources."simple-get-2.8.1" (sources."simple-peer-9.1.2" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" sources."readable-stream-2.3.6" ]; @@ -58793,7 +58953,7 @@ in sources."simple-sha1-2.1.1" (sources."simple-websocket-7.2.0" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" sources."readable-stream-2.3.6" ]; @@ -58811,7 +58971,7 @@ in sources."to-arraybuffer-1.0.1" (sources."torrent-discovery-9.1.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -58826,7 +58986,7 @@ in sources."url-join-2.0.5" (sources."ut_metadata-3.3.0" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -58837,7 +58997,7 @@ in sources."vlc-command-1.1.2" (sources."webtorrent-0.102.4" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" sources."simple-get-3.0.3" ]; @@ -58870,7 +59030,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.11.4" + sources."@types/node-10.11.7" sources."@yarnpkg/lockfile-1.1.0" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" @@ -58935,7 +59095,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.11.5" + sources."ast-types-0.11.6" sources."async-0.2.10" sources."async-each-1.0.1" sources."asynckit-0.4.0" @@ -59142,7 +59302,7 @@ in (sources."eslint-5.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."debug-3.2.5" + sources."debug-3.2.6" sources."globals-11.8.0" sources."ms-2.1.1" sources."strip-ansi-4.0.0" @@ -59344,7 +59504,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-2.2.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -59564,7 +59724,7 @@ in }) sources."ncp-2.0.0" sources."needle-2.2.4" - sources."neo-async-2.5.2" + sources."neo-async-2.6.0" sources."netmask-1.0.6" sources."next-tick-1.0.0" sources."nice-try-1.0.5" @@ -59615,7 +59775,7 @@ in sources."p-try-2.0.0" (sources."pac-proxy-agent-2.0.2" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -59639,7 +59799,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pino-5.0.4" - sources."pino-std-serializers-2.2.1" + sources."pino-std-serializers-2.3.0" sources."pluralize-7.0.0" sources."po2json-0.4.5" sources."posix-character-classes-0.1.1" @@ -59661,7 +59821,7 @@ in sources."promise-7.3.1" (sources."proxy-agent-2.3.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -59798,12 +59958,12 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."snyk-1.102.0" // { + (sources."snyk-1.103.4" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.1" - sources."debug-3.2.5" + sources."debug-3.2.6" sources."inquirer-3.3.0" sources."ms-2.1.1" sources."rx-lite-4.0.8" @@ -59815,13 +59975,13 @@ in }) (sources."snyk-config-2.2.0" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) - (sources."snyk-docker-plugin-1.11.0" // { + (sources."snyk-docker-plugin-1.12.0" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -59829,12 +59989,12 @@ in sources."snyk-gradle-plugin-2.1.0" (sources."snyk-module-1.8.2" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) sources."snyk-mvn-plugin-2.0.0" - (sources."snyk-nodejs-lockfile-parser-1.5.1" // { + (sources."snyk-nodejs-lockfile-parser-1.5.3" // { dependencies = [ sources."lodash-4.17.10" sources."source-map-0.6.1" @@ -59843,41 +60003,41 @@ in }) (sources."snyk-nuget-plugin-1.6.5" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) (sources."snyk-php-plugin-1.5.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) (sources."snyk-policy-1.12.0" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) sources."snyk-python-plugin-1.8.2" (sources."snyk-resolve-1.0.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) - (sources."snyk-resolve-deps-4.0.1" // { + (sources."snyk-resolve-deps-4.0.2" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" - sources."semver-5.5.1" + sources."semver-5.6.0" ]; }) sources."snyk-sbt-plugin-2.0.0" sources."snyk-tree-1.0.0" (sources."snyk-try-require-1.3.1" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) @@ -59900,7 +60060,7 @@ in sources."split-0.3.3" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -60472,7 +60632,7 @@ in sources."read-pkg-up-1.0.1" ]; }) - sources."merge2-1.2.2" + sources."merge2-1.2.3" sources."micromatch-3.1.10" sources."mime-db-1.36.0" sources."mime-types-2.1.20" @@ -60622,7 +60782,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."scoped-regex-1.0.0" - sources."semver-5.5.1" + sources."semver-5.6.0" sources."semver-diff-2.1.0" sources."semver-regex-1.0.0" sources."semver-truncate-1.1.2" @@ -60675,7 +60835,7 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.1" sources."split-string-3.1.0" - sources."sshpk-1.14.2" + sources."sshpk-1.15.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -60823,7 +60983,7 @@ in sources."yeoman-doctor-3.0.2" (sources."yeoman-environment-2.3.3" // { dependencies = [ - sources."debug-3.2.5" + sources."debug-3.2.6" sources."ms-2.1.1" ]; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaa8da74333d..9e043632a8c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5923,6 +5923,12 @@ with pkgs; wbox = callPackage ../tools/networking/wbox {}; + webassemblyjs-cli = nodePackages."@webassemblyjs/cli"; + webassemblyjs-repl = nodePackages."@webassemblyjs/repl"; + wasm-strip = nodePackages."@webassemblyjs/wasm-strip"; + wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen"; + wast-refmt = nodePackages."@webassemblyjs/wast-refmt"; + welkin = callPackage ../tools/graphics/welkin {}; whipper = callPackage ../applications/audio/whipper { }; From 0a5c7cf512fcefb4b337186f0aee69ae8dd1df2c Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Tue, 9 Oct 2018 23:56:26 +0200 Subject: [PATCH 780/992] gitea: 1.5.1 -> 1.5.2 --- .../version-management/gitea/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index c6eb563155f6..58cfa1862604 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,21 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "06h6v9py35mm0xk9l8xrq02vvr5vzl15gfbw9qqvpn8kiamkn53r"; + sha256 = "168pbndlh7c148p8wzkd39kd7idiba9zw7v0alp9zqcqzzayaydj"; + # Required to generate the same checksum on MacOS due to unicode encoding differences + # More information: https://github.com/NixOS/nixpkgs/pull/48128 + extraPostFetch = '' + rm -rf $out/integrations + rm -rf $out/vendor/github.com/Unknown/cae/tz/testdata + rm -rf $out/vendor/github.com/Unknown/cae/zip/testdata + rm -rf $out/vendor/gopkg.in/macaron.v1/fixtures + ''; }; patches = [ ./static-root-path.patch ]; From dd1b66e5d4c864fb6cfc71cfb129ad98d122f122 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 14 Oct 2018 22:36:17 +0200 Subject: [PATCH 781/992] lkl: 2018-03-10 -> 2018-08-22 Among other things, this brings lkl up to linux 4.16 --- pkgs/applications/virtualization/lkl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 8d5ecfce9fd2..1d22385a2732 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: +{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive }: stdenv.mkDerivation rec { - name = "lkl-2018-03-10"; - rev = "8772a4da6064444c5b70766b806fe272b0287c31"; + name = "lkl-2018-08-22"; + rev = "5221c547af3d29582703f01049617a6bf9f6232a"; outputs = [ "dev" "lib" "out" ]; - nativeBuildInputs = [ bc python ]; + nativeBuildInputs = [ bc bison flex python ]; buildInputs = [ fuse libarchive ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "1m6gh4zcx1q7rv05d0knjpk3ivk2b3kc0kwjndciadqc45kws4wh"; + sha256 = "1k2plyx40xaphm8zsk2dd1lyv6dhsp7kj6hfmdgiamvl80bjajqy"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds From adf9c5080fef37be24b4a64a4289e455f70dc31a Mon Sep 17 00:00:00 2001 From: Renaud Date: Mon, 15 Oct 2018 19:34:24 +0200 Subject: [PATCH 782/992] postgresql-jdbc: 42.2.2 -> 42.2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ¤ set read-only permissions on .jar at install (mode 0444) ¤ license is now BSD 2-clause --- pkgs/servers/sql/postgresql/jdbc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index 62ebf6b44533..c67d72705482 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -2,25 +2,25 @@ stdenv.mkDerivation rec { name = "postgresql-jdbc-${version}"; - version = "42.2.2"; + version = "42.2.5"; src = fetchMavenArtifact { artifactId = "postgresql"; groupId = "org.postgresql"; - sha256 = "0w7sfi1gmzqhyhr4iq9znv8hff41xwwqcblkyd9ph0m34r0555hr"; + sha256 = "1p0cbb7ka41xxipzjy81hmcndkqynav22xyipkg7qdqrqvw4dykz"; inherit version; }; phases = [ "installPhase" ]; installPhase = '' - install -D $src/share/java/*_postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar + install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar ''; meta = with stdenv.lib; { homepage = https://jdbc.postgresql.org/; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; - license = licenses.bsd3; + license = licenses.bsd2; platforms = platforms.unix; }; } From 01dfe3f56019b0c330bc2e46da90146698844330 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 14 Oct 2018 00:26:09 -0500 Subject: [PATCH 783/992] stage.nix: fix cross compiling with pkgsMusl Fixes #48265 --- pkgs/top-level/stage.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 7637371a40f1..d0fb885dc747 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -134,13 +134,16 @@ let # default GNU libc on Linux systems. Non-Linux systems are not # supported. pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { - localSystem = { + inherit overlays config; + ${if stdenv.hostPlatform == stdenv.buildPlatform + then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { abi = { "gnu" = lib.systems.parse.abis.musl; "gnueabi" = lib.systems.parse.abis.musleabi; "gnueabihf" = lib.systems.parse.abis.musleabihf; - }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; + }.${stdenv.hostPlatform.parsed.abi.name} + or lib.systems.parse.abis.musl; }; }; } else throw "Musl libc only supports Linux systems."; @@ -148,7 +151,9 @@ let # All packages built for i686 Linux. # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun { - localSystem = { + inherit overlays config; + ${if stdenv.hostPlatform == stdenv.buildPlatform + then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { cpu = lib.systems.parse.cpuTypes.i686; }; From ed6e251ff0350e70ed7a60f699dad7bf7ea4a252 Mon Sep 17 00:00:00 2001 From: Renaud Date: Mon, 15 Oct 2018 20:45:50 +0200 Subject: [PATCH 784/992] sqlite-jdbc: 3.20.0 -> 3.25.2 --- pkgs/servers/sql/sqlite/jdbc/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix index 5b0425c410fc..4e40d8761526 100644 --- a/pkgs/servers/sql/sqlite/jdbc/default.nix +++ b/pkgs/servers/sql/sqlite/jdbc/default.nix @@ -1,25 +1,28 @@ -{ lib, stdenv, fetchurl }: +{ stdenv, fetchMavenArtifact }: stdenv.mkDerivation rec { - version = "3.20.0"; pname = "sqlite-jdbc"; name = "${pname}-${version}"; + version = "3.25.2"; - src = fetchurl { - url = "https://bitbucket.org/xerial/${pname}/downloads/${name}.jar"; - sha256 = "0wxfxnq2ghiwy2mwz3rljgmy1lciafhrw80lprvqz6iw8l51qfql"; + src = fetchMavenArtifact { + groupId = "org.xerial"; + artifactId = "sqlite-jdbc"; + inherit version; + sha256 = "1xk5fi2wzq3jspvbdm5hvs78501i14jy3v7x6fjnh5fnpqdacpd4"; }; phases = [ "installPhase" ]; installPhase = '' - install -D "${src}" "$out/share/java/${name}.jar" + install -m444 -D ${src}/share/java/*${name}.jar "$out/share/java/${name}.jar" ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/xerial/sqlite-jdbc"; - description = "SQLite JDBC Driver"; + description = "Library for accessing and creating SQLite database files in Java"; license = licenses.asl20; + platforms = platforms.linux; maintainers = with maintainers; [ jraygauthier ]; }; } From 6fe0f07557e481a4861ee938897d25e219dced1c Mon Sep 17 00:00:00 2001 From: Joakim Pettersvold Date: Sun, 14 Oct 2018 14:02:23 +0200 Subject: [PATCH 785/992] eclipses: add Eclipse IDE for Java Developers 4.9 --- pkgs/applications/editors/eclipse/default.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 4d77c47695a3..55bbc778e3ae 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -228,6 +228,27 @@ rec { }; eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30 + ### Eclipse Java + + eclipse-java = eclipse-java-49; + + eclipse-java-49 = buildEclipse { + name = "eclipse-java-4.9.0"; + description = "Eclipse IDE for Java Developers"; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk-x86_64.tar.gz; + sha512 = "9dac5d040cdabf779de3996de87290e352130c7e860c1d0a98772f41da828ad45f90748b68e0a8a4f8d1ebbbbe5fdfe6401b7d871b93af34103d4a81a041c6a5"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk.tar.gz; + sha512 = "24208e95b972e848d6b65ed8108d9e81584cf051397f2f43fb6269f5a625b8d7552ad77c7980a1a5653c87f06776e2926fd85607aae44e44657b4f6cc9b3e2e3"; + } + else throw "Unsupported system: ${stdenv.system}"; + }; + ### Environments # Function that assembles a complete Eclipse environment from an From 4c6d8da299f0a18a9efb54b8dc1fc07a6bb58df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 15 Oct 2018 16:07:23 -0300 Subject: [PATCH 786/992] deepin-metacity: init at 3.22.22 --- .../deepin/deepin-metacity/default.nix | 62 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-metacity/default.nix diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix new file mode 100644 index 000000000000..b5eb71108763 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf, + json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, + deepin-wallpapers, deepin-desktop-schemas }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-metacity"; + version = "3.22.22"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0gr10dv8vphla6z7zqiyyg3n3ag4rrlz43c4kr7fd5xwx2bfvp3d"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + libtool + gnome3.gnome-common + gnome3.glib.dev + ]; + + buildInputs = [ + gnome3.dconf + gnome3.gtk + gnome3.libgtop + gnome3.zenity + bamf + json-glib + libcanberra-gtk3 + libstartup_notification + libxkbcommon + deepin-wallpapers + deepin-desktop-schemas + ]; + + postPatch = '' + sed -i src/ui/deepin-background-cache.c \ + -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;' + ''; + + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + + configureFlags = [ "--disable-themes-documentation" ]; + + preConfigure = '' + HOME=$TMP + NOCONFIGURE=1 ./autogen.sh + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "2D window manager for Deepin"; + homepage = https://github.com/linuxdeepin/deepin-metacity; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 84f41dc3451b..a602d18e2095 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -13,6 +13,7 @@ let deepin-icon-theme = callPackage ./deepin-icon-theme { }; deepin-image-viewer = callPackage ./deepin-image-viewer { }; deepin-menu = callPackage ./deepin-menu { }; + deepin-metacity = callPackage ./deepin-metacity { }; deepin-mutter = callPackage ./deepin-mutter { }; deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-sound-theme = callPackage ./deepin-sound-theme { }; From 47dfe25e1b17cd405b81052ffcdab6ca92b467fa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2018 21:43:16 +0200 Subject: [PATCH 787/992] ec2-amis.nix: Add 18.09 images --- nixos/modules/virtualisation/ec2-amis.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 76facac39fc6..aaea06bb9a63 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -257,5 +257,22 @@ let self = { "18.03".sa-east-1.hvm-ebs = "ami-163e1f7a"; "18.03".ap-south-1.hvm-ebs = "ami-6a390b05"; - latest = self."18.03"; + # 18.09.910.c15e342304a + "18.09".eu-west-1.hvm-ebs = "ami-0f412186fb8a0ec97"; + "18.09".eu-west-2.hvm-ebs = "ami-0dada3805ce43c55e"; + "18.09".eu-west-3.hvm-ebs = "ami-074df85565f2e02e2"; + "18.09".eu-central-1.hvm-ebs = "ami-07c9b884e679df4f8"; + "18.09".us-east-1.hvm-ebs = "ami-009c9c3f1af480ff3"; + "18.09".us-east-2.hvm-ebs = "ami-08199961085ea8bc6"; + "18.09".us-west-1.hvm-ebs = "ami-07aa7f56d612ddd38"; + "18.09".us-west-2.hvm-ebs = "ami-01c84b7c368ac24d1"; + "18.09".ca-central-1.hvm-ebs = "ami-04f66113f76198f6c"; + "18.09".ap-southeast-1.hvm-ebs = "ami-0892c7e24ebf2194f"; + "18.09".ap-southeast-2.hvm-ebs = "ami-010730f36424b0a2c"; + "18.09".ap-northeast-1.hvm-ebs = "ami-0cdba8e998f076547"; + "18.09".ap-northeast-2.hvm-ebs = "ami-0400a698e6a9f4a15"; + "18.09".sa-east-1.hvm-ebs = "ami-0e4a8a47fd6db6112"; + "18.09".ap-south-1.hvm-ebs = "ami-0880a678d3f555313"; + + latest = self."18.09"; }; in self From 0bdd0d8e04006b97fd8fd330049274c9fb4a6c22 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2018 21:47:51 +0200 Subject: [PATCH 788/992] amazon-image.nix: Disable udisks This reduces the system closure by 89 MiB. --- nixos/modules/virtualisation/amazon-image.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index e9e935e90202..c92570582f20 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -145,8 +145,12 @@ let cfg = config.ec2; in environment.systemPackages = [ pkgs.cryptsetup ]; boot.initrd.supportedFilesystems = [ "unionfs-fuse" ]; - + # EC2 has its own NTP server provided by the hypervisor networking.timeServers = [ "169.254.169.123" ]; + + # udisks has become too bloated to have in a headless system + # (e.g. it depends on GTK+). + services.udisks2.enable = false; }; } From c8a59e845369f24eb9518d6c5d1d4df105647aa7 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Mon, 15 Oct 2018 16:31:59 -0400 Subject: [PATCH 789/992] haskellPackages.cryptonite: re-enable tests. This has been fixed since cryptonite-0.7: https://github.com/haskell-crypto/cryptonite/issues/28 cryptonite is also no longer listed in expected-test-failures in Stackage. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6f654c32dbb2..29f776bb4af8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -676,9 +676,6 @@ self: super: { # https://github.com/goldfirere/singletons/issues/122 singletons = dontCheck super.singletons; - # https://github.com/fpco/stackage/issues/838 - cryptonite = dontCheck super.cryptonite; - # We cannot build this package w/o the C library from . phash = markBroken super.phash; From 321626d5ee6410e6a431e8e487cc1a5d7f4fa894 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Mon, 15 Oct 2018 17:11:32 -0400 Subject: [PATCH 790/992] haskellPackages.cryptonite: fix for aarch64. This is a cherry-pick from upstream (see https://github.com/haskell-crypto/cryptonite/issues/234); there has been no upstream release since the fix was committed. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 29f776bb4af8..125413d61511 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -676,6 +676,14 @@ self: super: { # https://github.com/goldfirere/singletons/issues/122 singletons = dontCheck super.singletons; + # Fix an aarch64 issue with cryptonite-0.25: + # https://github.com/haskell-crypto/cryptonite/issues/234 + # This has been committed upstream, but there is, as of yet, no new release. + cryptonite = appendPatch super.cryptonite (pkgs.fetchpatch { + url = https://github.com/haskell-crypto/cryptonite/commit/4622e5fc8ece82f4cf31358e31cd02cf020e558e.patch; + sha256 = "1m2d47ni4jbrpvxry50imj91qahr3r7zkqm157clrzlmw6gzpgnq"; + }); + # We cannot build this package w/o the C library from . phash = markBroken super.phash; From f4ea22e5de572efa9babc7674fdc79fa637a7e31 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 15 Oct 2018 00:39:26 +0200 Subject: [PATCH 791/992] nixos/security/misc: init A module for security options that are too small to warrant their own module. The impetus for adding this module is to make it more convenient to override the behavior of the hardened profile wrt user namespaces. Without a dedicated option for user namespaces, the user needs to 1) know which sysctl knob controls userns 2) know how large a value the sysctl knob needs to allow e.g., Nix sandbox builds to work In the future, other mitigations currently enabled by the hardened profile may be promoted to options in this module. --- nixos/modules/module-list.nix | 1 + nixos/modules/profiles/hardened.nix | 14 ++--------- nixos/modules/security/misc.nix | 39 +++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 nixos/modules/security/misc.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f55c32fa511d..2bb41767b0b2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -149,6 +149,7 @@ ./security/duosec.nix ./security/hidepid.nix ./security/lock-kernel-modules.nix + ./security/misc.nix ./security/oath.nix ./security/pam.nix ./security/pam_usb.nix diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 2af8bf1f8e30..da47313f180a 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -12,6 +12,8 @@ with lib; security.lockKernelModules = mkDefault true; + security.allowUserNamespaces = mkDefault false; + security.apparmor.enable = mkDefault true; boot.kernelParams = [ @@ -55,18 +57,6 @@ with lib; # ... or at least apply some hardening to it boot.kernel.sysctl."net.core.bpf_jit_harden" = mkDefault true; - # A recurring problem with user namespaces is that there are - # still code paths where the kernel's permission checking logic - # fails to account for namespacing, instead permitting a - # namespaced process to act outside the namespace with the - # same privileges as it would have inside it. This is particularly - # bad in the common case of running as root within the namespace. - # - # Setting the number of allowed user namespaces to 0 effectively disables - # the feature at runtime. Attempting to create a user namespace - # with unshare will then fail with "no space left on device". - boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0; - # Raise ASLR entropy for 64bit & 32bit, respectively. # # Note: mmap_rnd_compat_bits may not exist on 64bit. diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix new file mode 100644 index 000000000000..42f872b7b088 --- /dev/null +++ b/nixos/modules/security/misc.nix @@ -0,0 +1,39 @@ +{ config, lib, ... }: + +with lib; + +{ + meta = { + maintainers = [ maintainers.joachifm ]; + }; + + options = { + security.allowUserNamespaces = mkOption { + type = types.bool; + default = true; + description = '' + Whether to allow creation of user namespaces. A recurring problem + with user namespaces is the presence of code paths where the kernel's + permission checking logic fails to account for namespacing, instead + permitting a namespaced process to act outside the namespace with the + same privileges as it would have inside it. This is particularly + damaging in the common case of running as root within the namespace. + When user namespace creation is disallowed, attempting to create + a user namespace fails with "no space left on device" (ENOSPC). + ''; + }; + }; + + config = mkIf (!config.security.allowUserNamespaces) { + # Setting the number of allowed user namespaces to 0 effectively disables + # the feature at runtime. Note that root may raise the limit again + # at any time. + boot.kernel.sysctl."user.max_user_namespaces" = 0; + + assertions = [ + { assertion = config.nix.useSandbox -> config.security.allowUserNamespaces; + message = "`nix.useSandbox = true` conflicts with `!security.allowUserNamespaces`."; + } + ]; + }; +} From 387632ab333d71c360aff219999705b7edcc9257 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 16 Oct 2018 00:46:42 +0200 Subject: [PATCH 792/992] xstatic-*: update to latest version --- pkgs/development/python-modules/xstatic-bootbox/default.nix | 4 ++-- pkgs/development/python-modules/xstatic-bootstrap/default.nix | 4 ++-- .../python-modules/xstatic-jquery-file-upload/default.nix | 4 ++-- pkgs/development/python-modules/xstatic-jquery-ui/default.nix | 4 ++-- pkgs/development/python-modules/xstatic-jquery/default.nix | 4 ++-- pkgs/development/python-modules/xstatic-pygments/default.nix | 4 ++-- pkgs/development/python-modules/xstatic/default.nix | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix index 68c81157eb08..1f60a0fbe6cf 100644 --- a/pkgs/development/python-modules/xstatic-bootbox/default.nix +++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Bootbox"; - version = "4.3.0.1"; + version = "4.4.0.1"; src = fetchPypi { inherit version pname; - sha256 = "0wks1lsqngn3gvlhzrvaan1zj8w4wr58xi0pfqhrzckbghvvr0gj"; + sha256 = "1g00q38g1k576lxjlwglv4w3fj4z0z8lxlwpc66wyhjglj4r4bwd"; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index 757c2cc240ed..f648df6c570e 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Bootstrap"; - version = "3.3.5.1"; + version = "3.3.7.1"; src = fetchPypi { inherit version pname; - sha256 = "0jzjq3d4vp2shd2n20f9y53jnnk1cvphkj1v0awgrf18qsy2bmin"; + sha256 = "0cgihyjb9rg6r2ddpzbjm31y0901vyc8m9h3v0zrhxydx1w9x50c"; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix index 0cf029c68a59..3b9c7affe161 100644 --- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "XStatic-jQuery-File-Upload"; - version = "9.7.0.1"; + version = "9.22.0.1"; src = fetchPypi { inherit version pname; - sha256 = "0d5za18lhzhb54baxq8z73wazq801n3qfj5vgcz7ri3ngx7nb0cg"; + sha256 = "0jy7xnww0177fv0asssxvv8l1032jcnbkvz39z16yd6k34v53fzf"; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix index 1b884a97eb22..d411119bbfa2 100644 --- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "XStatic-jquery-ui"; - version = "1.12.0.1"; + version = "1.12.1.1"; src = fetchPypi { inherit version pname; - sha256 = "0w7mabv6qflpd47g33j3ggp5rv17mqk0xz3bsdswcj97wqpga2l2"; + sha256 = "0449rkjcksq49yjyyszz9v11wa4nmvvfw0mynayah8248yxlifnn"; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix index d884f12bdbf1..8e3f084ca7f0 100644 --- a/pkgs/development/python-modules/xstatic-jquery/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-jQuery"; - version = "1.10.2.1"; + version = "3.3.1.1"; src = fetchPypi { inherit version pname; - sha256 = "018kx4zijflcq8081xx6kmiqf748bsjdq7adij2k91bfp1mnlhc3"; + sha256 = "0xlgs4rlabzfcp8p2zspwpsljycb0djyrk7qy4qh76i7zkfhwn8j"; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix index 8ec9b77860c2..956d331e7b89 100644 --- a/pkgs/development/python-modules/xstatic-pygments/default.nix +++ b/pkgs/development/python-modules/xstatic-pygments/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic-Pygments"; - version = "1.6.0.1"; + version = "2.2.0.1"; src = fetchPypi { inherit version pname; - sha256 = "0fjqgg433wfdnswn7fad1g6k2x6mf24wfnay2j82j0fwgkdxrr7m"; + sha256 = "1rm073ag1hgwlazl52mng62wvnayz7ckr5ki341shvp9db1x2n51"; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix index 02931215b8d3..4410525a3d4d 100644 --- a/pkgs/development/python-modules/xstatic/default.nix +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "XStatic"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit version pname; - sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f"; + sha256 = "1a13i9b62qfmqz04gpa6kcwwy2x8fm9wcr1x6kjdxrmw6zz8vdw0"; }; # no tests implemented From c539c020beef063ba8a91ac81a35c5a32832b012 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 16 Oct 2018 00:46:55 +0200 Subject: [PATCH 793/992] bepasty: 0.4.0 -> 0.5.0 --- pkgs/tools/misc/bepasty/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index ae88b7e99c65..a1e9f21c52cc 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -1,15 +1,15 @@ -{ python +{ python3Packages , lib }: -with python.pkgs; +with python3Packages; #We need to use buildPythonPackage here to get the PYTHONPATH build correctly. #This is needed for services.bepasty #https://github.com/NixOS/nixpkgs/pull/38300 buildPythonPackage rec { pname = "bepasty"; - version = "0.4.0"; + version = "0.5.0"; propagatedBuildInputs = [ flask @@ -22,9 +22,12 @@ buildPythonPackage rec { xstatic-jquery-ui xstatic-pygments ]; + + buildInputs = [ setuptools_scm ]; + src = fetchPypi { inherit pname version; - sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4"; + sha256 = "1y3smw9620w2ia4zfsl2svb9j7mkfgc8z1bzjffyk1w5vryhwikh"; }; checkInputs = [ From 46f937dddd519e7e48fcaa32393956e104a0c305 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Mon, 15 Oct 2018 20:07:27 -0400 Subject: [PATCH 794/992] haskellPackages.language-nix: disable tests on aarch64. The test suite fails on aarch64 with a linker error that looks suspiciously like this outstanding GHC issue: https://ghc.haskell.org/trac/ghc/ticket/15275 Note that this change also fixes the existing `isi686` check to conform to the new cross-compiling arch check. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 125413d61511..e59e4a67269d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -332,7 +332,7 @@ self: super: { itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; language-slice = dontCheck super.language-slice; - language-nix = if pkgs.stdenv.isi686 then dontCheck super.language-nix else super.language-nix; + language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275 ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 From 8a3a91f29b4a517c540bee42f01701762243f808 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 15 Oct 2018 20:35:28 -0400 Subject: [PATCH 795/992] linux: 4.19-rc7 -> 4.19-rc8 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3d28bd68121d..f866d858eaeb 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.19-rc7"; - modDirVersion = "4.19.0-rc7"; + version = "4.19-rc8"; + modDirVersion = "4.19.0-rc8"; extraMeta.branch = "4.19"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0wjh62vfhvi2prz9sx9c0s0f9sa9z1775qn4jf8zz5y5isixzdml"; + sha256 = "1xw8grzn4i4b2vprfwi4p4003n7rr9725dbiqyrl8w1pm11jwpin"; }; # Should the testing kernels ever be built on Hydra? From 95c698d119bee110a49c968d2a1d8c5df76717ad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 20:39:48 -0700 Subject: [PATCH 796/992] ipv6calc: 1.0.0 -> 1.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ipv6calc/versions --- pkgs/tools/networking/ipv6calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index c66218c48986..9b4edd763057 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "ipv6calc-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; - sha256 = "1gcl8mqjdn5j1rcnv2gz2j0i8ayx747hwzjyiazl6j43c5g4bc3l"; + sha256 = "1q74ikg780v5hllbq08wdfvxr2lf0fc7i41hclqrh1ajc6dqybbq"; }; buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ]; From 828b042b43c1190c2f0967c1102a75b7c3bc1989 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 20:44:48 -0700 Subject: [PATCH 797/992] homebank: 5.2.1 -> 5.2.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/homebank/versions --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 039e2fc1fde9..12b5aef898d1 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.2.1"; + name = "homebank-5.2.2"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "0i3pb4v4fs98xd6d4x2gjvhqrsrjvssaws3nkpjia4fagd4dvqbz"; + sha256 = "19cm49p2x6nwia2yvwj3fv7jxbhw0vx4bs1zqbfvdr5vzwgj5j5c"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; From 43d79c4b9e00b19c35337dcaa6464a7e3c66315c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 20:47:19 -0700 Subject: [PATCH 798/992] jetty: 9.4.8.v20171121 -> 9.4.12.v20180830 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jetty/versions --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 473f2986ff06..29d1bf7a4563 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jetty-${version}"; - version = "9.4.8.v20171121"; + version = "9.4.12.v20180830"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "0bvwi70vdk468yqgvgq99lwrpy2y5znrl0b1cr8j6ygmsgnvvmjh"; + sha256 = "1z498cxvp1llp4ii8g52rhicypay1v2b6mmdmxrj3d82az6biiq3"; }; phases = [ "unpackPhase" "installPhase" ]; From d953d8d424ba11a50ebe0dc32a59530c750c7023 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 20:56:02 -0700 Subject: [PATCH 799/992] imapfilter: 2.6.11 -> 2.6.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/imapfilter/versions --- pkgs/applications/networking/mailreaders/imapfilter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 4d0c09c2dcc2..e5a919af2e6f 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "imapfilter-${version}"; - version = "2.6.11"; + version = "2.6.12"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "0cjnp7vqmgqym2zswabkmwlbj21r063vw7wkwxglj08z5qyjl5ps"; + sha256 = "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab"; }; makeFlagsArray = "PREFIX=$(out)"; From fedc17a99de87dfd0b0bdae6b67f96124deb3e85 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 21:05:03 -0700 Subject: [PATCH 800/992] jmol: 14.29.22 -> 14.29.26 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jmol/versions --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index b89b28ed0479..dab30e90f4d8 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.22"; + version = "14.29.26"; pname = "jmol"; name = "${pname}-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "1wnrrn2wza9z6bp5axg191qf32sx4q8fj4xz404zp278rc4i2fpv"; + sha256 = "0a728lwqbbnm5v2spi5rbqy3xldbcf2gcsf48rkq3p43laps3630"; }; patchPhase = '' From a721411239605496b8fe8e53a6b5bbd1b618b3f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 21:21:29 -0700 Subject: [PATCH 801/992] gtkwave: 3.3.94 -> 3.3.95 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gtkwave/versions --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index e4f0cb8d0b1a..3f664006cd0f 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.94"; + version = "3.3.95"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1v14sdd4lykly6szal6ky79b0s5pv6f1xifk5mkqkg5bkpjq71fg"; + sha256 = "1999wnipah1ncvjzjf95pfdrvgq1kd6hli8xlaj2hfjka8pamfaf"; }; nativeBuildInputs = [ pkgconfig ]; From b6cfaf1d9f369a0e0cad6cb2aeda29d3b6a52b93 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 21:35:20 -0700 Subject: [PATCH 802/992] gzdoom: 3.5.1 -> 3.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gzdoom/versions --- pkgs/games/gzdoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 0f95fa9aaf7f..5563e7836cca 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "109qmjkafr1xghpn0k1a8a0zgladc8r6hyw99v8r51ryjf5qf9sd"; + sha256 = "03yklhdppncaswy6l3fcvy8l8v1icfnm9f0jlszvibcm5ba7z0j1"; }; nativeBuildInputs = [ cmake makeWrapper ]; From eeb2ee296c00358516082fd4cdf1a2625a6c54d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 21:54:45 -0700 Subject: [PATCH 803/992] gmsh: 4.0.1 -> 4.0.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gmsh/versions --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 7973fa8b3efb..525fc5f1dc26 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.0.1"; in +let version = "4.0.2"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0s9pay32kci03qx3dlpf9h2n3hihf8zpidjnn8p9vmhnn0vav7rz"; + sha256 = "03aw3sbz4x998rk29az7mgm0mrdb6614aqnppg81p5jkh5097jgk"; }; # The original CMakeLists tries to use some version of the Lapack lib From f3a8e772a567ccb76372f390ccd455bfd088695a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:04:05 -0700 Subject: [PATCH 804/992] git-review: 1.26.0 -> 1.27.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/git-review/versions --- pkgs/applications/version-management/git-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 7b81c28c3755..101770da8885 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { name = "git-review-${version}"; - version = "1.26.0"; + version = "1.27.0"; # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { src = fetchurl rec { url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz"; - sha256 = "106nk6p7byf5vi68b2fvmwma5nk7qrv39nfj9p1bfxmb1gjdixhc"; + sha256 = "0smdkps9avnj58izyfc5m0amq8nafgs9iqlyaf7ncrlvypia1f3q"; }; propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ]; From 93744da8824ddbd1c04b4e20e10388b5025ca4b2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:15:54 -0700 Subject: [PATCH 805/992] gpxsee: 5.18 -> 6.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gpxsee/versions --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 2f61ba683f3f..d2427d95c19d 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gpxsee-${version}"; - version = "5.18"; + version = "6.2"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0dl10fr881b8fwf2yj14bd6gagb8hm0s46q18y2y56rw98nk4vrq"; + sha256 = "13hd6n5mzkk4nx9v9dwg8vvixr73zjba72h6vmxvz9fmywc4rs5p"; }; nativeBuildInputs = [ qmake ]; From f78fa3f28846d2a9919684236f0f2c50b4ff75c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:22:12 -0700 Subject: [PATCH 806/992] flatpak-builder: 1.0.0 -> 1.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/flatpak-builder/versions --- pkgs/development/tools/flatpak-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index d2052bc0e8e2..530e80f4fae6 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -37,7 +37,7 @@ }: let - version = "1.0.0"; + version = "1.0.1"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0ysnz0dwc8wfd31afwssg9prvaqdga7z4mybnrzy8sgm0hi5p2l5"; + sha256 = "01p3j8ndk9bimnqibw3dyny0ysv6nw2f7z5im19s9jlhlzdqb48w"; }; nativeBuildInputs = [ From 3da7fc8a5749077c3932484829f5901120013746 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:22:56 -0700 Subject: [PATCH 807/992] fatsort: 1.4.2.439 -> 1.5.0.456 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fatsort/versions --- pkgs/tools/filesystems/fatsort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 75a94400627d..18d9097dacbc 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, help2man}: stdenv.mkDerivation rec { - version = "1.4.2.439"; + version = "1.5.0.456"; name = "fatsort-${version}"; src = fetchurl { url = "mirror://sourceforge/fatsort/${name}.tar.xz"; - sha256 = "1q51qq69854kr12knhyqjv7skj95qld6j04pv5v3xvxs0y9zkg5x"; + sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8"; }; patches = [ ./fatsort-Makefiles.patch ]; From 15f3717b5ebbddda6516f08e41ec25471931d90a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:31:17 -0700 Subject: [PATCH 808/992] fio: 3.10 -> 3.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fio/versions --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 41016dc49fa5..c0210127d9f2 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fio-${version}"; - version = "3.10"; + version = "3.11"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "0cg6knaja32g46j1vlf0qw4q8yng7hrnnvh6b768pbjdxpn3wvi0"; + sha256 = "0k5hja50qmz6qwm8h7z00zdgxhf1vg1g168jinqzn1521fihvlvz"; }; buildInputs = [ python zlib ] From 4b43a79a5a266d944ea2f4d89ba202fb9282fbcc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:36:28 -0700 Subject: [PATCH 809/992] frostwire-bin: 6.7.2 -> 6.7.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/frostwire/versions --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 25deef0aef94..5305ca10383a 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.7.2"; + version = "6.7.4"; name = "frostwire-${version}"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; - sha256 = "1dxk2cmwbn4ahkmr8qpiq1dpkkyswg5wz1cnv36izafpr87lxfvj"; + sha256 = "03vxg0qas4mz5ggrmi396nkz44x1kgq8bfbhbr9mnal9ay9qmi8m"; }; nativeBuildInputs = [ makeWrapper ]; From e2dfafed6b9b18b736be89a9a0db0597ae82e75d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 23:22:38 -0700 Subject: [PATCH 810/992] checkstyle: 8.12 -> 8.13 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/checkstyle/versions --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 690db9a30e1a..d99ab3df75ef 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.12"; + version = "8.13"; name = "checkstyle-${version}"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "000048flqhkwnjn37bh07wgn6q4m12s3h3p9piqgvxswrjc95x3y"; + sha256 = "05w60yg5ghjdg36k4xd8m0yyfia9viyz51j053030b74bq65yvai"; }; nativeBuildInputs = [ makeWrapper jre ]; From f890eb9e3b131800c79a57b340ea498a9a2aa5ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 23:28:46 -0700 Subject: [PATCH 811/992] cherrytree: 0.38.5 -> 0.38.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cherrytree/versions --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 6bd1cef7c1b2..cf93096c7873 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "cherrytree-${version}"; - version = "0.38.5"; + version = "0.38.6"; src = fetchurl { url = "https://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "1ja3b14vm3yd26pf82p2qlld0flqkqvgdg2g33r5dav6wfq3pz6y"; + sha256 = "0b83ygv0y4lrclsyagmllkwiia62xkwij14i6z53avba191jvhma"; }; buildInputs = with pythonPackages; From 2f6097b783f26cb53890ace955b80948aebdf6f5 Mon Sep 17 00:00:00 2001 From: Jeroen de Haas Date: Wed, 10 Oct 2018 15:44:48 +0200 Subject: [PATCH 812/992] fmt: init at 5.2.1 This commit adds fmt, a C++ formatting library. --- maintainers/maintainer-list.nix | 5 ++++ pkgs/development/libraries/fmt/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/fmt/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e7756f0bff11..2a5ce689d55f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1882,6 +1882,11 @@ github = "jdagilliland"; name = "Jason Gilliland"; }; + jdehaas = { + email = "qqlq@nullptr.club"; + github = "jeroendehaas"; + name = "Jeroen de Haas"; + }; jefdaj = { email = "jefdaj@gmail.com"; github = "jefdaj"; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix new file mode 100644 index 000000000000..c120f7c9b43f --- /dev/null +++ b/pkgs/development/libraries/fmt/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, enableShared ? true }: + +stdenv.mkDerivation rec { + version = "5.2.1"; + name = "fmt-${version}"; + src = fetchFromGitHub { + owner = "fmtlib"; + repo = "fmt"; + rev = "${version}"; + sha256 = "1cd8yq8va457iir1hlf17ksx11fx2hlb8i4jml8gj1875pizm0pk"; + }; + nativeBuildInputs = [ cmake ]; + doCheck = true; + # preCheckHook ensures the test binaries can find libfmt.so.5 + preCheck = if enableShared + then "export LD_LIBRARY_PATH=\"$PWD\"" + else ""; + cmakeFlags = [ "-DFMT_TEST=yes" + "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ]; + meta = with stdenv.lib; { + homepage = http://fmtlib.net/; + description = "Small, safe and fast formatting library"; + longDescription = '' + fmt (formerly cppformat) is an open-source formatting library. It can be + used as a fast and safe alternative to printf and IOStreams. + ''; + maintainers = [ maintainers.jdehaas ]; + license = licenses.bsd2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a2e972ef2c3..eead864f6681 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9487,6 +9487,8 @@ with pkgs; flyway = callPackage ../development/tools/flyway { }; + fmt = callPackage ../development/libraries/fmt/default.nix { }; + fplll = callPackage ../development/libraries/fplll {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; From 18258bae34ad16e808a2f5447962008d082fd19f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 01:13:22 -0500 Subject: [PATCH 813/992] teeworlds: 0.6.4 -> 0.6.5 This release adds support for building with cmake! So switch to that eagerly instead of fighting with bam. (if nothing else cmake is the devil we know...) Also: * fixup 'DATA_DIR' so programs can find resources (without need for wrappers) * install readme+license as previously done ("docs") * don't install tools since not built or installed by default * esp since doesn't appear to have non-adhoc method for installation * other distros don't seem to include --- pkgs/games/teeworlds/default.nix | 57 +++++++++++--------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 7c5074c07085..58b04821e129 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,54 +1,35 @@ -{ fetchurl, stdenv, makeWrapper, python, alsaLib -, libX11, libGLU, SDL, lua5, zlib, bam, freetype +{ fetchurl, stdenv, cmake, pkgconfig, makeWrapper, python, alsaLib +, libX11, libGLU, SDL, lua5, zlib, freetype, wavpack }: stdenv.mkDerivation rec { - name = "teeworlds-0.6.4"; + name = "teeworlds-0.6.5"; src = fetchurl { - url = "https://downloads.teeworlds.com/teeworlds-0.6.4-src.tar.gz"; - sha256 = "1qlqzp4wqh1vnip081lbsjnx5jj5m5y4msrcm8glbd80pfgd2qf2"; + url = "https://downloads.teeworlds.com/teeworlds-0.6.5-src.tar.gz"; + sha256 = "07llxjc47d1gd9jqj3vf08cmw26ha6189mwcix1khwa3frfbilqb"; }; - # we always want to use system libs instead of these - postPatch = "rm -r other/{freetype,sdl}/{include,lib32,lib64}"; + postPatch = '' + # we always want to use system libs instead of these + rm -r other/{freetype,sdl}/{include,mac,windows} - buildInputs = [ - python makeWrapper alsaLib libX11 libGLU SDL lua5 zlib bam freetype - ]; - - buildPhase = '' - bam -a -v release + # set compiled-in DATA_DIR so resources can be found + substituteInPlace src/engine/shared/storage.cpp \ + --replace '#define DATA_DIR "data"' \ + '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"' ''; - installPhase = '' - # Copy the graphics, sounds, etc. - mkdir -p "$out/share/${name}" - cp -rv data other/icons "$out/share/${name}" + nativeBuildInputs = [ cmake pkgconfig ]; - # Copy the executables (client, server, etc.). - mkdir -p "$out/bin" - executables="" - for file in * - do - if [ -f "$file" ] && [ -x "$file" ] - then - executables="$file $executables" - fi - done - cp -v $executables "$out/bin" - # Make sure the programs are executed from the right directory so - # that they can access the graphics and sounds. - for program in $executables - do - wrapProgram $out/bin/$program \ - --run "cd $out/share/${name}" - done + buildInputs = [ + python alsaLib libX11 libGLU SDL lua5 zlib freetype wavpack + ]; - # Copy the documentation. - mkdir -p "$out/doc/${name}" - cp -v *.txt "$out/doc/${name}" + postInstall = '' + mkdir -p $out/share/doc/teeworlds + cp -v *.txt $out/share/doc/teeworlds/ ''; meta = { From e26422c9d044ddbeb9a86e564460b260cb52ac3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 00:02:26 -0700 Subject: [PATCH 814/992] commonsMath: 3.3 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/commons-math/versions --- pkgs/development/libraries/java/commons/math/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix index d43dcd2a91d5..10c39f037890 100644 --- a/pkgs/development/libraries/java/commons/math/default.nix +++ b/pkgs/development/libraries/java/commons/math/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.6.1"; name = "commons-math-${version}"; src = fetchurl { url = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz"; - sha256 = "1xs71c4vbai6zr84982g4ggv6c18dhkilkzw9n1irjqnjbgm5kzc"; + sha256 = "0x4nx5pngv2n4ga11c1s4w2mf6cwydwkgs7da6wwvcjraw57bhkz"; }; installPhase = '' From 2012f61d98ff8622f4955a9ed15fa1242f353382 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Tue, 16 Oct 2018 10:11:33 +0300 Subject: [PATCH 815/992] rclone: 1.43.1 -> 1.44 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 13e69427aa48..34712a522feb 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.43.1"; + version = "1.44"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "0iz427gdm8cxx3kbjmhw7jsvi9j0ppb5aqcq4alwf72fvpvql3mx"; + sha256 = "0kpx9r4kksscsvia7r79z9h8ghph25ay9dgpqrnp599fq1bqky61"; }; outputs = [ "bin" "out" "man" ]; From 4b05aa5fab810313189f31f0053af27eeb176b0b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 00:14:42 -0700 Subject: [PATCH 816/992] commonsCompress: 1.17 -> 1.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/commons-compress/versions --- pkgs/development/libraries/java/commons/compress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index cf9c554d57f4..3c729f42320a 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.17"; + version = "1.18"; name = "commons-compress-${version}"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz"; - sha256 = "1ydm6mhy0kja47mns674iyrhz5mqlhhnh2l8rglzxnq5iawpi2m0"; + sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1"; }; installPhase = '' From 82b925c0d47c6d468516464bbc719f0993b8cf8e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 00:21:05 -0700 Subject: [PATCH 817/992] dune: 1.3.0 -> 1.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dune/versions --- pkgs/development/tools/ocaml/dune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 41e0084b28ff..6d0754da04d0 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dune-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "15bzakiclipsyjgcfrj83xdpwwww3aaijyw01bn5cx96cmcqyjad"; + sha256 = "1fz1jx1d48yb40qan4hw25h8ia55vs7mp94a3rr7cf5gb5ap2zkj"; }; buildInputs = with ocamlPackages; [ ocaml findlib ]; From dec04173472a90643388c495d397a8c7732cb04f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 00:37:15 -0700 Subject: [PATCH 818/992] baresip: 0.5.10 -> 0.5.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/baresip/versions --- .../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 b7570e85217c..db8eea645874 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -3,11 +3,11 @@ , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { - version = "0.5.10"; + version = "0.5.11"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "1yx721qnyhgk2lna1p6iwndl767cy0ss5zcwhyjccgqd848b0grr"; + sha256 = "1pv2fllg5z6q524k7dyqwm41kaj6bh2xjqg98p6v25n31v3gvy04"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [zlib openssl libre librem cairo mpg123 From 93c7c59a97a024ba891792ad102d55123e0e49a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 00:41:19 -0700 Subject: [PATCH 819/992] awf: 1.3.1 -> 1.4.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/awf/versions --- pkgs/development/tools/misc/awf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix index b29dbcf79be0..38d2194dab82 100644 --- a/pkgs/development/tools/misc/awf/default.nix +++ b/pkgs/development/tools/misc/awf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "awf-${version}"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "valr"; repo = "awf"; rev = "v${version}"; - sha256 = "18dqa2269cwr0hrn67vp0ifwbv8vc2xn6mg145pbnc038hicql8m"; + sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman"; }; nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; From b7a07313cc72219964b93e47c36fffeed314a351 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 11 Oct 2018 12:15:25 +0200 Subject: [PATCH 820/992] move the codeName to /.codeName Make the codeName globally accessible in the repo. The release is not only for NixOS anymore. --- .codeName | 1 + lib/trivial.nix | 3 +++ nixos/modules/misc/version.nix | 4 +--- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .codeName diff --git a/.codeName b/.codeName new file mode 100644 index 000000000000..0bb82a2888e3 --- /dev/null +++ b/.codeName @@ -0,0 +1 @@ +Koi diff --git a/lib/trivial.nix b/lib/trivial.nix index 938df6ced476..811c298d8620 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -98,6 +98,9 @@ rec { # The current nixpkgs version number as string. release = lib.strings.fileContents ../.version; + # Note: the first letter is bumped on every release. It's an animal. + codeName = lib.strings.fileContents ../.codeName; + # The current nixpkgs version suffix as string. versionSuffix = let suffixFile = ../.version-suffix; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 6d78b7c593f8..fd77f6372720 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -43,6 +43,7 @@ in nixos.codeName = mkOption { readOnly = true; type = types.str; + default = lib.trivial.codeName; description = "The NixOS release code name (e.g. Emu)."; }; @@ -79,9 +80,6 @@ in version = mkDefault (cfg.release + cfg.versionSuffix); revision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId); versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId)); - - # Note: the first letter is bumped on every release. It's an animal. - codeName = "Koi"; }; # Generate /etc/os-release. See From 187534454271910dcc023a9b0a0c27e9e79ecade Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 9 Oct 2018 23:10:45 +0200 Subject: [PATCH 821/992] nixos-*: init as package Move all the nixos-* scripts from the nixos distribution as real packages in the pkgs/ package set. This allows non-nixos users to run the script as well. For example, deploying a remote machine with: nixos-rebuild --target-host root@hostname --build-host root@hostname --- nixos/modules/installer/tools/tools.nix | 88 +++++-------------- pkgs/tools/nixos/nixos-build-vms/default.nix | 7 ++ .../nixos}/nixos-build-vms/nixos-build-vms.sh | 2 +- pkgs/tools/nixos/nixos-enter/default.nix | 7 ++ .../tools/nixos/nixos-enter}/nixos-enter.sh | 0 .../nixos/nixos-generate-config/default.nix | 16 ++++ .../nixos-generate-config.pl | 0 pkgs/tools/nixos/nixos-install/default.nix | 13 +++ .../nixos/nixos-install}/nixos-install.sh | 0 pkgs/tools/nixos/nixos-option/default.nix | 7 ++ .../tools/nixos/nixos-option}/nixos-option.sh | 0 pkgs/tools/nixos/nixos-rebuild/default.nix | 13 +++ .../nixos-rebuild}/nix-fallback-paths.nix | 0 .../nixos/nixos-rebuild}/nixos-rebuild.sh | 0 pkgs/tools/nixos/nixos-version/default.nix | 13 +++ .../nixos/nixos-version}/nixos-version.sh | 0 pkgs/top-level/all-packages.nix | 10 +++ 17 files changed, 110 insertions(+), 66 deletions(-) create mode 100644 pkgs/tools/nixos/nixos-build-vms/default.nix rename {nixos/modules/installer/tools => pkgs/tools/nixos}/nixos-build-vms/nixos-build-vms.sh (99%) create mode 100644 pkgs/tools/nixos/nixos-enter/default.nix rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-enter}/nixos-enter.sh (100%) create mode 100644 pkgs/tools/nixos/nixos-generate-config/default.nix rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-generate-config}/nixos-generate-config.pl (100%) create mode 100644 pkgs/tools/nixos/nixos-install/default.nix rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-install}/nixos-install.sh (100%) create mode 100644 pkgs/tools/nixos/nixos-option/default.nix rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-option}/nixos-option.sh (100%) create mode 100644 pkgs/tools/nixos/nixos-rebuild/default.nix rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-rebuild}/nix-fallback-paths.nix (100%) rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-rebuild}/nixos-rebuild.sh (100%) create mode 100644 pkgs/tools/nixos/nixos-version/default.nix rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-version}/nixos-version.sh (100%) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index af0a3a2fcc88..6d9ebf750825 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -6,77 +6,35 @@ with lib; let - makeProg = args: pkgs.substituteAll (args // { - dir = "bin"; - isExecutable = true; - }); - - nixos-build-vms = makeProg { - name = "nixos-build-vms"; - src = ./nixos-build-vms/nixos-build-vms.sh; - }; - - nixos-install = makeProg { - name = "nixos-install"; - src = ./nixos-install.sh; - nix = config.nix.package.out; - path = makeBinPath [ nixos-enter ]; - }; - - nixos-rebuild = - let fallback = import ./nix-fallback-paths.nix; in - makeProg { - name = "nixos-rebuild"; - src = ./nixos-rebuild.sh; - nix = config.nix.package.out; - nix_x86_64_linux = fallback.x86_64-linux; - nix_i686_linux = fallback.i686-linux; - }; - - nixos-generate-config = makeProg { - name = "nixos-generate-config"; - src = ./nixos-generate-config.pl; - path = [ pkgs.btrfs-progs ]; - perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; - inherit (config.system.nixos) release; - }; - - nixos-option = makeProg { - name = "nixos-option"; - src = ./nixos-option.sh; - }; - - nixos-version = makeProg { - name = "nixos-version"; - src = ./nixos-version.sh; - inherit (config.system.nixos) version codeName revision; - }; - - nixos-enter = makeProg { - name = "nixos-enter"; - src = ./nixos-enter.sh; - }; - + nixos-build-vms = pkgs.nixos-build-vms; + nixos-enter = pkgs.nixos-enter; + nixos-generate-config = pkgs.nixos-generate-config.override { inherit (config.system.nixos) release; }; + nixos-install = pkgs.nixos-install.override { nix = config.nix.package; }; + nixos-option = pkgs.nixos-option; + nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; }; + nixos-version = pkgs.nixos-version.override { inherit (config.system.nixos) version codeName revision; }; in { - config = { - - environment.systemPackages = - [ nixos-build-vms - nixos-install - nixos-rebuild - nixos-generate-config - nixos-option - nixos-version - nixos-enter - ]; + environment.systemPackages = [ + nixos-build-vms + nixos-enter + nixos-generate-config + nixos-install + nixos-option + nixos-rebuild + nixos-version + ]; system.build = { - inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter; + inherit + nixos-enter + nixos-generate-config + nixos-install + nixos-option + nixos-rebuild + ; }; - }; - } diff --git a/pkgs/tools/nixos/nixos-build-vms/default.nix b/pkgs/tools/nixos/nixos-build-vms/default.nix new file mode 100644 index 000000000000..579f80c8256c --- /dev/null +++ b/pkgs/tools/nixos/nixos-build-vms/default.nix @@ -0,0 +1,7 @@ +{ substituteAll }: +substituteAll { + name = "nixos-build-vms"; + dir = "bin"; + isExecutable = true; + src = ./nixos-build-vms.sh; +} diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh similarity index 99% rename from nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh rename to pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh index 4e981c074a57..237a807609a0 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh +++ b/pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh @@ -35,7 +35,7 @@ do exit 0 ;; esac - + shift done diff --git a/pkgs/tools/nixos/nixos-enter/default.nix b/pkgs/tools/nixos/nixos-enter/default.nix new file mode 100644 index 000000000000..ccf455c40dcf --- /dev/null +++ b/pkgs/tools/nixos/nixos-enter/default.nix @@ -0,0 +1,7 @@ +{ substituteAll }: +substituteAll { + name = "nixos-enter"; + dir = "bin"; + isExecutable = true; + src = ./nixos-enter.sh; +} diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/pkgs/tools/nixos/nixos-enter/nixos-enter.sh similarity index 100% rename from nixos/modules/installer/tools/nixos-enter.sh rename to pkgs/tools/nixos/nixos-enter/nixos-enter.sh diff --git a/pkgs/tools/nixos/nixos-generate-config/default.nix b/pkgs/tools/nixos/nixos-generate-config/default.nix new file mode 100644 index 000000000000..3d9e26d1d08d --- /dev/null +++ b/pkgs/tools/nixos/nixos-generate-config/default.nix @@ -0,0 +1,16 @@ +{ substituteAll +, btrfs-progs +, perl +, perlPackages +, lib +, release ? lib.trivial.release +}: +substituteAll { + name = "nixos-generate-config"; + dir = "bin"; + isExecutable = true; + src = ./nixos-generate-config.pl; + path = [ btrfs-progs ]; + perl = "${perl}/bin/perl -I${perlPackages.FileSlurp}/lib/perl5/site_perl"; + inherit release; +} diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/pkgs/tools/nixos/nixos-generate-config/nixos-generate-config.pl similarity index 100% rename from nixos/modules/installer/tools/nixos-generate-config.pl rename to pkgs/tools/nixos/nixos-generate-config/nixos-generate-config.pl diff --git a/pkgs/tools/nixos/nixos-install/default.nix b/pkgs/tools/nixos/nixos-install/default.nix new file mode 100644 index 000000000000..c652fb67f62f --- /dev/null +++ b/pkgs/tools/nixos/nixos-install/default.nix @@ -0,0 +1,13 @@ +{ substituteAll +, lib +, nix +, nixos-enter +}: +substituteAll { + name = "nixos-install"; + dir = "bin"; + isExecutable = true; + src = ./nixos-install.sh; + nix = nix.out; + path = lib.makeBinPath [ nixos-enter ]; +} diff --git a/nixos/modules/installer/tools/nixos-install.sh b/pkgs/tools/nixos/nixos-install/nixos-install.sh similarity index 100% rename from nixos/modules/installer/tools/nixos-install.sh rename to pkgs/tools/nixos/nixos-install/nixos-install.sh diff --git a/pkgs/tools/nixos/nixos-option/default.nix b/pkgs/tools/nixos/nixos-option/default.nix new file mode 100644 index 000000000000..1fe84c01bced --- /dev/null +++ b/pkgs/tools/nixos/nixos-option/default.nix @@ -0,0 +1,7 @@ +{ substituteAll }: +substituteAll { + name = "nixos-option"; + dir = "bin"; + isExecutable = true; + src = ./nixos-option.sh; +} diff --git a/nixos/modules/installer/tools/nixos-option.sh b/pkgs/tools/nixos/nixos-option/nixos-option.sh similarity index 100% rename from nixos/modules/installer/tools/nixos-option.sh rename to pkgs/tools/nixos/nixos-option/nixos-option.sh diff --git a/pkgs/tools/nixos/nixos-rebuild/default.nix b/pkgs/tools/nixos/nixos-rebuild/default.nix new file mode 100644 index 000000000000..2216252f6cbf --- /dev/null +++ b/pkgs/tools/nixos/nixos-rebuild/default.nix @@ -0,0 +1,13 @@ +{ substituteAll, nix }: +let + fallback = import ./nix-fallback-paths.nix; +in + substituteAll { + name = "nixos-rebuild"; + dir = "bin"; + isExecutable = true; + src = ./nixos-rebuild.sh; + nix = nix.out; + nix_x86_64_linux = fallback.x86_64-linux; + nix_i686_linux = fallback.i686-linux; + } diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/pkgs/tools/nixos/nixos-rebuild/nix-fallback-paths.nix similarity index 100% rename from nixos/modules/installer/tools/nix-fallback-paths.nix rename to pkgs/tools/nixos/nixos-rebuild/nix-fallback-paths.nix diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/pkgs/tools/nixos/nixos-rebuild/nixos-rebuild.sh similarity index 100% rename from nixos/modules/installer/tools/nixos-rebuild.sh rename to pkgs/tools/nixos/nixos-rebuild/nixos-rebuild.sh diff --git a/pkgs/tools/nixos/nixos-version/default.nix b/pkgs/tools/nixos/nixos-version/default.nix new file mode 100644 index 000000000000..f81f9ac9927b --- /dev/null +++ b/pkgs/tools/nixos/nixos-version/default.nix @@ -0,0 +1,13 @@ +{ substituteAll +, lib +, version ? lib.trivial.version +, codeName ? "unknown" +, revision ? lib.trivial.revisionWithDefault "master" +}: +substituteAll { + name = "nixos-version"; + dir = "bin"; + isExecutable = true; + src = ./nixos-version.sh; + inherit version codeName revision; +} diff --git a/nixos/modules/installer/tools/nixos-version.sh b/pkgs/tools/nixos/nixos-version/nixos-version.sh similarity index 100% rename from nixos/modules/installer/tools/nixos-version.sh rename to pkgs/tools/nixos/nixos-version/nixos-version.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a3da230798e..6ecb95582725 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21951,6 +21951,16 @@ with pkgs; nixStable nixUnstable; + # NixOS tools + nixos-build-vms = callPackage ../tools/nixos/nixos-build-vms { }; + nixos-enter = callPackage ../tools/nixos/nixos-enter { }; + nixos-generate-config = callPackage ../tools/nixos/nixos-generate-config { }; + nixos-install = callPackage ../tools/nixos/nixos-install { }; + nixos-option = callPackage ../tools/nixos/nixos-option { }; + nixos-rebuild = callPackage ../tools/nixos/nixos-rebuild { }; + nixos-version = callPackage ../tools/nixos/nixos-version { }; + + nixops = callPackage ../tools/package-management/nixops { }; nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { }); From e14f9cea94f08abdbf78b8fdd0a3ca2d3144b073 Mon Sep 17 00:00:00 2001 From: "Christoph Neidahl (OPNA2608)" Date: Tue, 16 Oct 2018 11:40:27 +0200 Subject: [PATCH 822/992] x11vnc: 0.9.13 -> 0.9.15 updated x11vnc to use the GitHub repo and up-to-date version 0.9.15 --- pkgs/tools/X11/x11vnc/default.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 2dc6d8ffd78c..d91c91b10e20 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,34 +1,42 @@ -{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg, coreutils }: +{ stdenv, fetchFromGitHub, + openssl, zlib, libjpeg, xorg, coreutils, libvncserver, + autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - name = "x11vnc-0.9.13"; + name = "x11vnc-${version}"; + version = "0.9.15"; - src = fetchurl { - url = "mirror://sourceforge/libvncserver/${name}.tar.gz"; - sha256 = "0fzib5xb1vbs8kdprr4z94v0fshj2c5hhaz69llaarwnc8p9z0pn"; + src = fetchFromGitHub { + owner = "LibVNC"; + repo = "x11vnc"; + rev = version; + sha256 = "1a1b65k1hsy4nhg2sx1yrpaz3vx6s7rmrx8nwygpaam8wpdlkh8p"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ xorg.libXfixes xorg.fixesproto openssl xorg.libXdamage xorg.damageproto zlib xorg.libX11 xorg.xproto libjpeg xorg.libXtst xorg.libXinerama xorg.xineramaproto xorg.libXrandr xorg.randrproto xorg.libXext xorg.xextproto xorg.inputproto xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto + libvncserver ]; preConfigure = '' configureFlags="--mandir=$out/share/man" - substituteInPlace x11vnc/unixpw.c \ + substituteInPlace src/unixpw.c \ --replace '"/bin/su"' '"/run/wrappers/bin/su"' \ --replace '"/bin/true"' '"${coreutils}/bin/true"' - sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' x11vnc/ssltools.h + sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h ''; meta = with stdenv.lib; { description = "A VNC server connected to a real X11 screen"; - homepage = http://www.karlrunge.com/x11vnc/; + homepage = https://github.com/LibVNC/x11vnc/; platforms = platforms.linux; license = licenses.gpl2; }; From 09504f62a72ea38435a3cb1217c8cd12a695a79d Mon Sep 17 00:00:00 2001 From: "Christoph Neidahl (OPNA2608)" Date: Tue, 16 Oct 2018 11:43:48 +0200 Subject: [PATCH 823/992] x11vnc: added maintainer adding myself as maintainer --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/X11/x11vnc/default.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5f33e316e183..3791c6772c4f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3110,6 +3110,11 @@ github = "olynch"; name = "Owen Lynch"; }; + OPNA2608 = { + email = "christoph.neidahl@gmail.com"; + github = "OPNA2608"; + name = "Christoph Neidahl"; + }; orbekk = { email = "kjetil.orbekk@gmail.com"; github = "orbekk"; diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index d91c91b10e20..51307f0df09f 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/LibVNC/x11vnc/; platforms = platforms.linux; license = licenses.gpl2; + maintainers = with maintainers; [ OPNA2608 ]; }; } From c3e004799c8fbc9c26d4178004accf991714cff7 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Tue, 16 Oct 2018 02:45:25 -0700 Subject: [PATCH 824/992] Hide useless errors when waiting for zpool to be ready --- nixos/modules/tasks/filesystems/zfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 2b3b09d725c7..8f8c9e23e13e 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -74,7 +74,7 @@ let importLib = {zpoolCmd, awkCmd, cfgZfs}: '' poolReady() { pool="$1" - state="$("${zpoolCmd}" import | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")" + state="$("${zpoolCmd}" import 2>/dev/null | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")" if [[ "$state" = "ONLINE" ]]; then return 0 else From db7637377bf3b328008b8d77427ac75a193fcd94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 04:30:20 -0700 Subject: [PATCH 825/992] caf: 0.15.7 -> 0.16.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/actor-framework/versions --- pkgs/development/libraries/caf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 397e80961e06..09c1560d6f60 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "actor-framework-${version}"; - version = "0.15.7"; + version = "0.16.0"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = "${version}"; - sha256 = "0qmb18k162xdvf8z03mybjazkwb2vqda5xd1qh5bwkvxracwq3sb"; + sha256 = "01i6sclxwa7k91ngi7jw9vlss8wjpv1hz4y5934jq0lx8hdf7s02"; }; nativeBuildInputs = [ cmake ]; From ddaefd444e622f7cf4426d1dd5e64760cfb45fec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 04:38:35 -0700 Subject: [PATCH 826/992] bindfs: 1.13.9 -> 1.13.10 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bindfs/versions --- pkgs/tools/filesystems/bindfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 1499e81b624e..a674de9ac49b 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.13.9"; + version = "1.13.10"; name = "bindfs-${version}"; src = fetchurl { url = "https://bindfs.org/downloads/${name}.tar.gz"; - sha256 = "1dgqjq2plpds442ygpv8czr5v199ljscp33m89y19x04ssljrymc"; + sha256 = "14wfp2dcjm0f1pmqqvkf94k7pijbi8ka395cm3hryqpi4k0w3f4j"; }; dontStrip = true; From 2b2e4e1a3b7dd28a16c23fd3bcb731bfc1388993 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 04:53:24 -0700 Subject: [PATCH 827/992] adapta-gtk-theme: 3.94.0.149 -> 3.95.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 37e7af95a910..0c144b567418 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.94.0.149"; + version = "3.95.0.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "1rb07yv4iz4yp6cnigzy690mw3w6fcf7szlcbbna6wnjaf1rbf2i"; + sha256 = "0hc3ar55wjg51qf8c7h0nix0lyqs16mk1d4hhxyv102zq4l5fz97"; }; preferLocalBuild = true; From 62dc7fbc6170e9c96fed8eda70783bb012f57a84 Mon Sep 17 00:00:00 2001 From: tilpner Date: Tue, 16 Oct 2018 13:55:31 +0200 Subject: [PATCH 828/992] appimage-run: Fix type-1 support, used wrong directory --- pkgs/tools/package-management/appimage-run/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index 8e236aa426fd..e744b897f46a 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -134,7 +134,8 @@ buildFHSUserEnv { if ${file}/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then # is type-1 appimage - ${libarchive}/bin/bsdtar -x -C "$SQUASHFS_ROOT" -f "$APPIMAGE" + mkdir "$APPDIR" + ${libarchive}/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE" else # is type-2 appimage "$APPIMAGE" --appimage-extract 2>/dev/null From 2e1b04b4efbc90555a34d44f00bc3ef92b1570d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 04:58:58 -0700 Subject: [PATCH 829/992] babl: 0.1.56 -> 0.1.58 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/babl/versions --- pkgs/development/libraries/babl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 1e341d3124b4..027b86a97747 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.56"; + name = "babl-0.1.58"; src = fetchurl { url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla"; + sha256 = "0mgdii9v89ay0nra36cz9i0q7cqv8wi8hk01jsc4bf0rc1bsxjbr"; }; doCheck = true; From b2ba477e713574fa49811c420726542911bf89dc Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 16 Oct 2018 14:51:13 +0200 Subject: [PATCH 830/992] altcoins.bitcoin-abc: 3.6.7 -> 3.6.10 --- pkgs/applications/altcoins/bitcoin-abc.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index 6d2cbcdf9f9b..3b65b06d8db8 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost , zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent , withGui }: @@ -7,19 +7,19 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.17.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1kq9n3s9vhkmfaizsyi2cb91ibi06gb6wx0hkcb9hg3nrrvcka3y"; + sha256 = "1ha219xnd61qicf7r3j0wbfrifh7blwp3lyk3ycgdn381q1qln29"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib + buildInputs = [ openssl db53 boost zlib miniupnpc utillinux protobuf libevent ] ++ optionals withGui [ qtbase qttools qrencode ]; From d36c55a530e31955ef9657dab745faf9f315eae8 Mon Sep 17 00:00:00 2001 From: Doug Beardsley Date: Mon, 15 Oct 2018 16:15:03 -0400 Subject: [PATCH 831/992] Add name parameter to developPackage --- pkgs/development/haskell-modules/make-package-set.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index ef2c33c10915..400465264883 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -194,6 +194,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args; # : { root : Path + # , name : Defaulted String # , source-overrides : Defaulted (Either Path VersionNumber) # , overrides : Defaulted (HaskellPackageOverrideSet) # , modifier : Defaulted @@ -207,6 +208,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # for nix-build or nix-shell to build that package. developPackage = { root + , name ? builtins.baseNameOf root , source-overrides ? {} , overrides ? self: super: {} , modifier ? drv: drv @@ -216,7 +218,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)) - .callCabal2nix (builtins.baseNameOf root) root {}; + .callCabal2nix name root {}; in if returnShellEnv then (modifier drv).env else modifier drv; ghcWithPackages = selectFrom: withPackages (selectFrom self); From aac680d4c97cce08ce759043dd25a3efd5d9b5dd Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 16 Oct 2018 16:25:43 +0200 Subject: [PATCH 832/992] vbam: unstable-2017-09-04 -> 2.1.0 --- pkgs/misc/emulators/vbam/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index ac078f622515..59f0252259cc 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -4,25 +4,23 @@ , fetchFromGitHub , ffmpeg , gettext -, gtk2-x11 , libGLU_combined , openal , pkgconfig , SDL2 , sfml -, wxGTK , zip , zlib }: stdenv.mkDerivation rec { name = "visualboyadvance-m-${version}"; - version = "unstable-2017-09-04"; + version = "2.1.0"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; - rev = "ceef480"; - sha256 = "1lpmlj8mv6fwlfg9m58hzggx8ld6cnjvaqx5ka5sffxd9v95qq2l"; + rev = "v${version}"; + sha256 = "1dppfvy24rgg3h84gv33l1y7zznkv3zxn2hf98w85pca6k1y2afz"; }; buildInputs = [ @@ -30,13 +28,11 @@ stdenv.mkDerivation rec { cmake ffmpeg gettext - gtk2-x11 libGLU_combined openal pkgconfig SDL2 sfml - wxGTK zip zlib ]; @@ -44,8 +40,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE='Release'" "-DENABLE_FFMPEG='true'" - #"-DENABLE_LINK='true'" currently broken :/ + "-DENABLE_LINK='true'" "-DSYSCONFDIR=etc" + "-DENABLE_WX='false'" + "-DENABLE_SDL='true'" ]; meta = { From bd0aa43571d329c5b5f2703affdf185e3b6bbeb1 Mon Sep 17 00:00:00 2001 From: Bojan Nikolic Date: Tue, 16 Oct 2018 15:39:49 +0100 Subject: [PATCH 833/992] magit-filenotify: Fix missing dependency on git magit-filenotify has a build-time dependency on git, fix this in same way as magit by adding override --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ .../editors/emacs-modes/melpa-stable-packages.nix | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 777d8e62541d..b95a944e612b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -167,6 +167,12 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml merlin = markBroken super.merlin; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 98927cbd9873..6d1a8f081e5a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -157,6 +157,12 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml merlin = markBroken super.merlin; From 6c7fa2f1580fd623a30e2b7beca3b53bc3656601 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 16 Oct 2018 17:04:43 +0200 Subject: [PATCH 834/992] blivet: fix reference to selinux python modules (cherry picked from commit 7ceea6f6013e8a6abf4925e0b2ad94c23f64442d) --- pkgs/development/python-modules/blivet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 9d2485711d0c..1c86c02f7a88 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -31,7 +31,7 @@ in buildPythonPackage rec { ''; propagatedBuildInputs = [ - pykickstart pyparted pyblock pyudev selinuxWithPython cryptsetupWithPython + pykickstart pyparted pyblock pyudev selinuxWithPython.py cryptsetupWithPython six ]; From 34ea15f5e401b93aefe2f98057a6ecd79b63f5a2 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 16 Oct 2018 17:12:05 +0200 Subject: [PATCH 835/992] nixpart0.blivet: fix reference to selinux python modules (cherry picked from commit 71941853a13878e5cc17b493f3791db7d4b29e51) --- pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 5879fd9d0821..24aab7dc6dd4 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - pykickstart pyparted pyblock libselinux cryptsetup + pykickstart pyparted pyblock libselinux.py cryptsetup ] ++ stdenv.lib.optional useNixUdev systemd; # tests are currently _heavily_ broken upstream From 4e75120cd4541a2f919d1d3663217e6f1b1a1820 Mon Sep 17 00:00:00 2001 From: kmille Date: Tue, 16 Oct 2018 17:37:34 +0200 Subject: [PATCH 836/992] tmux: 2.7 -> 2.8 tmux 2.8 has a broken version string (2.8-rc) which we patch in configure.ac CHANGES FROM 2.7 to 2.8 * Make display-panes block the client until a pane is chosen or it times out. * Clear history on RIS like most other terminals do. * Add an "Any" key to run a command if a key is pressed that is not bound in the current key table. * Expand formats in load-buffer and save-buffer. * Add a rectangle_toggle format. * Add set-hook -R to run a hook immediately. * Add README.ja. * Add pane focus hooks. * Allow any punctuation as separator for s/x/y not only /. * Improve resizing with the mouse (fix resizing the wrong pane in some layouts, and allow resizing multiple panes at the same time). * Allow , and } to be escaped in formats as #, and #}. * Add KRB5CCNAME to update-environment. * Change meaning of -c to display-message so the client is used if it matches the session given to -t. * Fixes to : form of SGR. * Add x and X to choose-tree to kill sessions, windows or panes. --- pkgs/tools/misc/tmux/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index fcec511b7ef5..038b3206ac24 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.7"; + version = "2.8"; outputs = [ "out" "man" ]; @@ -21,9 +21,13 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "1yr4l8ckd67c3id4vrbpha91xxpdfpw0cpbr3v81lam0m7k4rgba"; + sha256 = "0n8sjddy00xgh1rvvw968hh72pyslg1gahmzajfc4b3xax87drpi"; }; + postPatch = '' + sed -i 's/2.8-rc/2.8/' configure.ac + ''; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ ncurses libevent makeWrapper ]; From 592030340f28b6a257579aa768166ed8151fbd1b Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 16 Oct 2018 15:50:51 +0000 Subject: [PATCH 837/992] varnish4: 4.1.9 -> 4.1.10 (#48488) --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 4d8841fad318..8031276e24a6 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -39,8 +39,8 @@ let in { varnish4 = common { - version = "4.1.9"; - sha256 = "11zwyasz2fn9qxc87r175wb5ba7388sd79mlygjmqn3yv2m89n12"; + version = "4.1.10"; + sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n"; }; varnish5 = common { version = "5.2.1"; From d3b747627884fda87b09041ea90c4eef70ab88e4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Cugnet Date: Tue, 16 Oct 2018 17:55:51 +0200 Subject: [PATCH 838/992] erlangR21: 21.0 -> 21.1.1 (#47371) * erlangR21: 21.0 -> 21.1 * erlangR21: 21.1 -> 21.1.1 --- pkgs/development/interpreters/erlang/R21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index e9aa2a3dc426..381ffc75f8cf 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation rec { - version = "21.0"; - sha256 = "0khprgawmbdpn9b8jw2kksmvs6b45mibpjralsc0ggxym1397vm8"; + version = "21.1.1"; + sha256 = "1kgny4nvw40d93jn5f4y5bcfhdlshg79n2w7lr0xj35kgwkyci39"; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' From 4b61dde1dbf924ef23f87c93f0ac951e73299045 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 16 Oct 2018 16:09:04 +0000 Subject: [PATCH 839/992] varnish6: 6.0.1 -> 6.1.0 (#48487) --- pkgs/servers/varnish/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 8031276e24a6..7517560a521c 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -2,7 +2,7 @@ , python2, makeWrapper }: let - common = { version, sha256 }: + common = { version, sha256, extraBuildInputs ? [] }: stdenv.mkDerivation rec { name = "varnish-${version}"; @@ -15,7 +15,7 @@ let buildInputs = [ pcre libxslt groff ncurses readline python2 libedit python2.pkgs.docutils makeWrapper - ]; + ] ++ extraBuildInputs; buildFlags = "localstatedir=/var/spool"; @@ -47,7 +47,8 @@ in sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; }; varnish6 = common { - version = "6.0.1"; - sha256 = "1f7k751r31sgfvr1ns6s3h48c5x06kkps1p6zd40wvylm56qxwj7"; + version = "6.1.0"; + sha256 = "0zg2aqkg7a4zsjpxj0s7mphxv5f9xy279hjwln30h901k18r46qn"; + extraBuildInputs = [ python2.pkgs.sphinx ]; }; } From 2ad99a662d3500e45c9e57b49fb2619f2bd7142e Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 16 Oct 2018 16:11:41 +0000 Subject: [PATCH 840/992] chromium plugins: add meta.platforms (#48495) to prevent their installation on aarch64 --- pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 60e94e137676..c5622f0c63cb 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,6 +94,8 @@ let envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib"; }} ''; + + meta.platforms = platforms.x86_64; }; flash = stdenv.mkDerivation rec { @@ -133,6 +135,8 @@ let ''; dontStrip = true; + + meta.platforms = platforms.x86_64; }; in { From e58816bcc6917e746cd9219b6591bfb478ecc910 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 09:12:59 -0700 Subject: [PATCH 841/992] googler: 3.7 -> 3.7.1 (#48508) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/googler/versions --- pkgs/applications/misc/googler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 45b4ad88cff3..4b5c17d8e51b 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, python}: stdenv.mkDerivation rec { - version = "3.7"; + version = "3.7.1"; name = "googler-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "googler"; rev = "v${version}"; - sha256 = "0dxg849ckyy181zlrb57hd959cgvx105c35ksmvi4wl285sh5kpj"; + sha256 = "0dcszpz85h3yjnr55ixf8mzsdv46w3g27frhgcsl5zlsgk6vl8kw"; }; propagatedBuildInputs = [ python ]; From fe41bef1427d37265cbda28a8e9612b74db98e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 16 Oct 2018 13:21:44 -0300 Subject: [PATCH 842/992] dde-polkit-agent: init at 0.2.1 --- .../deepin/dde-polkit-agent/default.nix | 46 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/desktops/deepin/dde-polkit-agent/default.nix diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix new file mode 100644 index 000000000000..71f9e9b0298e --- /dev/null +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, +dtkcore, dtkwidget, dde-qt-dbus-factory }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dde-polkit-agent"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1n3hys5hhhd99ycpx4im6ihy53vl9c28z7ls7smn117h3ca4c8wc"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + qttools + ]; + + buildInputs = [ + dde-qt-dbus-factory + dtkcore + dtkwidget + polkit-qt + ]; + + postPatch = '' + patchShebangs . + + sed -i dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop \ + -e "s,/usr,$out," + + sed -i pluginmanager.cpp \ + -e "s,/usr/lib/polkit-1-dde/plugins,/run/current-system/sw/lib/polkit-1-dde/plugins," + ''; + + meta = with stdenv.lib; { + description = "PolicyKit agent for Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/dde-polkit-agent; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 291aa8c11be1..3ed13fa495e7 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -6,6 +6,7 @@ let dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; + dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { }; deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; From eca462813d7586063deb5c9989ae9bcef29f9495 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 16 Oct 2018 18:28:09 +0200 Subject: [PATCH 843/992] libssh: 0.7.5 -> 0.7.6 Fixes CVE-2018-10933: libssh versions 0.6 and above have an authentication bypass vulnerability in the server code. By presenting the server an SSH2_MSG_USERAUTH_SUCCESS message in place of the SSH2_MSG_USERAUTH_REQUEST message which the server would expect to initiate authentication, the attacker could successfully authentciate without any credentials. Source: https://www.libssh.org/2018/10/16/libssh-0-8-4-and-0-7-6-security-and-bugfix-release/ --- pkgs/development/libraries/libssh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 9b5c3d530ebf..1ec15e88f13d 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { - name = "libssh-0.7.5"; + name = "libssh-0.7.6"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/218/${name}.tar.xz"; - sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l"; + url = "https://www.libssh.org/files/0.7/libssh-0.7.6.tar.xz"; + sha256 = "14hhdpn2hflywsi9d5bz2pfjxqkyi07znjij89cpakr7b4w7sq0x"; }; patches = [ From fc69a394fa0b7c3358c8bb4d81a340693f15d39e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 10:39:08 -0500 Subject: [PATCH 844/992] cquery: 2018-08-08 -> 2018-10-14 (llvm6 -> llvm7) also simplify include expression a touch --- pkgs/development/tools/misc/cquery/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index d6c8f1f33eec..f032a85173a5 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -5,8 +5,8 @@ let src = fetchFromGitHub { owner = "cquery-project"; repo = "cquery"; - rev = "e17df5b41e5a687559a0b75dba9c0f1f399c4aea"; - sha256 = "06z8bg73jppb4msiqvsjbpz6pawwny831k56w5kcxrjgp22v24s1"; + rev = "a95a6503d68a85baa25465ce147b7fc20f4a552e"; + sha256 = "0rxbdln7dqkdw4q8rhclssgwypq16g9flkwmaabsr8knckbszxrx"; fetchSubmodules = true; }; @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { name = "cquery-${version}"; - version = "2018-08-08"; + version = "2018-10-14"; inherit src; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postFixup = '' # We need to tell cquery where to find the standard library headers. - standard_library_includes="\\\"-isystem\\\", \\\"${if (stdenv.hostPlatform.libc == "glibc") then stdenv.cc.libc.dev else stdenv.cc.libc}/include\\\"" + standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\"" standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" export standard_library_includes diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0ac63a3e975..4621924f6cdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8272,7 +8272,7 @@ with pkgs; cpplint = callPackage ../development/tools/analysis/cpplint { }; cquery = callPackage ../development/tools/misc/cquery { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_7; }; creduce = callPackage ../development/tools/misc/creduce { From 56ef6eeb43f2ea9c47701bbe4534999aca78dd34 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 09:54:51 -0500 Subject: [PATCH 845/992] radare2: 2.9.0 -> 3.0.0 --- .../tools/analysis/radare2/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index f10b820a73ea..4a2a32bf22a4 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -86,21 +86,21 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "19349"; - gittap = "2.9.0"; - gittip = "d5e9539ec8068ca2ab4759dc3b0697781ded4cc8"; - rev = "2.9.0"; - version = "2.9.0"; - sha256 = "0zz6337p9095picfvjrcnqaxdi2a2b68h9my523ilnw8ynwfhdzw"; - cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; - cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; + version_commit = "19720"; + gittap = "3.0.0"; + gittip = "13e3ebd2aa6653eb5b6bdd65a93dcddf3550fcfa"; + rev = "3.0.0"; + version = "3.0.0"; + sha256 = "0awbk9v7qjkarscaqzyly310f04dxgndxvxwxbjrsswqlp206b40"; + cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; + cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; r2-for-cutter = generic { - version_commit = "19349"; + version_commit = "19720"; gittap = "2.8.0-189-gf82b28982"; gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; - version = "2018-08-14"; + version = "2018-08-13"; sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1"; cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; From f88957d1701d08e61dc44653d34524fa930b2778 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 11:57:44 -0500 Subject: [PATCH 846/992] radare2: libuv and actually use deps we're providing Particularly openssl and zlib. There are others we may wish to provide but for now let's at least use the ones in buildInputs :). --- pkgs/development/tools/analysis/radare2/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 4a2a32bf22a4..a6dbb8e601fe 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -2,6 +2,7 @@ , callPackage , ninja, meson , pkgconfig , libusb, readline, libewf, perl, zlib, openssl +, libuv , gtk2 ? null, vte ? null, gtkdialog ? null , python ? null , ruby ? null @@ -62,12 +63,15 @@ let "-Dr2_gittip=${gittip}" # 2.8.0 expects this, but later it becomes an option with default=false. "-Dcapstone_in_builddir=true" + + "-Duse_sys_openssl=true" + "-Duse_sys_zlib=true" ]; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ninja meson ]; - buildInputs = [ readline libusb libewf perl zlib openssl] + buildInputs = [ readline libusb libewf perl zlib openssl libuv ] ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] From 9b590126a7af8a9488d52f1ea752a79cf2ab8a3d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 09:56:17 -0500 Subject: [PATCH 847/992] radare2-cutter: 1.7.1 -> 1.7.2 --- .../tools/analysis/radare2/cutter.nix | 4 ++-- .../tools/analysis/radare2/default.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index 659d6a94f5eb..25c6d6d58792 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -8,7 +8,7 @@ , python3 }: let - version = "1.7.1"; + version = "1.7.2"; in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0dfi6f016jnh3swppvks5qkvmk0j2hvggh9sd1f40kg9pg5p08hy"; + sha256 = "09cqfz66r3830jkz1rwyfqw1xl1jfj6xg4pcccd2ml456kddh9dn"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index f10b820a73ea..3302e17c69c3 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -96,14 +96,14 @@ in { cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; }; r2-for-cutter = generic { - version_commit = "19349"; - gittap = "2.8.0-189-gf82b28982"; - gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; - rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; - version = "2018-08-14"; - sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1"; - cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; - cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; + version_commit = "19720"; + gittap = "2.9.0-310-gcb62c376b"; + gittip = "cb62c376bef6c7427019a7c28910c33c364436dd"; + rev = "cb62c376bef6c7427019a7c28910c33c364436dd"; + version = "2018-10-07"; + sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l"; + cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; + cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; # } From 6fdc1655649076262a93cddd4cb389457a0287e4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 12:35:16 -0500 Subject: [PATCH 848/992] r2-for-cutter: revert accidental change to version info --- pkgs/development/tools/analysis/radare2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a6dbb8e601fe..7e7f10ea7ff0 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -100,11 +100,11 @@ in { cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; }; r2-for-cutter = generic { - version_commit = "19720"; + version_commit = "19349"; gittap = "2.8.0-189-gf82b28982"; gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725"; - version = "2018-08-13"; + version = "2018-08-14"; sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1"; cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a"; cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4"; From 7786575c6c0e1b010d46ad00b14d0bb5bf08d7d2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 16 Oct 2018 19:35:45 +0200 Subject: [PATCH 849/992] terraform-providers.libvirt: fix plugin output (#48577) Terraform depends on this binary name format to detect the provider version. --- .../cluster/terraform-providers/libvirt/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 2beceddc7fba..d24a5780315d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -3,7 +3,7 @@ # USAGE: # install the following package globally or in nix-shell: # -# (terraform.withPlugins (old: [terraform-provider-libvirt])) +# (terraform.withPlugins (p: [p.libvirt])) # # configuration.nix: # @@ -36,6 +36,10 @@ buildGoPackage rec { # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 propagatedBuildInputs = [ cdrtools ]; + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-libvirt{,_v${version}}"; + meta = with stdenv.lib; { homepage = https://github.com/dmacvicar/terraform-provider-libvirt; description = "Terraform provider for libvirt"; From b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2018 20:25:44 +0200 Subject: [PATCH 850/992] Revert "Merge pull request #48122 from zimbatm/pkg-nixos-rebuild" This reverts commit 10addad6035034b2b78f3c74ef436cd7146d5231, reversing changes made to 7786575c6c0e1b010d46ad00b14d0bb5bf08d7d2. NixOS scripts should be kept in the NixOS source tree, not in pkgs. Moving them around is just confusing and creates unnecessary code/history churn. --- .codeName | 1 - lib/trivial.nix | 3 - .../installer/tools}/nix-fallback-paths.nix | 0 .../tools}/nixos-build-vms/nixos-build-vms.sh | 2 +- .../modules/installer/tools}/nixos-enter.sh | 0 .../installer/tools}/nixos-generate-config.pl | 0 .../modules/installer/tools}/nixos-install.sh | 0 .../modules/installer/tools}/nixos-option.sh | 0 .../modules/installer/tools}/nixos-rebuild.sh | 0 .../modules/installer/tools}/nixos-version.sh | 0 nixos/modules/installer/tools/tools.nix | 88 ++++++++++++++----- nixos/modules/misc/version.nix | 4 +- pkgs/tools/nixos/nixos-build-vms/default.nix | 7 -- pkgs/tools/nixos/nixos-enter/default.nix | 7 -- .../nixos/nixos-generate-config/default.nix | 16 ---- pkgs/tools/nixos/nixos-install/default.nix | 13 --- pkgs/tools/nixos/nixos-option/default.nix | 7 -- pkgs/tools/nixos/nixos-rebuild/default.nix | 13 --- pkgs/tools/nixos/nixos-version/default.nix | 13 --- pkgs/top-level/all-packages.nix | 10 --- 20 files changed, 69 insertions(+), 115 deletions(-) delete mode 100644 .codeName rename {pkgs/tools/nixos/nixos-rebuild => nixos/modules/installer/tools}/nix-fallback-paths.nix (100%) rename {pkgs/tools/nixos => nixos/modules/installer/tools}/nixos-build-vms/nixos-build-vms.sh (99%) rename {pkgs/tools/nixos/nixos-enter => nixos/modules/installer/tools}/nixos-enter.sh (100%) rename {pkgs/tools/nixos/nixos-generate-config => nixos/modules/installer/tools}/nixos-generate-config.pl (100%) rename {pkgs/tools/nixos/nixos-install => nixos/modules/installer/tools}/nixos-install.sh (100%) rename {pkgs/tools/nixos/nixos-option => nixos/modules/installer/tools}/nixos-option.sh (100%) rename {pkgs/tools/nixos/nixos-rebuild => nixos/modules/installer/tools}/nixos-rebuild.sh (100%) rename {pkgs/tools/nixos/nixos-version => nixos/modules/installer/tools}/nixos-version.sh (100%) delete mode 100644 pkgs/tools/nixos/nixos-build-vms/default.nix delete mode 100644 pkgs/tools/nixos/nixos-enter/default.nix delete mode 100644 pkgs/tools/nixos/nixos-generate-config/default.nix delete mode 100644 pkgs/tools/nixos/nixos-install/default.nix delete mode 100644 pkgs/tools/nixos/nixos-option/default.nix delete mode 100644 pkgs/tools/nixos/nixos-rebuild/default.nix delete mode 100644 pkgs/tools/nixos/nixos-version/default.nix diff --git a/.codeName b/.codeName deleted file mode 100644 index 0bb82a2888e3..000000000000 --- a/.codeName +++ /dev/null @@ -1 +0,0 @@ -Koi diff --git a/lib/trivial.nix b/lib/trivial.nix index 811c298d8620..938df6ced476 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -98,9 +98,6 @@ rec { # The current nixpkgs version number as string. release = lib.strings.fileContents ../.version; - # Note: the first letter is bumped on every release. It's an animal. - codeName = lib.strings.fileContents ../.codeName; - # The current nixpkgs version suffix as string. versionSuffix = let suffixFile = ../.version-suffix; diff --git a/pkgs/tools/nixos/nixos-rebuild/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix similarity index 100% rename from pkgs/tools/nixos/nixos-rebuild/nix-fallback-paths.nix rename to nixos/modules/installer/tools/nix-fallback-paths.nix diff --git a/pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh similarity index 99% rename from pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh rename to nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh index 237a807609a0..4e981c074a57 100644 --- a/pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh +++ b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh @@ -35,7 +35,7 @@ do exit 0 ;; esac - + shift done diff --git a/pkgs/tools/nixos/nixos-enter/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh similarity index 100% rename from pkgs/tools/nixos/nixos-enter/nixos-enter.sh rename to nixos/modules/installer/tools/nixos-enter.sh diff --git a/pkgs/tools/nixos/nixos-generate-config/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl similarity index 100% rename from pkgs/tools/nixos/nixos-generate-config/nixos-generate-config.pl rename to nixos/modules/installer/tools/nixos-generate-config.pl diff --git a/pkgs/tools/nixos/nixos-install/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh similarity index 100% rename from pkgs/tools/nixos/nixos-install/nixos-install.sh rename to nixos/modules/installer/tools/nixos-install.sh diff --git a/pkgs/tools/nixos/nixos-option/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh similarity index 100% rename from pkgs/tools/nixos/nixos-option/nixos-option.sh rename to nixos/modules/installer/tools/nixos-option.sh diff --git a/pkgs/tools/nixos/nixos-rebuild/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh similarity index 100% rename from pkgs/tools/nixos/nixos-rebuild/nixos-rebuild.sh rename to nixos/modules/installer/tools/nixos-rebuild.sh diff --git a/pkgs/tools/nixos/nixos-version/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh similarity index 100% rename from pkgs/tools/nixos/nixos-version/nixos-version.sh rename to nixos/modules/installer/tools/nixos-version.sh diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 6d9ebf750825..af0a3a2fcc88 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -6,35 +6,77 @@ with lib; let - nixos-build-vms = pkgs.nixos-build-vms; - nixos-enter = pkgs.nixos-enter; - nixos-generate-config = pkgs.nixos-generate-config.override { inherit (config.system.nixos) release; }; - nixos-install = pkgs.nixos-install.override { nix = config.nix.package; }; - nixos-option = pkgs.nixos-option; - nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; }; - nixos-version = pkgs.nixos-version.override { inherit (config.system.nixos) version codeName revision; }; + makeProg = args: pkgs.substituteAll (args // { + dir = "bin"; + isExecutable = true; + }); + + nixos-build-vms = makeProg { + name = "nixos-build-vms"; + src = ./nixos-build-vms/nixos-build-vms.sh; + }; + + nixos-install = makeProg { + name = "nixos-install"; + src = ./nixos-install.sh; + nix = config.nix.package.out; + path = makeBinPath [ nixos-enter ]; + }; + + nixos-rebuild = + let fallback = import ./nix-fallback-paths.nix; in + makeProg { + name = "nixos-rebuild"; + src = ./nixos-rebuild.sh; + nix = config.nix.package.out; + nix_x86_64_linux = fallback.x86_64-linux; + nix_i686_linux = fallback.i686-linux; + }; + + nixos-generate-config = makeProg { + name = "nixos-generate-config"; + src = ./nixos-generate-config.pl; + path = [ pkgs.btrfs-progs ]; + perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; + inherit (config.system.nixos) release; + }; + + nixos-option = makeProg { + name = "nixos-option"; + src = ./nixos-option.sh; + }; + + nixos-version = makeProg { + name = "nixos-version"; + src = ./nixos-version.sh; + inherit (config.system.nixos) version codeName revision; + }; + + nixos-enter = makeProg { + name = "nixos-enter"; + src = ./nixos-enter.sh; + }; + in { + config = { - environment.systemPackages = [ - nixos-build-vms - nixos-enter - nixos-generate-config - nixos-install - nixos-option - nixos-rebuild - nixos-version - ]; + + environment.systemPackages = + [ nixos-build-vms + nixos-install + nixos-rebuild + nixos-generate-config + nixos-option + nixos-version + nixos-enter + ]; system.build = { - inherit - nixos-enter - nixos-generate-config - nixos-install - nixos-option - nixos-rebuild - ; + inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter; }; + }; + } diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index fd77f6372720..6d78b7c593f8 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -43,7 +43,6 @@ in nixos.codeName = mkOption { readOnly = true; type = types.str; - default = lib.trivial.codeName; description = "The NixOS release code name (e.g. Emu)."; }; @@ -80,6 +79,9 @@ in version = mkDefault (cfg.release + cfg.versionSuffix); revision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId); versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId)); + + # Note: the first letter is bumped on every release. It's an animal. + codeName = "Koi"; }; # Generate /etc/os-release. See diff --git a/pkgs/tools/nixos/nixos-build-vms/default.nix b/pkgs/tools/nixos/nixos-build-vms/default.nix deleted file mode 100644 index 579f80c8256c..000000000000 --- a/pkgs/tools/nixos/nixos-build-vms/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ substituteAll }: -substituteAll { - name = "nixos-build-vms"; - dir = "bin"; - isExecutable = true; - src = ./nixos-build-vms.sh; -} diff --git a/pkgs/tools/nixos/nixos-enter/default.nix b/pkgs/tools/nixos/nixos-enter/default.nix deleted file mode 100644 index ccf455c40dcf..000000000000 --- a/pkgs/tools/nixos/nixos-enter/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ substituteAll }: -substituteAll { - name = "nixos-enter"; - dir = "bin"; - isExecutable = true; - src = ./nixos-enter.sh; -} diff --git a/pkgs/tools/nixos/nixos-generate-config/default.nix b/pkgs/tools/nixos/nixos-generate-config/default.nix deleted file mode 100644 index 3d9e26d1d08d..000000000000 --- a/pkgs/tools/nixos/nixos-generate-config/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ substituteAll -, btrfs-progs -, perl -, perlPackages -, lib -, release ? lib.trivial.release -}: -substituteAll { - name = "nixos-generate-config"; - dir = "bin"; - isExecutable = true; - src = ./nixos-generate-config.pl; - path = [ btrfs-progs ]; - perl = "${perl}/bin/perl -I${perlPackages.FileSlurp}/lib/perl5/site_perl"; - inherit release; -} diff --git a/pkgs/tools/nixos/nixos-install/default.nix b/pkgs/tools/nixos/nixos-install/default.nix deleted file mode 100644 index c652fb67f62f..000000000000 --- a/pkgs/tools/nixos/nixos-install/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ substituteAll -, lib -, nix -, nixos-enter -}: -substituteAll { - name = "nixos-install"; - dir = "bin"; - isExecutable = true; - src = ./nixos-install.sh; - nix = nix.out; - path = lib.makeBinPath [ nixos-enter ]; -} diff --git a/pkgs/tools/nixos/nixos-option/default.nix b/pkgs/tools/nixos/nixos-option/default.nix deleted file mode 100644 index 1fe84c01bced..000000000000 --- a/pkgs/tools/nixos/nixos-option/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ substituteAll }: -substituteAll { - name = "nixos-option"; - dir = "bin"; - isExecutable = true; - src = ./nixos-option.sh; -} diff --git a/pkgs/tools/nixos/nixos-rebuild/default.nix b/pkgs/tools/nixos/nixos-rebuild/default.nix deleted file mode 100644 index 2216252f6cbf..000000000000 --- a/pkgs/tools/nixos/nixos-rebuild/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ substituteAll, nix }: -let - fallback = import ./nix-fallback-paths.nix; -in - substituteAll { - name = "nixos-rebuild"; - dir = "bin"; - isExecutable = true; - src = ./nixos-rebuild.sh; - nix = nix.out; - nix_x86_64_linux = fallback.x86_64-linux; - nix_i686_linux = fallback.i686-linux; - } diff --git a/pkgs/tools/nixos/nixos-version/default.nix b/pkgs/tools/nixos/nixos-version/default.nix deleted file mode 100644 index f81f9ac9927b..000000000000 --- a/pkgs/tools/nixos/nixos-version/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ substituteAll -, lib -, version ? lib.trivial.version -, codeName ? "unknown" -, revision ? lib.trivial.revisionWithDefault "master" -}: -substituteAll { - name = "nixos-version"; - dir = "bin"; - isExecutable = true; - src = ./nixos-version.sh; - inherit version codeName revision; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11719f6cd6f5..b0ac63a3e975 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21955,16 +21955,6 @@ with pkgs; nixStable nixUnstable; - # NixOS tools - nixos-build-vms = callPackage ../tools/nixos/nixos-build-vms { }; - nixos-enter = callPackage ../tools/nixos/nixos-enter { }; - nixos-generate-config = callPackage ../tools/nixos/nixos-generate-config { }; - nixos-install = callPackage ../tools/nixos/nixos-install { }; - nixos-option = callPackage ../tools/nixos/nixos-option { }; - nixos-rebuild = callPackage ../tools/nixos/nixos-rebuild { }; - nixos-version = callPackage ../tools/nixos/nixos-version { }; - - nixops = callPackage ../tools/package-management/nixops { }; nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { }); From 26dfc0c533a226de7bc2b0e93f6cac6009247e6e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 14:01:08 -0500 Subject: [PATCH 851/992] radare2: fix update script to handle invocation from elsewhere It looks like `with Path:` is supposed to be a context-manager for changing directory but it doesn't seem to work and the only way I've found to make that work is if we made our own and annotated it. Instead just use nix search path to tell the expression where to find the file it looks for. Also re-use SCRIPT_DIR elsewhere instead of re-"computing" it. --- pkgs/development/tools/analysis/radare2/update.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py index 45920fd1e4bf..684d70bc0bc4 100755 --- a/pkgs/development/tools/analysis/radare2/update.py +++ b/pkgs/development/tools/analysis/radare2/update.py @@ -38,10 +38,9 @@ def get_radare2_rev() -> str: def get_cutter_version() -> str: version_expr = """ -(with import {}; (builtins.parseDrvName (qt5.callPackage ./cutter.nix {}).name).version) +(with import {}; (builtins.parseDrvName (qt5.callPackage {}).name).version) """ - with SCRIPT_DIR: - return sh("nix", "eval", "--raw", version_expr.strip()) + return sh("nix", "eval", "--raw", version_expr.strip(), "-I", "radare2={0}".format(SCRIPT_DIR)) def get_r2_cutter_rev() -> str: @@ -109,7 +108,7 @@ def main() -> None: "https://github.com/radare/radare2", ".", ) - nix_file = str(Path(__file__).parent.joinpath("default.nix")) + nix_file = str(SCRIPT_DIR.joinpath("default.nix")) radare2_info = get_repo_info(dirname, radare2_rev) From 5edc1dd7a873bf1afaa9563def7b94d7b82a5421 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 16 Oct 2018 21:34:08 +0200 Subject: [PATCH 852/992] signal-desktop: 1.16.2 -> 1.16.3 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 02166e237724..92f0b11c63fe 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.16.2"; + version = "1.16.3"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1j1785sc8pmrhi8yhlv4brxn7zrd33skgkkvzfl60nqkh2nybh3y"; + sha256 = "1fhs3408i8f80z5rlchrc3gwm0481rxqb5jk37gb8ip94zf97hsf"; }; phases = [ "unpackPhase" "installPhase" ]; From 67ef59334ca874abf02efbbb2b9a10d15745cab4 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 16 Oct 2018 22:14:16 +0200 Subject: [PATCH 853/992] julia_10: update to 1.0.1 (cherry picked from commit 3b3a2d30df2de8dec7fa5bc5fe5ee8897e51630e) --- pkgs/development/compilers/julia/1.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix index 2301d0c1f437..528a0d26d056 100644 --- a/pkgs/development/compilers/julia/1.0.nix +++ b/pkgs/development/compilers/julia/1.0.nix @@ -1,6 +1,6 @@ import ./shared.nix { majorVersion = "1"; minorVersion = "0"; - maintenanceVersion = "0"; - src_sha256 = "083277z90m1jxr2d1ysb96rgjj9h5q97l6h54mx3pb3f38ykshz2"; + maintenanceVersion = "1"; + src_sha256 = "0bqb5c63c7jnb753nplqj5v4k9pvh792k8y4b1n5pq8jiibr86i0"; } From e0a98c5dc02d10b84cd12efc18b7d9946c1c9e1f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 16 Oct 2018 16:50:46 -0400 Subject: [PATCH 854/992] oh-my-zsh: 2018-09-03 -> 2018-09-14 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 22aa478d743c..d4082465b19e 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2018-09-03"; + version = "2018-09-14"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "69e637c35578305e19dbfc520e65c514180db6ef"; - sha256 = "067qwvdlghjb2kcv4fydnnbwss2kb4fgn1qib88ygz82fpvb0cwf"; + rev = "489be2452a6410a2c7837910c4cd3c0ed47a7481"; + sha256 = "05svfd2q4w4hnd9rsh57z7rsc50lavg3lqm3nmm6dqak1nnrkhbz"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 5ac9af234060b509d48ca8cca9082ca93080490c Mon Sep 17 00:00:00 2001 From: "nagato.pain" Date: Tue, 16 Oct 2018 14:33:48 -0700 Subject: [PATCH 855/992] pythonPackages.python-ldap-test: init at 0.3.1 --- .../python-ldap-test/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/python-ldap-test/default.nix diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix new file mode 100644 index 000000000000..3ba81cacfd41 --- /dev/null +++ b/pkgs/development/python-modules/python-ldap-test/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, py4j }: + +buildPythonPackage rec { + pname = "python-ldap-test"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qh9x3lncaldnw79fgpqbayichs8pbz8abr6pxb5qxbs7zrnyrwf"; + }; + + propagatedBuildInputs = [ py4j ]; + + # Tests needs java to be present in path + doCheck = false; + + meta = with stdenv.lib; { + description = "Tool for testing code speaking with LDAP server"; + homepage = https://github.com/zoldar/python-ldap-test; + license = licenses.mit; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c66fd52d43b..e53cee981343 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -563,6 +563,8 @@ in { python-lz4 = callPackage ../development/python-modules/python-lz4 { }; + python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; + python-igraph = callPackage ../development/python-modules/python-igraph { pkgconfig = pkgs.pkgconfig; igraph = pkgs.igraph; From b7632217aba97b805b79a52f6deb27a0d361a09b Mon Sep 17 00:00:00 2001 From: Lassulus Date: Wed, 17 Oct 2018 00:20:38 +0200 Subject: [PATCH 856/992] gitolite 3.6.7 -> 3.6.10 (#48562) --- pkgs/applications/version-management/gitolite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 78b59f59e949..0150c6021da6 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gitolite-${version}"; - version = "3.6.7"; + version = "3.6.10"; src = fetchFromGitHub { owner = "sitaramc"; repo = "gitolite"; - rev = "9123ae44b14b9df423a7bf1e693e05865ca320ac"; - sha256 = "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb"; + rev = "v${version}"; + sha256 = "0p2697mn6rwm03ndlv7q137zczai82n41aplq1g006ii7f12xy8h"; }; buildInputs = [ git nettools perl ]; From 6a23e11e658b7a7a77f1b61d30d64153b46bc852 Mon Sep 17 00:00:00 2001 From: sjau Date: Wed, 17 Oct 2018 00:48:23 +0200 Subject: [PATCH 857/992] Flexget: 2.15.1 -> 2.16.2 (#48583) --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index d10043751599..6e1d008e0d36 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -36,11 +36,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.15.1"; + version = "2.16.2"; src = fetchPypi { inherit pname version; - sha256 = "0c0qyafm01j94m9vky6x4k6j6g3nygzhgm79fb25brc2fyydkm3c"; + sha256 = "1b9nyrg1r69kmwhpmw9pxdrwa9pnw5mphpdlki85cpxiii2sms9j"; }; postPatch = '' From 1e3ce59e7d1da5f8ccee921d58bec909e91c9c0c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 16 Oct 2018 18:09:22 -0500 Subject: [PATCH 858/992] git-recent: 1.0.4 -> 1.1.0 --- .../version-management/git-and-tools/git-recent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index 82bcbf74a9eb..c52a78ff0076 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "git-recent-${version}"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-recent"; rev = "v${version}"; - sha256 = "0dbnm5b2v04fy0jgzphm3xvz9scx0n4p10fw8wjd0cy56308h79k"; + sha256 = "06r1jzmzdv3d4vxdh5qyf5g5rgavxfmh2rpbs7a7byg3k7d77hpn"; }; buildInputs = [ makeWrapper ]; From 7131749bee3742b18b0000554676bb3d760976ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Wed, 17 Oct 2018 01:18:46 +0200 Subject: [PATCH 859/992] pythonPackages.cligj: 0.4.0 -> 0.5.0 (#48584) --- pkgs/development/python-modules/cligj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index c47a15d64bbc..0ec82efed8b2 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "cligj"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "mapbox"; repo = "cligj"; rev = version; - sha256 = "0fclxagxv23v75yiypb29a8sja23dakhvmx3blmxyhg2sci92sx8"; + sha256 = "13vlibbn86dhh6iy8k831vsa249746jnk419wcr9vvr3pqxml6g2"; }; propagatedBuildInputs = [ From 0c8cdb53f62a3997ab5471b0d32a85dac9231009 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 16 Oct 2018 23:21:29 +0000 Subject: [PATCH 860/992] chromium: fix aarch64 build (#48586) * chromium: fix aarch64 build * chromium: use more stable urls --- .../networking/browsers/chromium/common.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6b9f7225c84f..acd3493fe7c8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -140,8 +140,26 @@ let ./patches/fix-freetype.patch ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch - ] ++ optional enableWideVine ./patches/widevine.patch; - + ] ++ optional enableWideVine ./patches/widevine.patch + ++ optional ((versionRange "69" "70") && stdenv.isAarch64) + (fetchpatch { + url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch; + sha256 = "0f37rsjx7jcvdngkj8y6600091nwgn4jci0ny7bxlapq0zx2a4x7"; + }) + ++ optional stdenv.isAarch64 + (if (versionOlder version "71") then + fetchpatch { + url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; + sha256 = "0dkchqair8cy2f5a5p5vi24r9b4d28pgn2bfvm1568lypbjw6iab"; + } + else + fetchpatch { + url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch; + postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64"; + sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s"; + } + ); + postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ From d8410167d1a5c3f84a4bf88995528a3e788db9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9A=A0=E5=B2=90=E5=A5=88?= Date: Tue, 16 Oct 2018 18:31:14 -0500 Subject: [PATCH 861/992] linux_testing_bcachefs: 4.18.2018.09.21 -> 4.18.2018.10.12 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index f58ab5c95cc4..b4df3b7b33e8 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.18.2018.09.21"; + version = "4.18.2018.10.12"; modDirVersion = "4.18.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "2fe17e38d355271a8212a8123a9281e2f9df811f"; - sha256 = "1p35qf7fdwpr8sz4alblmbq6rmhd87rwrrwk6xpgxsfkkhmf36d6"; + rev = "d7f6da1d60ec24266301231538ff6f09716537ed"; + sha256 = "05d7dh41nc35www8vmrn47wlf2mr2b8i4rm15vq3zgm32d0xv3lk"; }; extraConfig = "BCACHEFS_FS m"; From 0c4a7a86fd26a45c44c258181f7e2d977071b95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9A=A0=E5=B2=90=E5=A5=88?= Date: Tue, 16 Oct 2018 18:31:53 -0500 Subject: [PATCH 862/992] bcachefs-tools: 2018-08-22 -> 2018-10-12 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index ee1ee2e61789..75737e2da7fc 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -2,12 +2,12 @@ , liburcu, zlib, libaio, zstd, lz4 }: stdenv.mkDerivation rec { - name = "bcachefs-tools-unstable-2018-08-22"; + name = "bcachefs-tools-unstable-2018-10-12"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "ebf97e8e01a8e76ff4bec23f29106430852c3081"; - sha256 = "0f2ycin0gmi1a4fm7qln0c10zn451gljfbc2piy1fm768xqqrmld"; + rev = "55fbb25501330038e1714905b9ddeb25d875c11c"; + sha256 = "0cwzbyf133jc0fkc8nmjcvv3wmglqhyxda1hh10hgxrbq5vm39wx"; }; enableParallelBuilding = true; From 76db7492db2465f4bd63bfedf6f34d27b26b4b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 17 Oct 2018 00:47:02 +0100 Subject: [PATCH 863/992] python3.pkgs.pyls: 0.2.1 -> 0.3.0 --- pkgs/development/python-modules/pyls-black/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index 60f6af287652..10c34dd8353c 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "pyls-black"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "rupert"; repo = "pyls-black"; rev = "v${version}"; - sha256 = "0xa3iv8nhnj0lw0dh41qb0dqp55sb6rdxalbk60v8jll6qyc0si8"; + sha256 = "1pagbafb9r9glzy7nbvrq19msjy4wqahrvmc0wll0a0r4msqpi1d"; }; disabled = !isPy3k; @@ -19,9 +19,6 @@ buildPythonPackage rec { pytest ''; - # Enable when https://github.com/rupert/pyls-black/pull/6 is merged. - doCheck = false; - checkInputs = [ pytest ]; propagatedBuildInputs = [ black toml python-language-server ]; From 0e0894c37d398c9c0fe8bf52815c7cef127ac583 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Oct 2018 21:48:43 -0500 Subject: [PATCH 864/992] lib/systems: add uname attrs --- lib/systems/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 5eacc9eb23e1..6c6ce5c6ef62 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -46,6 +46,24 @@ rec { # Misc boolean options useAndroidPrebuilt = false; useiOSPrebuilt = false; + + # Output from uname + uname = { + # uname -s + system = if final.isLinux then "Linux" + else if final.isDarwin then "Darwin" + else if final.isWindows then "Windows" + else if final.isFreeBSD then "FreeBSD" + else if final.isNetBSD then "NetBSD" + else if final.isOpenBSD then "OpenBSD" + else null; + + # uname -p + processor = final.parsed.cpu.name; + + # uname -r + release = null; + }; } // mapAttrs (n: v: v final.parsed) inspect.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; From b3041b44552f50109760e7fa41a16636e4b4d5c0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Oct 2018 21:50:37 -0500 Subject: [PATCH 865/992] make-derivation: set CMAKE_SYSTEM_* when cross compiling Uses uname data to find what to set these variables: - CMAKE_SYSTEM_NAME - CMAKE_SYSTEM_PROCESSOR - CMAKE_SYSTEM_VERSION - CMAKE_HOST_SYSTEM_NAME - CMAKE_HOST_SYSTEM_PROCESSOR - CMAKE_HOST_SYSTEM_VERSION --- pkgs/stdenv/generic/make-derivation.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 2db40fc43e36..e06faed30a1e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -41,6 +41,7 @@ rec { # Configure Phase , configureFlags ? [] + , cmakeFlags ? [] , # Target is not included by default because most programs don't care. # Including it then would cause needless mass rebuilds. # @@ -225,6 +226,17 @@ rec { inherit doCheck doInstallCheck; inherit outputs; + } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { + cmakeFlags = + (/**/ if lib.isString cmakeFlags then [cmakeFlags] + else if cmakeFlags == null then [] + else cmakeFlags) + ++ lib.optional (stdenv.hostPlatform.uname.system != null) "-DCMAKE_SYSTEM_NAME=${stdenv.hostPlatform.uname.system}" + ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" + ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.release}" + ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" + ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" + ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"; } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { From 0397453f1a8145d68e9627ad7f2e39d57732c651 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Oct 2018 21:51:48 -0500 Subject: [PATCH 866/992] boost: remove broken patch the boost url is broken - remove for now --- pkgs/development/libraries/boost/generic.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 1ab0718e7960..609e240e0c29 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -101,21 +101,15 @@ stdenv.mkDerivation { inherit src; - patchFlags = optionalString (stdenv.hostPlatform.libc == "msvcrt") "-p0"; patches = patches - ++ optional stdenv.isDarwin ./darwin-no-system-python.patch - ++ optional (stdenv.hostPlatform.libc == "msvcrt") (fetchurl { - url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/" - + "boost-mingw.patch"; - sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj"; - }); + ++ optional stdenv.isDarwin ./darwin-no-system-python.patch; meta = { homepage = http://boost.org/; description = "Collection of C++ libraries"; license = stdenv.lib.licenses.boost; - platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) platforms.unix; + platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) platforms.all; maintainers = with maintainers; [ peti wkennington ]; }; From 51e5f8af42cd51bcf3cb5c86796bca4c5af02365 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Oct 2018 21:52:38 -0500 Subject: [PATCH 867/992] =?UTF-8?q?treewide:=20don=E2=80=99t=20set=20CMAKE?= =?UTF-8?q?=5FSYSTEM=5FNAME?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/msgpack/generic.nix | 2 -- pkgs/development/libraries/nlohmann_json/default.nix | 2 -- pkgs/tools/compression/brotli/default.nix | 4 ---- pkgs/tools/text/html-tidy/default.nix | 3 --- 4 files changed, 11 deletions(-) diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 306becf0c180..de277329961b 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { cmakeFlags = [] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DMSGPACK_BUILD_EXAMPLES=OFF" - ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "msvcrt") - "-DCMAKE_SYSTEM_NAME=Windows" ; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index ffb735e725ae..25d4386cec2c 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBuildTests=${if doCheck then "ON" else "OFF"}" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ - "-DCMAKE_SYSTEM_NAME=Windows" ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 754c0e581563..3b4d5519028b 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = stdenv.lib.optional - (stdenv.hostPlatform.libc == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows"; - outputs = [ "out" "dev" "lib" ]; doCheck = true; @@ -59,4 +56,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 51ce4baa0beb..fcdba6cbba48 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -13,9 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; - cmakeFlags = stdenv.lib.optional - (stdenv.hostPlatform.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows"; - # ATM bin/tidy is statically linked, as upstream provides no other option yet. # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107 From 8652631b138b7cfd1f25a6e72a6e971dc232290a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Oct 2018 21:56:58 -0500 Subject: [PATCH 868/992] systems/doubles.nix: add mingw doubles this makes it easier to show what supports windows vs. unix. --- lib/systems/doubles.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index a00165db1716..3d45935bc076 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -15,6 +15,8 @@ let "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux" "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" + + "x86_64-mingw32" "i686-mingw32" ]; allParsed = map parse.mkSystemFromString all; @@ -43,6 +45,7 @@ in rec { netbsd = filterDoubles predicates.isNetBSD; openbsd = filterDoubles predicates.isOpenBSD; unix = filterDoubles predicates.isUnix; + windows = filterDoubles predicates.isWindows; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux"]; } From b4917105425e0927a12fca794290308b4caa9d0f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Oct 2018 21:57:53 -0500 Subject: [PATCH 869/992] sqlite: supports windows --- pkgs/development/libraries/sqlite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 166ea39493bf..92574091558a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { homepage = http://www.sqlite.org/; license = licenses.publicDomain; maintainers = with maintainers; [ eelco np ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } From 007faf02cadc9c88b1c04bbe1efaa601fa3a061b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Oct 2018 22:03:09 -0500 Subject: [PATCH 870/992] boost: use correct platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "platforms.all" could include any possible os (even a machine with no OS at all!). We can’t possible hope to support all of that, so need to be more specific. --- pkgs/development/libraries/boost/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 609e240e0c29..35703c282af0 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation { description = "Collection of C++ libraries"; license = stdenv.lib.licenses.boost; - platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) platforms.all; + platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) (platforms.unix ++ platforms.windows); maintainers = with maintainers; [ peti wkennington ]; }; From 8f64cedf17c320150dabe92813d5016281fab7ae Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 17 Oct 2018 00:12:40 -0400 Subject: [PATCH 871/992] nextpnr: 2018.08.09 -> 2018.10.17 --- pkgs/development/compilers/nextpnr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 5ec3b5f59d88..d6dd0601e624 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { name = "nextpnr-${version}"; - version = "2018.08.09"; + version = "2018.10.17"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "2e02f2d6166c75b1fcec73d268e97e407071a372"; - sha256 = "1f98mkailn75gz5fvhjhnyr0gwa0r8mm3f2sbvgl0yvys8qi08wr"; + rev = "529a595157a2eef24f8529b0de0c504a40ed503b"; + sha256 = "06yp89rpvb2s4zc1qkbcp76kqwkk9s8j2ckblqw547dy5ah2cl7h"; }; nativeBuildInputs = [ cmake ]; From 95e3b53b064c13409ec1e6cfcae3b1b3a1be9d24 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 17 Oct 2018 00:13:05 -0400 Subject: [PATCH 872/992] yosys: 2018.09.30 -> 2018.10.17 --- pkgs/development/compilers/yosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 314fbf354e19..275a25c84959 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -8,14 +8,14 @@ with builtins; stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2018.09.30"; + version = "2018.10.17"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "4d2917447cc14c590b4fee5ba36948fb4ee6884b"; - sha256 = "0b9mmzq2jhx8x8b58nk97fzh70nbhlc3lcfln5facxddv4mp2gl1"; + rev = "yosys-0.8"; + sha256 = "1qwbp8gynlklawzvpa4gdn2x0hs8zln0s3kxjqkhfcjfxffdcpvv"; name = "yosys"; }) From a5de0ca963288ea3b227f28c9b4522f342e9faeb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Oct 2018 23:19:34 -0500 Subject: [PATCH 873/992] treewide: preserve hashes avoid mass rebuild from the last commits --- pkgs/development/libraries/boost/generic.nix | 2 ++ pkgs/tools/compression/brotli/default.nix | 2 ++ pkgs/tools/text/html-tidy/default.nix | 2 ++ 3 files changed, 6 insertions(+) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 35703c282af0..bb8dff83d321 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -101,6 +101,8 @@ stdenv.mkDerivation { inherit src; + patchFlags = ""; + patches = patches ++ optional stdenv.isDarwin ./darwin-no-system-python.patch; diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 3b4d5519028b..7047eeeefa61 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = []; + outputs = [ "out" "dev" "lib" ]; doCheck = true; diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index fcdba6cbba48..1974c0aa4f36 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; + cmakeFlags = []; + # ATM bin/tidy is statically linked, as upstream provides no other option yet. # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107 From 1ba50fe163b03b4e1083c8baaa112c827f5197ab Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Oct 2018 10:36:50 -0400 Subject: [PATCH 874/992] pythonPackages.gidgethub: init at 2.5.0 --- .../python-modules/gidgethub/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/gidgethub/default.nix diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix new file mode 100644 index 000000000000..2a06ae1cb6df --- /dev/null +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, pytestrunner +, pytest +, pytest-asyncio +, twisted +, treq +, tornado +, aiohttp +, uritemplate +}: + +buildPythonPackage rec { + pname = "gidgethub"; + version = "2.5.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "d37fdfd149bc0efa21d3899c737d9b5c7ff6348a9b3f03bf3aa0e9f8ca345483"; + }; + + buildInputs = [ setuptools pytestrunner ]; + checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; + propagatedBuildInputs = [ uritemplate ]; + + # requires network (reqests github.com) + doCheck = false; + + meta = with stdenv.lib; { + description = "An async GitHub API library"; + homepage = https://github.com/brettcannon/gidgethub; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2c0c7c1b27a..981b3146a078 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -340,6 +340,8 @@ in { genanki = callPackage ../development/python-modules/genanki { }; + gidgethub = callPackage ../development/python-modules/gidgethub { }; + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; From ef927360e3c71418f833e1b7cb5a73e42973050e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 17 Oct 2018 14:53:39 +0800 Subject: [PATCH 875/992] unifiStable: 5.8.30 -> 5.9.29 --- pkgs/servers/unifi/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index ae7dd9805776..fd1787d4c99d 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,13 +49,9 @@ in rec { }; unifiStable = generic { - version = "5.8.30"; - sha256 = "051cx1y51xmhvd3s8zbmknrcjdi46mj4yf1rlnngzr77rj77sqvi"; - }; - - unifiTesting = generic { version = "5.9.29"; - suffix = "-04b5d20997"; sha256 = "0djdjh7lwaa5nvhvz2yh6dn07iad5nq4jpab7rc909sljl6wvwvx"; }; + + unifiTesting = unifiStable; } From 3055a0c9755c89616257c5d8318a32dc42b01341 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 12 Oct 2018 13:39:26 -0400 Subject: [PATCH 876/992] lirc: add support for Python bindings --- pkgs/development/libraries/lirc/default.nix | 20 +++++++++++++------- pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index ad6d2df1d8bd..13fbe2b55b67 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, alsaLib, help2man, pkgconfig, xlibsWrapper, python3 -, libxslt, systemd, libusb, libftdi1 }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3, + alsaLib, xlibsWrapper, libxslt, systemd, libusb, libftdi1 }: stdenv.mkDerivation rec { name = "lirc-0.10.1"; @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb"; }; + # Fix installation of Python bindings + patches = [ (fetchpatch { + url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch"; + sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly"; + }) ]; + postPatch = '' patchShebangs . @@ -24,17 +30,17 @@ stdenv.mkDerivation rec { touch lib/lirc/input_map.inc ''; - nativeBuildInputs = [ pkgconfig help2man ]; + nativeBuildInputs = [ autoreconfHook pkgconfig help2man + (python3.withPackages (p: with p; [ pyyaml setuptools ])) ]; - buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ] - ++ (with python3.pkgs; [ python pyyaml setuptools ]); + buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ]; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" "--with-systemdsystemunitdir=$(out)/lib/systemd/system" - "--enable-uinput" # explicite activation because build env has no uinput - "--enable-devinput" # explicite activation because build env has not /dev/input + "--enable-uinput" # explicit activation because build env has no uinput + "--enable-devinput" # explicit activation because build env has no /dev/input ]; installFlags = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 981b3146a078..f5b747b165c1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2929,6 +2929,10 @@ in { }; }; + lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { + python3 = python; + })); + jupyter = buildPythonPackage rec { version = "1.0.0"; name = "jupyter-${version}"; From 725fcdef3f675e96e591377ff9776c72edb13c60 Mon Sep 17 00:00:00 2001 From: clefru Date: Wed, 17 Oct 2018 09:18:52 +0200 Subject: [PATCH 877/992] Fix hostapd's place in systemd dependency tree. (#45464) * nat/bind/dhcp.service: Remove. Those services have nothing to do with a link-level service. * sys-subsystem-net-devices-${if}.device: Add as BindsTo dependency as this will make hostapd stop when the device is unplugged. * network-link-${if}.service: Add hostapd as dependency for this service via requiredBy clause, so that the network link is only considered to be established only after hostapd has started. * network.target: Remove this from wantedBy clause as this is already implied from dependencies stacked above hostapd. And if it's not implied than starting hostapd is not required for this particular network configuration. --- nixos/modules/services/networking/hostapd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 3af0441a89d8..9f74e4963296 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -157,9 +157,9 @@ in { description = "hostapd wireless AP"; path = [ pkgs.hostapd ]; - wantedBy = [ "network.target" ]; - - after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service" "sys-subsystem-net-devices-${cfg.interface}.device" ]; + after = [ "sys-subsystem-net-devices-${cfg.interface}.device" ]; + bindsTo = [ "sys-subsystem-net-devices-${cfg.interface}.device" ]; + requiredBy = [ "network-link-${cfg.interface}.service" ]; serviceConfig = { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}"; From 0800c3a72208eaf9d2087c72746da46b69b10483 Mon Sep 17 00:00:00 2001 From: "Christoph Neidahl (OPNA2608)" Date: Wed, 17 Oct 2018 10:09:16 +0200 Subject: [PATCH 878/992] x11vnc: don't build broken Xdummy script patching the currently broken Xdummy script out of the Makefile.am, else it gets put into bin. this is not a regression of functionality, as it doesn't appear to be put into bin in the upstream version either. --- pkgs/tools/X11/x11vnc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 51307f0df09f..9e38a2bc888e 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { --replace '"/bin/true"' '"${coreutils}/bin/true"' sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h + sed -i -e '/^\tXdummy.c\ \\$/,$d' -e 's/\tx11vnc_loop\ \\/\tx11vnc_loop/' misc/Makefile.am ''; meta = with stdenv.lib; { From 17f1eebb5be05c96d56754a585b4672015abb706 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Tue, 2 Oct 2018 19:52:27 +0300 Subject: [PATCH 879/992] pythonPackages.pvlib: 0.5.2 -> 0.6.0 --- pkgs/development/python-modules/pvlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 296b20fac4a2..34134546f56d 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1897v9qq97nk5n0hfm9089yz8pffd42795mnhcyq48g9bsyap1xi"; + sha256 = "1j2p6w41hv7k604jbcpxvs5f04y8dsfdvd3d202l60ks0fc0agyj"; }; checkInputs = [ pytest ]; From 4051fc901b52c233b7fa3f4ee2ac390ed3406583 Mon Sep 17 00:00:00 2001 From: Anatolii Prylutskyi Date: Wed, 17 Oct 2018 08:08:44 +0300 Subject: [PATCH 880/992] rambox: fix invalid sha256 --- pkgs/applications/networking/instant-messengers/rambox/bare.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 2a80349c4e62..e08fdad50fb4 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit src; nodejs = nodejs-8_x; - sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr"; + sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0"; }; patches = [ ./isDev.patch ]; From 695156e1f5f4cbb0b4fe356c8d1a8bf2796c0681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 15:08:52 +0200 Subject: [PATCH 881/992] pdfpc: 4.1.2 -> 4.2.1 --- pkgs/applications/misc/pdfpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index e61613a4b305..adfd9fa7eac4 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.1.2"; + version = "4.2.1"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "01c2bswvxqk4biidpfj3hzf0kdk69i56ibk2wfi8v50qm105psli"; + sha256 = "1rmsrpf5vlqhnyyrhq8apndny88ld2qvfjx6258653pqbimv7mx5"; }; nativeBuildInputs = [ From b8e6e15e0605d4479fc32a41e1e39f9b3fd987a0 Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Wed, 17 Oct 2018 14:36:04 +0100 Subject: [PATCH 882/992] python.sasmodels: unstable -> 0.98 --- pkgs/development/python-modules/sasmodels/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index d84e83299039..88cdbf8a8fd8 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -3,14 +3,14 @@ }: buildPythonPackage rec { - pname = "sasmodels-unstable"; - version = "2018-04-27"; + pname = "sasmodels"; + version = "0.98"; src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; - rev = "33969b656596e8b6cc8ce934cd1f8062f7b11cf2"; - sha256 = "00rvhafg08qvx0k9mzn1ppdkc9i5yfn2gr3hidrf416srf8zgb85"; + rev = "v${version}"; + sha256 = "02y4lpjwaa73pr46ylk0pw0kbill4nfzqgnfv16v5m0z9smd76ir"; }; buildInputs = [ opencl-headers ]; From 6be90bf8d7fb07c5ee80dd02fd8cbb242ca2c1af Mon Sep 17 00:00:00 2001 From: Adam Washington Date: Wed, 17 Oct 2018 14:36:46 +0100 Subject: [PATCH 883/992] sasmodels: unstable -> 4.2.0 --- pkgs/applications/science/misc/sasview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index bad29df9dc88..ed6fa3ae886b 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -17,7 +17,7 @@ in python.pkgs.buildPythonApplication rec { pname = "sasview"; - version = "unstable-2018-05-05"; + version = "4.2.0"; checkInputs = with python.pkgs; [ pytest @@ -60,8 +60,8 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "SasView"; repo = "sasview"; - rev = "de431924d0ddf73cfb952df88bd6661181947019"; - sha256 = "01bk0i0g65yzyq16n1a61rgjna8rrc2i51x2ndf1z7khb1fl16vg"; + rev = "v${version}"; + sha256 = "0k3486h46k6406h0vla8h68fd78wh3dcaq5w6f12jh6g4cjxv9qa"; }; patches = [ ./pyparsing-fix.patch ./local_config.patch ]; From e964c2dda632381caa5971bf5579ec5d19b00620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 16:02:38 +0200 Subject: [PATCH 884/992] python3.pkgs.voluptuous-serialize: 2018-03-10 -> 2.0.0 --- .../voluptuous-serialize/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index e2796ee2a74e..05d372ec47df 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -1,17 +1,14 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, voluptuous, pytest }: +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, voluptuous, pytest }: buildPythonPackage rec { pname = "voluptuous-serialize"; - version = "2018-03-10"; + version = "2.0.0"; disabled = !isPy3k; - # no tests in PyPI tarball - src = fetchFromGitHub { - owner = "balloob"; - repo = pname; - rev = "567f0d96f928cf6c30c9f1b8bdee729e651aac82"; - sha256 = "0b16f1bxlqyvi1hy8wmzp2k0rzqcycmdhs8zwsyx0swnvkgwnv50"; + src = fetchPypi { + inherit pname version; + sha256 = "44be04d87aec34bd7d31ab539341fadc505205f2299031ed9be985112c21aa41"; }; propagatedBuildInputs = [ @@ -26,6 +23,9 @@ buildPythonPackage rec { py.test ''; + # no tests in PyPI tarball + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/balloob/voluptuous-serialize; license = licenses.asl20; From 4035086bafadaa92d7993c27b9a63124f024d0fc Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 17 Oct 2018 14:28:29 +0000 Subject: [PATCH 885/992] oraclejdk8: 8u181 -> 8u191 (#48624) --- pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 10 +++++----- pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 55faf277b159..48304b6af264 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "181"; + patchVersion = "191"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; - sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; - sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; - sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; + sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4"; + sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk"; + sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v"; + sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 55faf277b159..48304b6af264 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "181"; + patchVersion = "191"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np"; - sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q"; - sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7"; - sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad"; + sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4"; + sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk"; + sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v"; + sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; From 54de840aaf156169bf8e3bf15e4968a12b78a8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 17 Oct 2018 11:29:49 -0300 Subject: [PATCH 886/992] theme-obsidian2: 2.6 -> 2.7 (#48601) --- pkgs/misc/themes/obsidian2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix index 61f7d1debcc0..571639a99014 100644 --- a/pkgs/misc/themes/obsidian2/default.nix +++ b/pkgs/misc/themes/obsidian2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "theme-obsidian2-${version}"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-obsidian-2"; rev = "v${version}"; - sha256 = "1bb629y11j79h0rxi36iszki6m6l59iwlcraygr472gf44a2xp11"; + sha256 = "0my3q7xvi6m257x489wync0y5n8n1kig4xg5gfrb905avhxj5frs"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 4e20de39ab7d80f644847174e6114b86c1f58220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 16:24:34 +0200 Subject: [PATCH 887/992] python.pkgs.paho-mqtt: 1.1 -> 1.4.0 --- .../python-modules/paho-mqtt/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------- 2 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/paho-mqtt/default.nix diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix new file mode 100644 index 000000000000..d58b31ffc04b --- /dev/null +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +, pytestrunner, pytest, mock }: + +buildPythonPackage rec { + pname = "paho-mqtt"; + version = "1.4.0"; + + # No tests in PyPI tarball + src = fetchFromGitHub { + owner = "eclipse"; + repo = "paho.mqtt.python"; + rev = "v${version}"; + sha256 = "1xg9ppz2lqacd9prsrx93q2wfkjjyla03xlfw74aj1alz9ki5hrs"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "pylama" "" + substituteInPlace setup.cfg --replace "--pylama" "" + ''; + + checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock; + + meta = with lib; { + homepage = https://eclipse.org/paho; + description = "MQTT version 3.1.1 client class"; + license = licenses.epl10; + maintainers = with maintainers; [ mog dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67b209a60472..fe0589c57343 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8730,24 +8730,7 @@ in { bottleneck = callPackage ../development/python-modules/bottleneck { }; - paho-mqtt = buildPythonPackage rec { - name = "paho-mqtt-${version}"; - version = "1.1"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/paho-mqtt/${name}.tar.gz"; - sha256 = "07i6k9mw66kgbvjgsrcsd2sjji9ckym50dcxnmhjqfkfzsg64yhg"; - }; - - meta = { - homepage = "https://eclipse.org/paho/"; - description = "mqtt library for machine to machine and internet of things"; - license = licenses.epl10; - maintainers = with maintainers; [ mog ]; - }; - }; + paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; pamqp = buildPythonPackage rec { version = "1.6.1"; From 6ed5b4624dd660a7af8137273c8b1818f70a30ca Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 17 Oct 2018 10:50:43 +0200 Subject: [PATCH 888/992] grafana: 5.2.4 -> 5.3.1 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index e795d74fe989..b3a31d2d1ba1 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.2.4"; + version = "5.3.1"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "15w935i22ddx6ff32ynypjh3q670vnrj74qw0vdkxdmrlwk3q7wc"; + sha256 = "0k4jsqgk0wbp1xc159vrs855d42kcdc4d38v498imp6a90idniyp"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "187dqjahz1z1gkcx9pxnf2hri6g3b5j3ppadwfahz0rwsqj4v2lf"; + sha256 = "133ckn5f4l6vqy65y1z3mzhzhy8xcyq65nqb34mwn2zsi7pzvssz"; }; postPatch = '' From d447f01ec6f9c69b0387f1a53c5f7bc3ca050995 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 17 Oct 2018 09:49:39 -0500 Subject: [PATCH 889/992] gpa: 0.9.10 -> 0.10.0 (#48620) https://lists.gnupg.org/pipermail/gnupg-announce/2018q4/000430.html --- pkgs/applications/misc/gpa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index 149092c70d38..a48890144127 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: stdenv.mkDerivation rec { - name = "gpa-0.9.10"; + name = "gpa-0.10.0"; src = fetchurl { url = "mirror://gnupg/gpa/${name}.tar.bz2"; - sha256 = "09xphbi2456qynwqq5n0yh0zdmdi2ggrj3wk4hsyh5lrzlvcrff3"; + sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm"; }; nativeBuildInputs = [ intltool pkgconfig ]; From d3657f676638ef8e8e024998b26a7d46e922d481 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 17 Oct 2018 00:45:25 +0200 Subject: [PATCH 890/992] speedtest-cli: move ot python-modules --- .../python-modules/speedtest-cli/default.nix | 26 +++++++++++++++++++ .../networking/speedtest-cli/default.nix | 21 --------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 4 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/speedtest-cli/default.nix delete mode 100644 pkgs/tools/networking/speedtest-cli/default.nix diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix new file mode 100644 index 000000000000..f2c38a3414ba --- /dev/null +++ b/pkgs/development/python-modules/speedtest-cli/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +# cannot be built as pythonApplication because the library functions are +# required for home-assistant +buildPythonPackage rec { + pname = "speedtest-cli"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "2f3d5aa1086d9b367c03b99db6e3207525af174772d877c6b982289b8d2bdefe"; + }; + + # tests require working internet connection + doCheck = false; + + meta = with lib; { + description = "Command line interface for testing internet bandwidth using speedtest.net"; + homepage = https://github.com/sivel/speedtest-cli; + license = licenses.asl20; + maintainers = with maintainers; [ makefu domenkozar ndowens ]; + }; +} diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix deleted file mode 100644 index eedea841356d..000000000000 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchFromGitHub, python3Packages }: - -python3Packages.buildPythonApplication rec { - name = "speedtest-cli-${version}"; - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "sivel"; - repo = "speedtest-cli"; - rev = "v${version}"; - sha256 = "0vv2z37g2kgm2dzkfa4bhri92hs0d1acxi8z66gznsl5148q7sdi"; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/sivel/speedtest-cli; - description = "Command line interface for testing internet bandwidth using speedtest.net"; - platforms = platforms.all; - license = licenses.asl20; - maintainers = with maintainers; [ domenkozar ndowens ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c118561c8b7..bd1f0fbd2e83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8784,7 +8784,7 @@ with pkgs; sparse = callPackage ../development/tools/analysis/sparse { }; - speedtest-cli = callPackage ../tools/networking/speedtest-cli { }; + speedtest-cli = with python3Packages; toPythonApplication speedtest-cli; spin = callPackage ../development/tools/analysis/spin { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee1bee109a3f..4087b58bd487 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15458,6 +15458,8 @@ EOF }; }; + speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; + pushbullet = callPackage ../development/python-modules/pushbullet { }; power = buildPythonPackage rec { From f0c643a99e8813df39bcff497ccf29361a26fe88 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 17 Oct 2018 00:51:39 +0200 Subject: [PATCH 891/992] home-assistant: add speedtest-cli to component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a67de2dab1aa..c1b35946d684 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -998,7 +998,7 @@ "sensor.sochain" = ps: with ps; [ ]; "sensor.socialblade" = ps: with ps; [ ]; "sensor.sonarr" = ps: with ps; [ ]; - "sensor.speedtest" = ps: with ps; [ ]; + "sensor.speedtest" = ps: with ps; [ speedtest-cli ]; "sensor.spotcrime" = ps: with ps; [ ]; "sensor.sql" = ps: with ps; [ sqlalchemy ]; "sensor.startca" = ps: with ps; [ xmltodict ]; From 7026831c7ac5790ab61cd60a1228c1b07b001178 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 17 Oct 2018 14:33:07 +0100 Subject: [PATCH 892/992] bundler: 1.16.3 -> 1.16.6 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 7f89d1ffa87c..65cde9815029 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.16.3"; - source.sha256 = "0spddjiq6yscl4sywwcj5zrjk3lq02zacigrz2fh78yfdzyi34fq"; + version = "1.16.4"; + source.sha256 = "15zrxqv817w4vawc23lx3miigir36ba59wkykkr6l1nkf0iy013d"; dontPatchShebangs = true; postFixup = '' From 5ef745b98379fc05fba250fa2c865d41ed66eac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 17:47:35 +0200 Subject: [PATCH 893/992] esptool: 2.5.0 -> 2.5.1 --- pkgs/tools/misc/esptool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index abb0b4edc17e..fe574b4f8d43 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "0cvxapcln1xcz8hy0hidw6g8q61s5j3q03j3wrviagbh0zip8jdx"; + sha256 = "19l3b1fqg1n3ch484dcibbi5a3nbmjq086has5pwqn348h4k57mh"; }; checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ]; From 280b1171c11eabdddb5b34ecef3f6d7b1147463d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 17:49:33 +0200 Subject: [PATCH 894/992] seafile-shared: 6.2.4 -> 6.2.5 --- pkgs/misc/seafile-shared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 6fba977e0085..bccc55914fea 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: stdenv.mkDerivation rec { - version = "6.2.4"; + version = "6.2.5"; name = "seafile-shared-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "0v6wvw8x3zfcapi0lk71mg89gy3gw2qmdiq6mhw6qbbrzvqprlmr"; + sha256 = "1s8cqh5wfll81d060f4zknxhmwwqckci6dadmslbvbvx55lgyspa"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; From d37bb7302fad56bf01bb3cf06436c9558119e08c Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Tue, 16 Oct 2018 16:44:02 +0200 Subject: [PATCH 895/992] openafs_1_8: 1.8.0 -> 1.8.2 This release adds support for ARM64. --- pkgs/servers/openafs/1.8/cross-build.patch | 223 +++++++++++++++++++++ pkgs/servers/openafs/1.8/default.nix | 12 +- pkgs/servers/openafs/1.8/module.nix | 4 +- pkgs/servers/openafs/1.8/srcs.nix | 6 +- 4 files changed, 235 insertions(+), 10 deletions(-) create mode 100644 pkgs/servers/openafs/1.8/cross-build.patch diff --git a/pkgs/servers/openafs/1.8/cross-build.patch b/pkgs/servers/openafs/1.8/cross-build.patch new file mode 100644 index 000000000000..2b4fd58b23a4 --- /dev/null +++ b/pkgs/servers/openafs/1.8/cross-build.patch @@ -0,0 +1,223 @@ +diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new/configure.ac +--- openafs-1.8.2/configure.ac 2018-09-11 17:52:48.000000000 +0200 ++++ openafs-1.8.2.new/configure.ac 2018-10-16 15:56:36.512277860 +0200 +@@ -23,6 +23,7 @@ + + AC_PROG_CC + AC_PROG_LIBTOOL ++AX_PROG_CC_FOR_BUILD + + AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib]) + AC_SUBST([PATH_CPP]) +diff -Nur --unidirectional-new-file openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4 +--- openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 1970-01-01 01:00:00.000000000 +0100 ++++ openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4 2018-10-16 16:20:40.278641658 +0200 +@@ -0,0 +1,125 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_PROG_CC_FOR_BUILD ++# ++# DESCRIPTION ++# ++# This macro searches for a C compiler that generates native executables, ++# that is a C compiler that surely is not a cross-compiler. This can be ++# useful if you have to generate source code at compile-time like for ++# example GCC does. ++# ++# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything ++# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). ++# The value of these variables can be overridden by the user by specifying ++# a compiler with an environment variable (like you do for standard CC). ++# ++# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object ++# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if ++# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are ++# substituted in the Makefile. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Paolo Bonzini ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 9 ++ ++AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) ++AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_CPP])dnl ++AC_REQUIRE([AC_EXEEXT])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ ++dnl Use the standard macros, but make them use other variable names ++dnl ++pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl ++pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl ++pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl ++pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl ++pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl ++pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl ++pushdef([ac_cv_objext], ac_cv_build_objext)dnl ++pushdef([ac_exeext], ac_build_exeext)dnl ++pushdef([ac_objext], ac_build_objext)dnl ++pushdef([CC], CC_FOR_BUILD)dnl ++pushdef([CPP], CPP_FOR_BUILD)dnl ++pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl ++pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl ++pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl ++pushdef([host], build)dnl ++pushdef([host_alias], build_alias)dnl ++pushdef([host_cpu], build_cpu)dnl ++pushdef([host_vendor], build_vendor)dnl ++pushdef([host_os], build_os)dnl ++pushdef([ac_cv_host], ac_cv_build)dnl ++pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl ++pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl ++pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl ++pushdef([ac_cv_host_os], ac_cv_build_os)dnl ++pushdef([ac_cpp], ac_build_cpp)dnl ++pushdef([ac_compile], ac_build_compile)dnl ++pushdef([ac_link], ac_build_link)dnl ++ ++save_cross_compiling=$cross_compiling ++save_ac_tool_prefix=$ac_tool_prefix ++cross_compiling=no ++ac_tool_prefix= ++ ++AC_PROG_CC ++AC_PROG_CPP ++AC_EXEEXT ++ ++ac_tool_prefix=$save_ac_tool_prefix ++cross_compiling=$save_cross_compiling ++ ++dnl Restore the old definitions ++dnl ++popdef([ac_link])dnl ++popdef([ac_compile])dnl ++popdef([ac_cpp])dnl ++popdef([ac_cv_host_os])dnl ++popdef([ac_cv_host_vendor])dnl ++popdef([ac_cv_host_cpu])dnl ++popdef([ac_cv_host_alias])dnl ++popdef([ac_cv_host])dnl ++popdef([host_os])dnl ++popdef([host_vendor])dnl ++popdef([host_cpu])dnl ++popdef([host_alias])dnl ++popdef([host])dnl ++popdef([LDFLAGS])dnl ++popdef([CPPFLAGS])dnl ++popdef([CFLAGS])dnl ++popdef([CPP])dnl ++popdef([CC])dnl ++popdef([ac_objext])dnl ++popdef([ac_exeext])dnl ++popdef([ac_cv_objext])dnl ++popdef([ac_cv_exeext])dnl ++popdef([ac_cv_prog_cc_g])dnl ++popdef([ac_cv_prog_cc_cross])dnl ++popdef([ac_cv_prog_cc_works])dnl ++popdef([ac_cv_prog_gcc])dnl ++popdef([ac_cv_prog_CPP])dnl ++ ++dnl Finally, set Makefile variables ++dnl ++BUILD_EXEEXT=$ac_build_exeext ++BUILD_OBJEXT=$ac_build_objext ++AC_SUBST(BUILD_EXEEXT)dnl ++AC_SUBST(BUILD_OBJEXT)dnl ++AC_SUBST([CFLAGS_FOR_BUILD])dnl ++AC_SUBST([CPPFLAGS_FOR_BUILD])dnl ++AC_SUBST([LDFLAGS_FOR_BUILD])dnl ++]) +diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs-1.8.2.new/src/comerr/Makefile.in +--- openafs-1.8.2/src/comerr/Makefile.in 2018-09-11 17:52:48.000000000 +0200 ++++ openafs-1.8.2.new/src/comerr/Makefile.in 2018-10-16 15:48:19.678898925 +0200 +@@ -38,11 +38,14 @@ + compile_et: compile_et.o error_table.o + $(Q)case $(SYS_NAME) in \ + *_linux* | *_umlinux* | *_darwin* ) \ +- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \ ++ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \ + * ) \ +- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll $(buildtool_roken) $(MT_LIBS);; \ ++ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build -ll $(buildtool_roken) $(MT_LIBS);; \ + esac + ++compile_et compile_et.o error_table.o: CC=$(CC_FOR_BUILD) ++compile_et compile_et.o error_table.o: LD=$(CC_FOR_BUILD) ++ + libafscom_err.a: $(LT_objs) + $(LT_LDLIB_lwp) $(LT_objs) + +diff -Nur --unidirectional-new-file openafs-1.8.2/src/config/Makefile.in openafs-1.8.2.new/src/config/Makefile.in +--- openafs-1.8.2/src/config/Makefile.in 2018-09-11 17:52:48.000000000 +0200 ++++ openafs-1.8.2.new/src/config/Makefile.in 2018-10-16 15:48:19.677898926 +0200 +@@ -54,6 +54,8 @@ + + config.o: config.c AFS_component_version_number.c + ++config mkvers config.o mc.o: CC=$(CC_FOR_BUILD) ++ + # + # Include installation targets + # +diff -Nur --unidirectional-new-file openafs-1.8.2/src/opr/Makefile.in openafs-1.8.2.new/src/opr/Makefile.in +--- openafs-1.8.2/src/opr/Makefile.in 2018-09-11 17:52:48.000000000 +0200 ++++ openafs-1.8.2.new/src/opr/Makefile.in 2018-10-16 15:48:19.678898925 +0200 +@@ -21,7 +21,7 @@ + $(TOP_INCDIR)/opr/time.h \ + $(TOP_INCDIR)/opr/uuid.h + +-all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a ++all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a $(TOP_LIBDIR)/libopr_build.a + + liboafs_opr.la: liboafs_opr.la.sym $(LT_objs) $(LT_deps) + $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) +@@ -29,12 +29,26 @@ + libopr.a: $(LT_objs) + $(LT_LDLIB_static) $(LT_objs) + ++LT_objs_build = $(patsubst %.lo, %_build.lo, $(LT_objs)) ++ ++%_build.lo: %.c ++ $(LT_CCRULE) $< ++ ++libopr_build.a: $(LT_objs_build) ++ $(LT_LDLIB_static) $(LT_objs_build) ++ ++libopr_build.a $(LT_objs_build): CC=$(CC_FOR_BUILD) ++libopr_build.a $(LT_objs_build): LD=$(CC_FOR_BUILD) ++ + libopr_pic.la: $(LT_objs) + $(LT_LDLIB_pic) $(LT_objs) + + $(TOP_LIBDIR)/libopr.a: libopr.a + $(INSTALL_DATA) libopr.a $@ + ++$(TOP_LIBDIR)/libopr_build.a: libopr_build.a ++ $(INSTALL_DATA) libopr_build.a $@ ++ + $(TOP_LIBDIR)/libopr_pic.a: libopr_pic.la + $(INSTALL_DATA) .libs/libopr_pic.a $@ + +diff -Nur --unidirectional-new-file openafs-1.8.2/src/rxgen/Makefile.in openafs-1.8.2.new/src/rxgen/Makefile.in +--- openafs-1.8.2/src/rxgen/Makefile.in 2018-09-11 17:52:48.000000000 +0200 ++++ openafs-1.8.2.new/src/rxgen/Makefile.in 2018-10-16 15:48:19.677898926 +0200 +@@ -25,6 +25,8 @@ + + CFLAGS_rpc_main.o= -DPATH_CPP="\"$(PATH_CPP)\"" + ++rxgen $(OBJS): CC=$(CC_FOR_BUILD) ++ + # + # Install targets + # diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index fc6b1bc2426b..c77bef6ad24e 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, which, autoconf, automake, flex, yacc -, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43 -, libtool_2, removeReferencesTo +{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex +, yacc , glibc, perl, kerberos, libxslt, docbook_xsl +, docbook_xml_dtd_43 , libtool_2, removeReferencesTo , ncurses # Extra ncurses utilities. Only needed for debugging. , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM }: @@ -11,12 +11,13 @@ stdenv.mkDerivation rec { name = "openafs-${version}"; inherit version srcs; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl removeReferencesTo which yacc ]; buildInputs = [ kerberos ncurses ]; - patches = [ ./bosserver.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch; + patches = [ ./bosserver.patch ./cross-build.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch; outputs = [ "out" "dev" "man" "doc" "server" ]; @@ -27,6 +28,9 @@ stdenv.mkDerivation rec { # Makefiles don't include install targets for all new shared libs, yet. dontDisableStatic = true; + # Fixes broken format string in 1.8.2 + hardeningDisable=[ "format" ]; + preConfigure = '' patchShebangs . for i in `grep -l -R '/usr/\(include\|src\)' .`; do diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 7167cf5dec49..958fcd578c2b 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -54,9 +54,7 @@ in stdenv.mkDerivation rec { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.z77z maintainers.spacefrogg ]; - broken = (versionOlder kernel.version "3.18") || - (versionAtLeast kernel.version "4.18") || - stdenv.targetPlatform.isAarch64; + broken = versionOlder kernel.version "3.18"; }; } diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index e51504528999..ffdbe47220d7 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "63fae6b3a4339e4a40945fae1afb9b99a5e7f8e8dbde668938ab8c4ff569fd7d"; + sha256 = "13hksffp7k5f89c9lc5g5b1q0pc9h7wyarq3sjyjqam7c513xz95"; }; srcs = [ src (fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "e26f3bb399f524b4978543eb3ec169fd58f2d409cf4bc22c75c65fb9b09f12e8"; + sha256 = "09n8nymrhpyb0fhahpln2spzhy9pn48hvry35ccqif2jd4wsxdmr"; })]; } From f8b5b5dcb758f307e4de9c93ddf53877b98a0fd5 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Tue, 16 Oct 2018 16:45:21 +0200 Subject: [PATCH 896/992] openafs: 1.6.22.2 -> 1.6.23 Add support for 4.18 kernels. --- pkgs/servers/openafs/1.6/module.nix | 4 ++-- pkgs/servers/openafs/1.6/srcs.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index f5b735158e9c..c133161cf576 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -51,8 +51,8 @@ in stdenv.mkDerivation rec { license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.z77z maintainers.spacefrogg ]; - broken = versionOlder kernel.version "3.18" || - versionAtLeast kernel.version "4.18"; + broken = versionOlder kernel.version "3.18" + || stdenv.targetPlatform.isAarch64; }; } diff --git a/pkgs/servers/openafs/1.6/srcs.nix b/pkgs/servers/openafs/1.6/srcs.nix index 9e9ff623e5cd..17048b68024e 100644 --- a/pkgs/servers/openafs/1.6/srcs.nix +++ b/pkgs/servers/openafs/1.6/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.6.22.2"; + version = "1.6.23"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "15j17igignsfzv5jb47ryczsrz3zsmiqwnj38dx9gzz95807rkyf"; + sha256 = "1gy7a0jhagxif8av540xb1aa6cl7id08nsgjbgady54bnmb0viga"; }; srcs = [ src (fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "1lpydca95nx5pmqvplb9n3akmxbzvhhypswh0s589ywxpv3zynxm"; + sha256 = "18my71s9mddy0k835852ksjzkza7xs73kyxavmdqflh5vkywb6y0"; })]; } From dc427b0ff06a52b65979be536bb20a5edaaa3686 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 17 Oct 2018 21:55:05 +0800 Subject: [PATCH 897/992] pulseaudio-modules-bt: unstable-2018-09-11 -> unstable-2018-10-16 --- .../audio/pulseaudio-modules-bt/default.nix | 35 ++++++++++++++----- .../fix-install-path.patch | 11 ++++++ 2 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index e3d07fcc2457..6bb432b3fd88 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -4,11 +4,14 @@ , libpulseaudio , pulseaudio , pkgconfig +, ffmpeg_4 +, patchelf , libtool , cmake , bluez , dbus , sbc +, lib }: let @@ -20,37 +23,53 @@ let in stdenv.mkDerivation rec { name = "pulseaudio-modules-bt-${version}"; - version = "unstable-2018-09-11"; + version = "unstable-2018-10-16"; src = fetchFromGitHub { owner = "EHfive"; repo = "pulseaudio-modules-bt"; - rev = "9c6ad75382f3855916ad2feaa6b40e37356d80cc"; - sha256 = "1iz4m3y6arsvwcyvqc429w252dl3apnhvl1zhyvfxlbg00d2ii0h"; + rev = "552c2b48c0cc7dd44d0746b261f7c7d5559e8e30"; + sha256 = "052jb1hjx1in7bafx4zpn78s7r6f2y7djriwi36dzqy9wmalmyjy"; fetchSubmodules = true; }; + patches = [ + ./fix-install-path.patch + ]; + nativeBuildInputs = [ pkgconfig + patchelf cmake ]; buildInputs = [ libpulseaudio pulseaudio + ffmpeg_4 libtool bluez dbus sbc ]; - NIX_CFLAGS_COMPILE = [ - "-L${pulseaudio}/lib/pulseaudio" - ]; - - prePatch = '' + postPatch = '' + # Upstream bundles pulseaudio as a submodule rm -r pa ln -s ${pulseSources} pa + + # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions + substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version} + substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version} + ''; + + postFixup = '' + for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do + orig_rpath=$(patchelf --print-rpath "$so") + patchelf \ + --set-rpath "$orig_rpath:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules" \ + "$so" + done ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch new file mode 100644 index 000000000000..2b4ff86ab71b --- /dev/null +++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0f5baa0..1f35cce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,5 +121,4 @@ INSTALL(TARGETS + module-bluez5-device + module-bluetooth-discover + module-bluetooth-policy +- LIBRARY DESTINATION ${PulseAudio_modlibexecdir}) +- ++ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/) From 1ee5cbe9d435af9e179a2fb6ed286c60d26a2054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 17:56:57 +0200 Subject: [PATCH 898/992] abcm2ps: 8.13.24 -> 8.14.0 --- pkgs/tools/audio/abcm2ps/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 023d03f0414d..5d3050108b8a 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, pkgconfig, which, freetype, pango }: +{ stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }: stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.13.24"; + version = "8.14.0"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0xb0gdxbagy6bzrh61s667svab43r06d6yi20gw52dh022mj99ag"; + sha256 = "1nlvq2cfdy5pghll3aprws7yx5p14gcrhz10q9fa6myrd8ad4if1"; }; prePatch = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc}/bin/cc" ]; - nativeBuildInputs = [ which pkgconfig ]; + nativeBuildInputs = [ which pkgconfig docutils ]; buildInputs = [ freetype pango ]; From 8929e036ce2d683f17a27474685a10b13c18f72f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 17 Oct 2018 18:00:51 +0200 Subject: [PATCH 899/992] monero: 0.13.0.2 -> 0.13.0.3 --- pkgs/applications/altcoins/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 2b396c4b938d..e344f4d94bab 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.13.0.2"; + version = "0.13.0.3"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "078iw76ajvaj08rgnx3c13pnq8fxah1z9wwyz54fcnj2349sjbf5"; + sha256 = "03qx8y74zxnmabdi5r3a274pp8zvm3xhkdwi1xf5sb40vf4sfmwb"; }; nativeBuildInputs = [ cmake pkgconfig git ]; From e57438faf030f139bc73e79e28cefa668c2a2edb Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 17 Oct 2018 18:02:11 +0200 Subject: [PATCH 900/992] monero-gui: 0.13.0.2 -> 0.13.0.3 --- pkgs/applications/altcoins/monero-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index c26df670930b..46e317a3b12a 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.13.0.2"; + version = "0.13.0.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "02419rqi3zfy6yjyw3b3gvkbxh2ypdfpijiiklc7lyblb9nnjr68"; + sha256 = "1rvxwz7p1yw9c817n07m60xvmv2p97s82sfzwkg2x880fpxb0gj9"; }; nativeBuildInputs = [ qmake pkgconfig ]; From 6963bc351194ca902577955b9b02eff1482df02f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 17 Oct 2018 18:34:15 +0200 Subject: [PATCH 901/992] bs1770gain: 0.4.12 -> 0.5.0 (#48628) --- pkgs/applications/audio/bs1770gain/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix index 2401a6101566..edf7a313ff5f 100644 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bs1770gain-${version}"; - version = "0.4.12"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/bs1770gain/${name}.tar.gz"; - sha256 = "0n9skdap1vnl6w52fx0gsrjlk7w3xgdwi62ycyf96h29rx059z6a"; + sha256 = "0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii"; }; buildInputs = [ ffmpeg sox ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd8ee2b2a55d..b8b09186acc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15826,9 +15826,7 @@ with pkgs; bristol = callPackage ../applications/audio/bristol { }; - bs1770gain = callPackage ../applications/audio/bs1770gain { - ffmpeg = ffmpeg_2; - }; + bs1770gain = callPackage ../applications/audio/bs1770gain { }; bspwm = callPackage ../applications/window-managers/bspwm { }; From 5179813d98baad08db90e8987107309c654c1848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 17 Oct 2018 13:52:56 -0300 Subject: [PATCH 902/992] deepin-desktop-base: init at 2018.7.23 (#48552) --- .../deepin/deepin-desktop-base/default.nix | 45 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-desktop-base/default.nix diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix new file mode 100644 index 000000000000..5b96e335c67e --- /dev/null +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, deepin-wallpapers }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-desktop-base"; + version = "2018.7.23"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1n1bjkvhgq138jcg3zkwg55r41056x91mh191mirlpvpic574ydc"; + }; + + buildInputs = [ deepin-wallpapers ]; + + postPatch = '' + sed -i Makefile -e "s:/usr:$out:" -e "s:/etc:$out/etc:" + ''; + + postInstall = '' + # Remove Deepin distro's lsb-release + rm $out/etc/lsb-release + + # Don't override systemd timeouts + rm -r $out/etc/systemd + + # Remove apt-specific templates + rm -r $out/share/python-apt + + # Remove empty backgrounds directory + rm -r $out/share/backgrounds + + # Make a symlink for deepin-version + ln -s ../lib/deepin/desktop-version $out/etc/deepin-version + ''; + + meta = with stdenv.lib; { + description = "Base assets and definitions for Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/deepin-desktop-base; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 291aa8c11be1..4e6530c2d18b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -7,6 +7,7 @@ let dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; + deepin-desktop-base = callPackage ./deepin-desktop-base { }; deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { }; deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; From ea691fc8ee9cb4b49342148bac05b73e5068323f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 17 Oct 2018 19:39:49 +0200 Subject: [PATCH 903/992] tdesktopPackages.preview: 1.4.3 -> 1.4.4 --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 03a99aea4001..1e8080fd9c9d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -13,6 +13,8 @@ let in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { + version = "1.4.4"; + sha256Hash = "1m1j485r3vzpglzfn8l4cqskysvkx8l3pqaw3fgp66jfajbxynf0"; stable = false; }); } From 845a364564b2829b3813d5887b85cf98049f4f72 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Oct 2018 12:43:07 -0500 Subject: [PATCH 904/992] zlib: skip configure in windows configure spits out an error when running on windows --- pkgs/development/libraries/zlib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index d348f877f722..fe1c275aeda5 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -82,4 +82,6 @@ stdenv.mkDerivation (rec { preConfigure = '' export CHOST=${stdenv.hostPlatform.config} ''; +} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") { + configurePhase = ":"; }) From b7e17a2efd26f653b8b2a1097d86931d15407689 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Oct 2018 12:43:37 -0500 Subject: [PATCH 905/992] c-ares: disable shared, enable static only static will build for me --- pkgs/development/libraries/c-ares/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 1835356e627d..099d02c82639 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"; }; + configureFlags = if stdenv.hostPlatform.isWindows then [ "--disable-shared" "--enable-static" ] else null; + # ares_android.h header is missing # see issue https://github.com/c-ares/c-ares/issues/216 postPatch = if stdenv.hostPlatform.isAndroid then '' From a7c8e30782ee6b6dd35bc63350b4d55dc589fbc3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Oct 2018 12:44:23 -0500 Subject: [PATCH 906/992] nghttp2: make app optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit windows just needs the libraries & the app won’t build --- pkgs/development/libraries/nghttp2/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 68bffd4032d2..471684ea7ddc 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -6,6 +6,7 @@ , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null , enableJemalloc ? false, jemalloc ? null +, enableApp ? !stdenv.hostPlatform.isWindows }: assert enableHpack -> jansson != null; @@ -35,8 +36,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" "--enable-app" ] - ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; + configureFlags = [ + "--with-spdylay=no" + "--disable-examples" + "--disable-python-bindings" + (stdenv.lib.enableFeature enableApp "app") + ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc From e494e1c4e3135304175e26502946f9d8645d9897 Mon Sep 17 00:00:00 2001 From: "nagato.pain" Date: Tue, 16 Oct 2018 14:57:47 -0700 Subject: [PATCH 907/992] pythonPackages.python-packer: init at 0.1.2 --- .../python-modules/python-packer/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/python-packer/default.nix diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix new file mode 100644 index 000000000000..3f0c1f8138f9 --- /dev/null +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, sh }: + +buildPythonPackage rec { + pname = "python-packer"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "fd363dae9bd2efd447739bbf7a4f29c1e4741596ae7b02d252fe525b2b4176e7"; + }; + + propagatedBuildInputs = [ sh ]; + + # Tests requires network connections + doCheck = false; + + meta = with stdenv.lib; { + description = "An interface for packer.io"; + homepage = https://github.com/nir0s/python-packer; + license = licenses.asl20; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c66fd52d43b..662475469544 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -570,6 +570,8 @@ in { python3-openid = callPackage ../development/python-modules/python3-openid { }; + python-packer = callPackage ../development/python-modules/python-packer { }; + python-periphery = callPackage ../development/python-modules/python-periphery { }; python-prctl = callPackage ../development/python-modules/python-prctl { }; From 37593414201b31e719d796a09d58ba62251979e1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 17 Oct 2018 19:59:15 +0200 Subject: [PATCH 908/992] monkeysphere: 0.41 -> 0.42 --- pkgs/tools/security/monkeysphere/default.nix | 23 +++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index f4def72b728c..228695878dcc 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -1,27 +1,44 @@ { stdenv, fetchurl, makeWrapper , perl, libassuan, libgcrypt , perlPackages, lockfileProgs, gnupg +# For the tests: +, bash, openssh, which, socat, cpio, hexdump }: stdenv.mkDerivation rec { name = "monkeysphere-${version}"; - version = "0.41"; + version = "0.42"; src = fetchurl { url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz"; - sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li"; + sha256 = "1haqgjxm8v2xnhc652lx79p2cqggb9gxgaf19w9l9akar2qmdjf1"; }; patches = [ ./monkeysphere.patch ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl libassuan libgcrypt ]; + buildInputs = [ perl libassuan libgcrypt ] + ++ stdenv.lib.optional doCheck + ([ gnupg openssh which socat cpio hexdump ] ++ + (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ])); makeFlags = '' PREFIX=/ DESTDIR=$(out) ''; + # Not all checks pass yet (NixOS specific problems) and the tests "drain" + # entropy (apparently GnuPG still uses /dev/random). + doCheck = false; + preCheck = '' + patchShebangs tests/keytrans + patchShebangs src/share/keytrans + patchShebangs src/share/checkperms + sed -i "s,/usr/bin/env\ bash,${bash}/bin/bash," tests/basic + sed -i "s,/usr/sbin/sshd,${openssh}/bin/sshd," tests/basic + sed -i "s/<(hd/<(hexdump/" tests/keytrans + ''; + postFixup = let wrapperArgs = runtimeDeps: "--prefix PERL5LIB : " From 07f135c7f55cfb96bd1e49170b98abbbb847da90 Mon Sep 17 00:00:00 2001 From: "Christoph Neidahl (OPNA2608)" Date: Wed, 17 Oct 2018 20:13:07 +0200 Subject: [PATCH 909/992] x11vnc: moving substitutions, commenting sed line moved substitutions to postPatch phase and commented on workaround sed line, as requested in the code reviews --- pkgs/tools/X11/x11vnc/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 9e38a2bc888e..6dc785621b59 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -24,17 +24,21 @@ stdenv.mkDerivation rec { libvncserver ]; - preConfigure = '' - configureFlags="--mandir=$out/share/man" - + postPatch = '' substituteInPlace src/unixpw.c \ --replace '"/bin/su"' '"/run/wrappers/bin/su"' \ --replace '"/bin/true"' '"${coreutils}/bin/true"' sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h + + # Xdummy script is currently broken, so we avoid building it. This removes everything Xdummy-related from the affected Makefile sed -i -e '/^\tXdummy.c\ \\$/,$d' -e 's/\tx11vnc_loop\ \\/\tx11vnc_loop/' misc/Makefile.am ''; + preConfigure = '' + configureFlags="--mandir=$out/share/man" + ''; + meta = with stdenv.lib; { description = "A VNC server connected to a real X11 screen"; homepage = https://github.com/LibVNC/x11vnc/; From c3c82aa675bb32f666d67b320a0f2a624298c0d7 Mon Sep 17 00:00:00 2001 From: Doug Beardsley Date: Wed, 17 Oct 2018 14:44:07 -0400 Subject: [PATCH 910/992] Update developPackage documentation --- .../development/haskell-modules/make-package-set.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 400465264883..5803e2946bff 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -200,12 +200,12 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # , modifier : Defaulted # , returnShellEnv : Defaulted # } -> NixShellAwareDerivation - # Given a path to a haskell package directory whose cabal file is - # named the same as the directory name, an optional set of - # source overrides as appropriate for the 'packageSourceOverrides' - # function, an optional set of arbitrary overrides, and an optional - # haskell package modifier, return a derivation appropriate - # for nix-build or nix-shell to build that package. + # Given a path to a haskell package directory, an optional package name + # which defaults to the base name of the path, an optional set of source + # overrides as appropriate for the 'packageSourceOverrides' function, an + # optional set of arbitrary overrides, and an optional haskell package + # modifier, return a derivation appropriate for nix-build or nix-shell to + # build that package. developPackage = { root , name ? builtins.baseNameOf root From c86495c79892782d97c913d8da460f32a793b4e9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Oct 2018 13:44:41 -0500 Subject: [PATCH 911/992] curl: disable gss on windows --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaa8da74333d..3b819911e7db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2075,7 +2075,7 @@ with pkgs; zlibSupport = true; sslSupport = zlibSupport; scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; - gssSupport = true; + gssSupport = !stdenv.hostPlatform.isWindows; }; curl = callPackage ../tools/networking/curl rec { @@ -2084,7 +2084,7 @@ with pkgs; zlibSupport = true; sslSupport = zlibSupport; scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; - gssSupport = true; + gssSupport = !stdenv.hostPlatform.isWindows; }; curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; From 15c5f9b1f067f98051cfe3374a2775a8ccc6ecf3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 19:56:01 +0200 Subject: [PATCH 912/992] libHX: add licenses --- pkgs/development/libraries/libHX/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 7de72ed73a65..39f493d821c3 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -16,14 +16,15 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - meta = { + meta = with stdenv.lib; { homepage = http://libhx.sourceforge.net/; longDescription = '' libHX is a C library (with some C++ bindings available) that provides data structures and functions commonly needed, such as maps, deques, linked lists, string formatting and autoresizing, option and config file parsing, type checking casts and more. ''; - maintainers = [ stdenv.lib.maintainers.tstrobel ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.tstrobel ]; + platforms = platforms.linux; + license = with licenses; [ gpl3 lgpl21Plus wtfpl ]; }; } From c8709769dcfdaef18ae75e50ad360369f514e7e0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:01:03 +0200 Subject: [PATCH 913/992] lesstif: add license, description, and homepage --- pkgs/development/libraries/lesstif/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index 04e8eab4d287..b678a0893867 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -14,12 +14,15 @@ stdenv.mkDerivation rec { # in Debian, so we assume they have been sent upstream. # patches = [ - ./c-missing_xm_h.patch - ./c-render_table_crash.patch + ./c-missing_xm_h.patch + ./c-render_table_crash.patch ./c-xpmpipethrough.patch ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "An open source clone of the Motif widget set"; + homepage = http://lesstif.sourceforge.net; + platforms = platforms.unix; + license = with licenses; [ gpl2 lgpl2 ]; }; } From a0a4756ed3e4c48bb75cd28a3fc2252841fb6ade Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:03:43 +0200 Subject: [PATCH 914/992] libaccounts-glib: add license + description --- pkgs/development/libraries/libaccounts-glib/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 4bb806b91d8a..16e9f213ed48 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -25,7 +25,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # since glib-2.46 - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Library for managing accounts which can be used from GLib applications"; + platforms = platforms.linux; + license = licenses.lgpl21; }; } From e3de8a92325620e65039d98281047a83fa07c9dd Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Oct 2018 14:10:49 -0500 Subject: [PATCH 915/992] boost: use correct c compiler for bootstrapping we need a c compiler that runs on the build machine for boost to work --- pkgs/development/libraries/boost/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index bb8dff83d321..c79b874ecb69 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -135,7 +135,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ which buildPackages.stdenv.cc ]; + nativeBuildInputs = [ which ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu ++ optional stdenv.isDarwin fixDarwinDylibNames From bbcfb99e8d79f79dc41e061d5f46c7ebe3212483 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:06:06 +0200 Subject: [PATCH 916/992] libaom: add license --- pkgs/development/libraries/libaom/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index b94c845479aa..a08a1e335232 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = https://aomedia.org/av1-features/get-started/; maintainers = with maintainers; [ kiloreux ]; platforms = platforms.all; + license = licenses.bsd2; }; } From 8ddce99ab9211152987f01c03d7a7046432a2601 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:07:05 +0200 Subject: [PATCH 917/992] libbap: add license --- pkgs/development/libraries/libbap/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 54fb89df0451..5153b63e91c5 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation rec { mkdir -p $out/include ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/binaryanalysisplatform/bap-bindings; description = "A C library for interacting with BAP"; - maintainers = [ stdenv.lib.maintainers.maurer ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.maurer ]; + platforms = platforms.unix; + license = licenses.mit; }; } From a36e9b2047d8c6f74a3c4dd905f5afb33de751af Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:08:55 +0200 Subject: [PATCH 918/992] libdbusmenu-qt: add license --- pkgs/development/libraries/libdbusmenu-qt/default.nix | 2 +- pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 1342ee6773f7..501341d202ba 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; - maintainers = [ ]; inherit (qt4.meta) platforms; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 9c25757efb03..e8651de2b346 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; inherit (qtbase.meta) platforms; + license = licenses.gpl2; }; } From f54413553b349c61693c0df67fb356bada61c3b4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:12:38 +0200 Subject: [PATCH 919/992] libexttextcat: add license --- pkgs/development/libraries/libexttextcat/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 8d264c929a5b..7b3df42c24c3 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -8,9 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"; }; - meta = { + meta = with stdenv.lib; { description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; homepage = https://wiki.documentfoundation.org/Libexttextcat; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.bsd3; }; } From 2887798de50bdf852c625b9810a06414e122503c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:31:22 +0200 Subject: [PATCH 920/992] libgdiplus: add license + meta data --- pkgs/development/libraries/libgdiplus/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 5e94d00dcdb7..d54f9203d23d 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems"; + homepage = https://www.mono-project.com/docs/gui/libgdiplus/; + platforms = platforms.unix; + license = licenses.mit; }; } From 06cb58fba77beab5d3ba396af779afb888ea791d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:33:02 +0200 Subject: [PATCH 921/992] libgnome-keyring: add license --- pkgs/development/libraries/libgnome-keyring/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index e7157afbaee5..0b496ff593b3 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = { inherit (glib.meta) platforms maintainers; + license = stdenv.lib.licenses.gpl2; }; } From 3e85c53ca6f1effb2617f33603084e3c6bc509a6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:42:47 +0200 Subject: [PATCH 922/992] libgnurl: add licenses --- pkgs/development/libraries/libgnurl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 33276b424e7c..752d2ce5a1e7 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = https://gnunet.org/gnurl; maintainers = with maintainers; [ falsifian vrthra ]; platforms = platforms.linux; + license = with licenses; [ bsdOriginal mit ]; }; } From 592e998cd7fe5f76e919deab0accb8bc98c5eb2b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:45:44 +0200 Subject: [PATCH 923/992] libicns: add licenses --- pkgs/development/libraries/libicns/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 08d80bcf9856..298d6124505c 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ libpng jasper ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Library for manipulation of the Mac OS icns resource format"; + homepage = https://icns.sourceforge.io; + license = with licenses; [ gpl2 lgpl2 lgpl21 ]; + platforms = platforms.unix; }; } From ed09cdd0f6bd3f049c0545eaa779f6ca86f69c81 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:55:14 +0200 Subject: [PATCH 924/992] libiodbc: add license --- pkgs/development/libraries/libiodbc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 45649f944f51..faa070b3468c 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS_BEFORE="-rpath $out/lib" ''; - meta = { + meta = with stdenv.lib; { description = "iODBC driver manager"; homepage = http://www.iodbc.org; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } From 1d902ca5a2e3f48ce29917a9e4a7c63ed294f12c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 17 Oct 2018 20:59:00 +0200 Subject: [PATCH 925/992] libite: add licenses --- pkgs/development/libraries/libite/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 7580c1b092e2..1616aa1e0cc1 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; + license = with licenses; [ mit isc ]; }; } From 45cc6e2a4286276387d0bcb768a1e45086719210 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Oct 2018 14:43:49 -0500 Subject: [PATCH 926/992] lib/systems: use lookup for uname.system This is a little bit cleaner and avoids the if ... else if ... chain. --- lib/systems/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 6c6ce5c6ef62..8f5ef44ae72f 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -50,13 +50,14 @@ rec { # Output from uname uname = { # uname -s - system = if final.isLinux then "Linux" - else if final.isDarwin then "Darwin" - else if final.isWindows then "Windows" - else if final.isFreeBSD then "FreeBSD" - else if final.isNetBSD then "NetBSD" - else if final.isOpenBSD then "OpenBSD" - else null; + system = { + "linux" = "Linux"; + "windows" = "Windows"; + "darwin" = "Darwin"; + "netbsd" = "NetBSD"; + "freebsd" = "FreeBSD"; + "openbsd" = "OpenBSD"; + }.${final.parsed.kernel.name} or null; # uname -p processor = final.parsed.cpu.name; From 1660098d8425a190d42d5604afb54354625392b8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Oct 2018 14:44:35 -0500 Subject: [PATCH 927/992] curl: build statically on windows --- pkgs/tools/networking/curl/7_59.nix | 6 +++++- pkgs/tools/networking/curl/default.nix | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/7_59.nix b/pkgs/tools/networking/curl/7_59.nix index 0482bcf52629..508b357e3fde 100644 --- a/pkgs/tools/networking/curl/7_59.nix +++ b/pkgs/tools/networking/curl/7_59.nix @@ -77,7 +77,11 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}" # For the 'urandom', maybe it should be a cross-system option ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "--with-random=/dev/urandom"; + "--with-random=/dev/urandom" + ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [ + "--disable-shared" + "--enable-static" + ]; CXX = "${stdenv.cc.targetPrefix}c++"; CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index dda97d34d869..4af8ff75e210 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -81,7 +81,11 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}" # For the 'urandom', maybe it should be a cross-system option ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "--with-random=/dev/urandom"; + "--with-random=/dev/urandom" + ++ stdenv.lib.optionals stdenv.hostPlatform.isWindows [ + "--disable-shared" + "--enable-static" + ]; CXX = "${stdenv.cc.targetPrefix}c++"; CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; From 10c56c5cfbde7a2180d82e22c35887527b1e909f Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Wed, 17 Oct 2018 16:45:10 -0400 Subject: [PATCH 928/992] trezord: 2.0.19 -> 2.0.24 --- pkgs/servers/trezord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 9869da95a048..86fe1d7b008c 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "trezord-go-${version}"; - version = "2.0.19"; + version = "2.0.24"; # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "trezor"; repo = "trezord-go"; rev = "v${version}"; - sha256 = "19am5zs2mx36w2f8b5001i1sg6v72y1nq5cagnw6rza8qxyw83qs"; + sha256 = "1fl2d57qqrrwl995w4b2d57rvl2cxxy6afjmcp648hhb3dnmp7c3"; }; meta = with stdenv.lib; { From d039722d0e56ad08982154b5e02232ab9cd0945b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 17 Oct 2018 21:03:43 +0000 Subject: [PATCH 929/992] chromium 71+: add at-spi2-core dependency (#48594) --- pkgs/applications/networking/browsers/chromium/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index acd3493fe7c8..e39a35ae1b0d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -14,7 +14,7 @@ , glib, gtk2, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups -, ffmpeg, libxslt, libxml2 +, ffmpeg, libxslt, libxml2, at-spi2-core # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -129,7 +129,8 @@ let ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; + ++ optional pulseSupport libpulseaudio + ++ optional (versionAtLeast version "71") at-spi2-core; patches = [ # As major versions are added, you can trawl the gentoo and arch repos at From d767ba99964eb776c2b482ca8a3a0ef42d7ccf8b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 17 Oct 2018 21:04:15 +0000 Subject: [PATCH 930/992] chromium 71+: there is no more option 'use_gtk3' (#48595) --- pkgs/applications/networking/browsers/chromium/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e39a35ae1b0d..c18f77f8f996 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -233,7 +233,6 @@ let is_clang = false; clang_use_chrome_plugins = false; remove_webcore_debug_symbols = true; - use_gtk3 = true; enable_swiftshader = false; fieldtrial_testing_like_official_build = true; @@ -244,6 +243,8 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; google_default_client_id = "404761575300.apps.googleusercontent.com"; google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; + } // optionalAttrs (versionRange "60" "70") { + use_gtk3 = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; From 0b98193fe085e702793f06a73c86a9542a0881e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 16 Oct 2018 13:23:49 -0300 Subject: [PATCH 931/992] dpa-ext-gnomekeyring: init at 0.1.0 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/dpa-ext-gnomekeyring/default.nix | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 3ed13fa495e7..5626738a855f 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -24,6 +24,7 @@ let }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; deepin-wm = callPackage ./deepin-wm { }; + dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; dtkcore = callPackage ./dtkcore { }; dtkwm = callPackage ./dtkwm { }; dtkwidget = callPackage ./dtkwidget { }; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix new file mode 100644 index 000000000000..4aeba1b4c1bc --- /dev/null +++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3, dde-polkit-agent }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dpa-ext-gnomekeyring"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + qttools + ]; + + buildInputs = [ + dde-polkit-agent + gnome3.libgnome-keyring + ]; + + postPatch = '' + patchShebangs . + + sed -i dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp \ + -e "s,/usr,$out," + ''; + + meta = with stdenv.lib; { + description = "GNOME keyring extension for dde-polkit-agent"; + homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} From 11607de1403269ec1f12692a7d9fa7ad36be9d37 Mon Sep 17 00:00:00 2001 From: Elmar Athmer Date: Wed, 17 Oct 2018 23:23:56 +0200 Subject: [PATCH 932/992] hcloud: 1.6.1 -> 1.9.1 --- pkgs/development/tools/hcloud/default.nix | 7 +- pkgs/development/tools/hcloud/deps.nix | 102 ++++++++++++++++++++++ 2 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/hcloud/deps.nix diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index b3fa6f852f76..527737855bda 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,16 +2,19 @@ buildGoPackage rec { name = "hcloud-${version}"; - version = "1.6.1"; + version = "1.9.1"; + goPackagePath = "github.com/hetznercloud/cli"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "0v5n7y8vb23iva51kb15da198yk7glc1fix193icrk3pvcbj5bjr"; + sha256 = "0qc4mzjd1q3xv1j0dxv5qvk443bdhh5hlbv3i3444v36wycj3171"; }; + goDeps = ./deps.nix; + buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; postInstall = '' diff --git a/pkgs/development/tools/hcloud/deps.nix b/pkgs/development/tools/hcloud/deps.nix new file mode 100644 index 000000000000..66612d54daf7 --- /dev/null +++ b/pkgs/development/tools/hcloud/deps.nix @@ -0,0 +1,102 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "878a968ab22548362a09bdb3322f98b00f470d46"; + sha256 = "15nkffa8ylr5kkv52gyry675l8bzv3c0xx39j0fzz0vp2kcjyy8x"; + }; + } + { + goPackagePath = "github.com/gosuri/uilive"; + fetch = { + type = "git"; + url = "https://github.com/gosuri/uilive"; + rev = "ac356e6e42cd31fcef8e6aec13ae9ed6fe87713e"; + sha256 = "1k28zbc14p1yqzhamp9rcagjdw6wsdb55m08nx758jwlr31az6jy"; + }; + } + { + goPackagePath = "github.com/gosuri/uiprogress"; + fetch = { + type = "git"; + url = "https://github.com/gosuri/uiprogress"; + rev = "d0567a9d84a1c40dd7568115ea66f4887bf57b33"; + sha256 = "1m7rxf71mn8w2yysc8wmf2703avhci6f4nkiijjl1f2cx4kzykck"; + }; + } + { + goPackagePath = "github.com/hetznercloud/hcloud-go"; + fetch = { + type = "git"; + url = "https://github.com/hetznercloud/hcloud-go"; + rev = "eaf050e4f37028d2ca5f99a2fb38ead2c9b293d3"; + sha256 = "0ki4vk02da4dj6prx3gz8cvrfkj6xb72sjkwqcrbdp4n4klasngi"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "81a861c69d25a841d0c4394f0e6f84bc8c5afae0"; + sha256 = "1sk301rm7rm5hfcx7z7vgask5i80wx3mhyxjr3xnm5q1rvdj6vsl"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "8d114be902bc9f08717804830a55c48378108a28"; + sha256 = "1ipmdjwqxyvj6cv33xm1m4ngyx49jsnp8n9jd8fjbkng8aw3q4al"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/thcyron/uiprogress"; + fetch = { + type = "git"; + url = "https://github.com/thcyron/uiprogress"; + rev = "25e98ffb0e98b5192b475d8f2fd78083bfe9a67e"; + sha256 = "1avb0jykn3qbjrvhc8i50ahisf9rsfy74ysrwfqbqqkpvhdxv12i"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "0c41d7ab0a0ee717d4590a44bcb987dfd9e183eb"; + sha256 = "1mff9l49dffsak7vxg3dzxlzkgm5nqfksh9cbsjpmngpc5pk0fbc"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fa43e7bc11baaae89f3f902b2b4d832b68234844"; + sha256 = "1z96xhgw930jpd53g1sy9x6wiijgz751czbvr2zzgc55y0md1mfw"; + }; + } +] From c8040003f0a0bf2ac79adc3646669a3e718d4ec8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 17 Oct 2018 17:03:00 -0500 Subject: [PATCH 933/992] Correctly set windows doubles mingw is the toolchain name but it is actually run on a window kernel --- lib/systems/doubles.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 3d45935bc076..fddd5c85574a 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -16,7 +16,7 @@ let "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux" "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" - "x86_64-mingw32" "i686-mingw32" + "x86_64-windows" "i686-windows" ]; allParsed = map parse.mkSystemFromString all; From 21bb1fa004aae4d96e38bb14a06c24062118dde0 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 11 Aug 2018 11:32:00 -0400 Subject: [PATCH 934/992] nvidia_x11_beta: reinit at 410.57 --- nixos/modules/hardware/video/nvidia.nix | 12 ++-- pkgs/os-specific/linux/nvidia-x11/builder.sh | 58 +++++++++++-------- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++- pkgs/os-specific/linux/nvidia-x11/generic.nix | 25 +++++--- 4 files changed, 65 insertions(+), 38 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 6944d1a4f76b..f8524ab99e8a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -1,6 +1,6 @@ # This module provides the proprietary NVIDIA X11 / OpenGL drivers. -{ config, lib, pkgs, pkgs_i686, ... }: +{ stdenv, config, lib, pkgs, pkgs_i686, ... }: with lib; @@ -23,7 +23,11 @@ let else null; nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; - nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }; + nvidia_libs32 = + if versionOlder nvidia_x11.version "391" then + ((nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }).out + else + (nvidiaForKernel config.boot.kernelPackages).lib32; enabled = nvidia_x11 != null; @@ -98,7 +102,7 @@ in assertions = [ { assertion = config.services.xserver.displayManager.gdm.wayland; - message = "NVidia drivers don't support wayland"; + message = "NVIDIA drivers don't support wayland"; } { assertion = !optimusCfg.enable || @@ -161,7 +165,7 @@ in }; hardware.opengl.package = nvidia_x11.out; - hardware.opengl.package32 = nvidia_libs32.out; + hardware.opengl.package32 = nvidia_libs32; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 15c3e10e1199..8882ffdd45e7 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -26,32 +26,44 @@ buildPhase() { fi } - + installPhase() { # Install libGL and friends. + + # since version 391, 32bit libraries are bundled in the 32/ sub-directory + if [ "$i686bundled" = "1" ]; then + mkdir -p "$lib32/lib" + cp -prd 32/*.so.* 32/tls "$lib32/lib/" + fi + mkdir -p "$out/lib" cp -prd *.so.* tls "$out/lib/" - rm $out/lib/lib{glx,nvidia-wfb}.so.* # handled separately - rm -f $out/lib/libnvidia-gtk* # built from source - if [ "$useGLVND" = "1" ]; then - # Pre-built libglvnd - rm $out/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.* - fi - # Use ocl-icd instead - rm $out/lib/libOpenCL.so* - # Move VDPAU libraries to their place - mkdir $out/lib/vdpau - mv $out/lib/libvdpau* $out/lib/vdpau - # Install ICDs. - install -Dm644 nvidia.icd $out/etc/OpenCL/vendors/nvidia.icd - if [ -e nvidia_icd.json.template ]; then - sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json - install -Dm644 nvidia_icd.json $out/share/vulkan/icd.d/nvidia.json - fi - if [ "$useGLVND" = "1" ]; then - install -Dm644 10_nvidia.json $out/share/glvnd/egl_vendor.d/nvidia.json - fi + for i in $lib32 $out; do + rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately + rm -f $i/lib/libnvidia-gtk* # built from source + if [ "$useGLVND" = "1" ]; then + # Pre-built libglvnd + rm $i/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.* + fi + # Use ocl-icd instead + rm -f $i/lib/libOpenCL.so* + # Move VDPAU libraries to their place + mkdir $i/lib/vdpau + mv $i/lib/libvdpau* $i/lib/vdpau + + # Install ICDs. + install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd + if [ -e nvidia_icd.json.template ]; then + sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json + install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json + fi + if [ "$useGLVND" = "1" ]; then + install -Dm644 10_nvidia.json $i/share/glvnd/egl_vendor.d/nvidia.json + fi + + done + if [ -n "$bin" ]; then # Install the X drivers. @@ -60,7 +72,7 @@ installPhase() { mkdir -p $bin/lib/xorg/modules/drivers cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers mkdir -p $bin/lib/xorg/modules/extensions - cp -p libglx.so.* $bin/lib/xorg/modules/extensions + cp -p libglx*.so* $bin/lib/xorg/modules/extensions # Install the kernel module. mkdir -p $bin/lib/modules/$kernelVersion/misc @@ -78,7 +90,7 @@ installPhase() { fi # All libs except GUI-only are installed now, so fixup them. - for libname in `find "$out/lib/" -name '*.so.*'` `test -z "$bin" || find "$bin/lib/" -name '*.so.*'` + for libname in $(find "$out/lib/" $(test -n "$lib32" && echo "$lib32/lib/") $(test -n "$bin" && echo "$bin/lib/") -name '*.so.*') do # I'm lazy to differentiate needed libs per-library, as the closure is the same. # Unfortunately --shrink-rpath would strip too much. diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d9ff157e1429..492b268610f1 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -26,8 +26,12 @@ rec { patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; }; - beta = stable; # not enough interest to maintain beta ATM - + beta = generic { + version = "410.57"; + sha256_64bit = "08534rv3wcmzslbwq11kd3s7cxm72p48dia6540c0586xwgjwg2w"; + settingsSha256 = "1phhhzlc8n3rqdhrn757mnlqmsp616d079a6h1qjpa6jba9z9915"; + persistencedSha256 = "1z7c1ff0y486yp9i5w0siwh9dnprml22x2avarbjfgqwm4f652lw"; + }; legacy_340 = generic { version = "340.104"; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 090fce3a485c..a40a64344932 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -1,5 +1,5 @@ { version -, sha256_32bit +, sha256_32bit ? null , sha256_64bit , settingsSha256 , persistencedSha256 @@ -22,11 +22,15 @@ with stdenv.lib; -assert (!libsOnly) -> kernel != null; +assert !libsOnly -> kernel != null; +assert versionOlder version "391" -> sha256_32bit != null; +assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-linux"; let nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; + i686bundled = versionAtLeast version "391"; + self = stdenv.mkDerivation { name = "nvidia-x11-${version}${nameSuffix}"; @@ -34,24 +38,27 @@ let builder = ./builder.sh; src = - if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; - sha256 = sha256_32bit; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then + if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; sha256 = sha256_64bit; } + else if stdenv.hostPlatform.system == "i686-linux" then + fetchurl { + url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; + sha256 = sha256_32bit; + } else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}"; patches = if libsOnly then null else patches; inherit prePatch; inherit version useGLVND useProfiles; inherit (stdenv.hostPlatform) system; + inherit i686bundled; - outputs = [ "out" ] ++ optional (!libsOnly) "bin"; + outputs = [ "out" ] + ++ optional i686bundled "lib32" + ++ optional (!libsOnly) "bin"; outputDev = if libsOnly then null else "bin"; kernel = if libsOnly then null else kernel.dev; From 70d532cf2cc60cb0d6744e5a8fca961cd2dc511a Mon Sep 17 00:00:00 2001 From: Matthew Robbetts Date: Wed, 17 Oct 2018 16:57:59 -0700 Subject: [PATCH 935/992] eternal-terminal: 4.1.2 -> 5.1.6. --- pkgs/tools/networking/eternal-terminal/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 8941494e316e..dd7a43a82ae0 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, gflags, glog, libsodium, protobuf }: +{ stdenv, fetchFromGitHub, cmake, gflags, libsodium, protobuf }: stdenv.mkDerivation rec { name = "eternal-terminal-${version}"; - version = "4.1.2"; + version = "5.1.6"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTCP"; rev = "refs/tags/et-v${version}"; - sha256 = "1zy30ccsddgs2wqwxphnx5i00j4gf69lr68mzg9x6imqfz0sbcjz"; + sha256 = "0df573c5hi3hxa0d3m02zf2iyh841540dklj9lmp6faik8cp39jz"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ gflags glog libsodium protobuf ]; + buildInputs = [ gflags libsodium protobuf ]; enableParallelBuilding = true; From b2dabdc697b760b3c95056c2dd8dc2771ef93a12 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 17 Oct 2018 20:48:19 -0400 Subject: [PATCH 936/992] sbt: 1.2.4 -> 1.2.6 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 60f342db12aa..dce19a1d8395 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "06zv1mm4rhl0h6qa7m4w5lbwjcyqp43r183q36q9zlyip965mnrn"; + sha256 = "1nv8r3j2vhp38qbb123n86wfhb6mvwz7vgrrsjp344zg211psncn"; }; patchPhase = '' From f1195b912be8bd55c34ce6dfa268cb402d9abec7 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Wed, 17 Oct 2018 20:59:52 -0400 Subject: [PATCH 937/992] jdk10: remove special handling for arm neither oraclejdk nor openjdk is supported on arm, so this is needless complexity --- pkgs/top-level/all-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1879dc063ee..4c888fe1f5e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6964,14 +6964,12 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; }; - jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" + jdk10 = openjdk10 // { outputs = [ "out" ]; }; + jre10 = lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk10.jre // { outputs = [ "jre" ]; })); jre10_headless = - if stdenv.isAarch32 || stdenv.isAarch64 then - oraclejre10 - else if stdenv.isDarwin then + if stdenv.isDarwin then jre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless" From 21b8427b0c9e734ca31f5561567f92ff759ed917 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 17 Oct 2018 19:41:18 -0500 Subject: [PATCH 938/992] ruby_2_4: 2.4.4 -> 2.4.5 --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 9e6d35b818f4..1aa7d5d53791 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -210,10 +210,10 @@ in { }; ruby_2_4 = generic { - version = rubyVersion "2" "4" "4" ""; + version = rubyVersion "2" "4" "5" ""; sha256 = { - src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5"; - git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5"; + src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7"; + git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index ca180b3c2294..984dee84fa18 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -6,7 +6,7 @@ rec { "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.4" = ops useRailsExpress [ + "2.4.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" From ee9d62241cf5c6b24838c5b2f472c8ddc4e9ba08 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 17 Oct 2018 19:44:15 -0500 Subject: [PATCH 939/992] ruby_2_3: 2.3.7 -> 2.3.8 --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 1aa7d5d53791..e2b4730b0d09 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -202,10 +202,10 @@ let in { ruby_2_3 = generic { - version = rubyVersion "2" "3" "7" ""; + version = rubyVersion "2" "3" "8" ""; sha256 = { - src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m"; - git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk"; + src = "1gwsqmrhpx1wanrfvrsj3j76rv888zh7jag2si2r14qf8ihns0dm"; + git = "0158fg1sx6l6applbq0831kl8kzx5jacfl9lfg0shfzicmjlys3f"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 984dee84fa18..bf4a406e9874 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,7 +1,7 @@ { patchSet, useRailsExpress, ops, patchLevel }: rec { - "2.3.7" = ops useRailsExpress [ + "2.3.8" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" From ce0bec2baa81def4889a79969b379f43d9c5582f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 17 Oct 2018 20:05:14 -0500 Subject: [PATCH 940/992] ruby_2_5: 2.5.1 -> 2.5.2 --- pkgs/development/interpreters/ruby/default.nix | 10 +++++----- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index e2b4730b0d09..4120124d9bae 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -111,8 +111,8 @@ let postPatch = if isRuby25 then '' sed -i configure.ac -e '/config.guess/d' - cp ${config}/config.guess tool/ - cp ${config}/config.sub tool/ + cp --remove-destination ${config}/config.guess tool/ + cp --remove-destination ${config}/config.sub tool/ '' else opString useRailsExpress '' sed -i configure.in -e '/config.guess/d' @@ -218,10 +218,10 @@ in { }; ruby_2_5 = generic { - version = rubyVersion "2" "5" "1" ""; + version = rubyVersion "2" "5" "2" ""; sha256 = { - src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s"; - git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj"; + src = "0wgl1697sdiqh6ksgv40v627jp5557j1zi462krwnzhc9bk408xk"; + git = "00xy323q2f2v102hfgsj9k20vggvvmyhd6byfhbc1qwz2vyrvc47"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index bf4a406e9874..151e9c483530 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -11,7 +11,7 @@ rec { "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.5.1" = ops useRailsExpress [ + "2.5.2" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" From bc8d25c1ef21f6d985141bfdfa0b354f5c885ff8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 18 Oct 2018 05:43:36 +0000 Subject: [PATCH 941/992] why3: 1.0.0 -> 1.1.0 --- pkgs/applications/science/logic/why3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 1ccc365498ce..58609e856c3b 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37604/why3-1.0.0.tar.gz; - sha256 = "18h00diw1c051v7ya0lv09ns5630qi9savwffx0652mcc4b4qpxn"; + url = https://gforge.inria.fr/frs/download.php/file/37767/why3-1.1.0.tar.gz; + sha256 = "199ziq8mv3r24y3dd1n2r8k2gy09p7kdyyhkg9qn1vzfd2fxwzc1"; }; buildInputs = (with ocamlPackages; [ From 747377a9f8b68daba819e409aed0840289625303 Mon Sep 17 00:00:00 2001 From: Matthew Robbetts Date: Wed, 17 Oct 2018 23:05:21 -0700 Subject: [PATCH 942/992] Add ninja, remove enableParallelBuilding. --- pkgs/tools/networking/eternal-terminal/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index dd7a43a82ae0..fda5d25aa17d 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gflags, libsodium, protobuf }: +{ stdenv, fetchFromGitHub, cmake, ninja, gflags, libsodium, protobuf }: stdenv.mkDerivation rec { name = "eternal-terminal-${version}"; @@ -11,11 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0df573c5hi3hxa0d3m02zf2iyh841540dklj9lmp6faik8cp39jz"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ninja ]; buildInputs = [ gflags libsodium protobuf ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Remote shell that automatically reconnects without interrupting the session"; license = licenses.asl20; From 1c7d38bcfbf5a27fe3df9cefa1dac5864e492075 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Tue, 16 Oct 2018 09:38:36 +1100 Subject: [PATCH 943/992] bazel: 0.17.1 -> 0.18.0 --- .../tools/build-managers/bazel/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e9f005f79917..19836b412c04 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -13,8 +13,8 @@ let srcDeps = lib.singleton ( fetchurl { - url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"; - sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b"; + url = "https://github.com/google/desugar_jdk_libs/archive/fd937f4180c1b557805219af4482f1a27eb0ff2b.zip"; + sha256 = "04hs399340xfwcdajbbcpywnb2syp6z5ydwg966if3hqdb2zrf23"; } ); @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { - version = "0.17.1"; + version = "0.18.0"; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -42,19 +42,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "081z40vsxvw6ndiinik4pn09gxmv140k6l9zv93dgjr86qf2ir13"; + sha256 = "0mbi4n4wp1x73l8qksg4vyh2sba52xh9hfl2m518gv41g0pnvs6h"; }; sourceRoot = "."; patches = - lib.optional enableNixHacks ./nix-hacks.patch - # patch perl out of the bash completions - # should land in 0.18 - ++ [(fetchpatch { - url = "https://github.com/bazelbuild/bazel/commit/27be70979b54d7510bf401d9581fb4075737ef34.patch"; - sha256 = "04rip46lnibrsdyzjpi29wf444b49cbwb1xjcbrr3kdqsdj4d8h5"; - })]; + lib.optional enableNixHacks ./nix-hacks.patch; # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. @@ -137,10 +131,10 @@ stdenv.mkDerivation rec { echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "362 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "362 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "362 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "362 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "378 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "378 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "378 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "378 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh # --experimental_strict_action_env (which will soon become the # default, see bazelbuild/bazel#2574) hardcodes the default From 613d3bac86eebfeec082ee742b1706f2cc66c7c1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 18 Oct 2018 03:04:36 +0800 Subject: [PATCH 944/992] pulseaudio-modules-bt: Patched rpath takes precedence over original This fixes a segmentation fault when loaded via pulseaudio's dl-search-path --- pkgs/applications/audio/pulseaudio-modules-bt/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 6bb432b3fd88..b377db65c0c9 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -1,7 +1,6 @@ { stdenv , runCommand , fetchFromGitHub -, libpulseaudio , pulseaudio , pkgconfig , ffmpeg_4 @@ -44,7 +43,6 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - libpulseaudio pulseaudio ffmpeg_4 libtool @@ -67,7 +65,7 @@ in stdenv.mkDerivation rec { for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "$orig_rpath:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules" \ + --set-rpath "${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ "$so" done ''; From 78c0e1aa11f6b93fcbbf473b0691f3dbf9bc6039 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 18 Oct 2018 03:05:46 +0800 Subject: [PATCH 945/992] nixos/pulseaudio: Add extraModules config option --- nixos/modules/config/pulseaudio.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index e16a021ec20b..d4aa59506295 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -154,6 +154,18 @@ in { ''; }; + extraModules = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "[ pkgs.pulseaudio-modules-bt ]"; + description = '' + Extra pulseaudio modules to use. This is intended for out-of-tree + pulseaudio modules like extra bluetooth codecs. + + Extra modules take precedence over built-in pulseaudio modules. + ''; + }; + daemon = { logLevel = mkOption { type = types.str; @@ -236,6 +248,18 @@ in { systemd.packages = [ overriddenPackage ]; }) + (mkIf (cfg.extraModules != []) { + hardware.pulseaudio.daemon.config.dl-search-path = let + overriddenModules = builtins.map + (drv: drv.override { pulseaudio = overriddenPackage; }) + cfg.extraModules; + modulePaths = builtins.map + (drv: "${drv}/lib/pulse-${overriddenPackage.version}/modules") + # User-provided extra modules take precedence + (overriddenModules ++ [ overriddenPackage ]); + in lib.concatStringsSep ":" modulePaths; + }) + (mkIf hasZeroconf { services.avahi.enable = true; }) From 5df3a4d9b916bf2f6c2a1eeb1594d161cf2a6352 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 17 Oct 2018 21:38:38 -0500 Subject: [PATCH 946/992] pythonPackages.pathlib2: remove unnecessary python version check --- pkgs/development/python-modules/pathlib2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 412186e6075b..c85b29eac858 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -8,7 +8,7 @@ , mock }: -if !(pythonOlder "3.4") then null else buildPythonPackage rec { +buildPythonPackage rec { pname = "pathlib2"; version = "2.3.2"; From 5143e303619dd21e134d036667d4f2316b6e8a27 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 17 Oct 2018 21:40:16 -0500 Subject: [PATCH 947/992] pythonPackages.pytest: pathlib2 is only required for python<3.6 --- pkgs/development/python-modules/pytest/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index deb9cbdb7d0a..cdfdb8a64c95 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , atomicwrites, mock, writeText, pathlib2 }: @@ -19,7 +19,8 @@ buildPythonPackage rec { checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] - ++ stdenv.lib.optionals (!isPy3k) [ funcsigs pathlib2 ]; + ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] + ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; checkPhase = '' runHook preCheck From 0e6a5c908d4dd47725fb8e8cd3266a1c6684ed02 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Thu, 18 Oct 2018 12:17:43 +0300 Subject: [PATCH 948/992] bat: 0.7.1 -> 0.8.0 --- pkgs/tools/misc/bat/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 0cacfa6e54e4..4bd4a02c7a2d 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,17 @@ rustPlatform.buildRustPackage rec { name = "bat-${version}"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "bat"; rev = "v${version}"; - sha256 = "1fzk0z7r70rjvv2c6531zaa1jzbcb7j9wbi0xqb9y4dls538bmz0"; + sha256 = "1xvjw61q0qbnzj95g7g8xckcqha9jrf2172b5l7faj7i0jhmz2kx"; fetchSubmodules = true; }; - cargoSha256 = "19syz0sxcpk3i4675bfq5gpb9i6hp81in36w820kkvamaimq10nd"; + cargoSha256 = "0xv769f2iqrgnbmb7ma9p3gbb2xpx2lhqc0kq5nizf8w8xdc5m11"; nativeBuildInputs = [ cmake pkgconfig zlib ]; @@ -22,6 +22,13 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -m 444 -Dt $out/share/man/man1 doc/bat.1 + + install -Dm644 target/release/build/bat-*/out/_bat \ + "$out/share/zsh/site-functions/_bat" + install -Dm644 target/release/build/bat-*/out/bat.bash \ + "$out/share/bash-completions/completions/bat.bash" + install -Dm644 target/release/build/bat-*/out/bat.fish \ + "$out/share/fish/vendor_completions.d/bat.fish" ''; meta = with stdenv.lib; { From 17685a40221f9170ae782819f42001b746a6924f Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 18 Oct 2018 11:34:43 +0200 Subject: [PATCH 949/992] bento4: init at 1.5.1-624 (#47632) --- pkgs/tools/video/bento4/default.nix | 30 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/video/bento4/default.nix diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix new file mode 100644 index 000000000000..687f80f1adfc --- /dev/null +++ b/pkgs/tools/video/bento4/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub +, cmake +}: +stdenv.mkDerivation rec { + name = "bento4-${version}"; + version = "1.5.1-624"; + + src = fetchFromGitHub { + owner = "axiomatic-systems"; + repo = "Bento4"; + rev = "v${version}"; + sha256 = "1cq6vhrq3n3lc1n454slbc66qdyqam2srxgdhfpyfxbq5c4y06nf"; + }; + + nativeBuildInputs = [ cmake ]; + installPhase = '' + mkdir -p $out/{lib,bin} + find -iname '*.so' -exec mv --target-directory="$out/lib" {} \; + find -maxdepth 1 -executable -type f -exec mv --target-directory="$out/bin" {} \; + ''; + + meta = with stdenv.lib; { + description = "Full-featured MP4 format and MPEG DASH library and tools"; + homepage = http://bento4.com; + license = licenses.gpl3; + maintainers = with maintainers; [ makefu ]; + broken = stdenv.isAarch64; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfe6f5628d8c..105e31496d13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1684,6 +1684,8 @@ with pkgs; pythonPackages = python3Packages; }; + bento4 = callPackage ../tools/video/bento4 { }; + bepasty = callPackage ../tools/misc/bepasty { }; bettercap = callPackage ../tools/security/bettercap { }; From f12513b53e99dc72fac0da4a35ff34bf99e82275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 18 Oct 2018 06:36:14 -0300 Subject: [PATCH 950/992] deepin-movie-reborn: init at 3.2.10 (#48651) --- .../deepin/deepin-movie-reborn/default.nix | 53 +++++++++++++++++++ pkgs/desktops/deepin/default.nix | 1 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/desktops/deepin/deepin-movie-reborn/default.nix diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix new file mode 100644 index 000000000000..52a51c0db861 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, + dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, + libdvdnav, libdvdread, xorg }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-movie-reborn"; + version = "3.2.10"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0lqmbvl9yyxgkiipd9r8mgmxl2sm34l3gr3hkwlc7r2l6kc32933"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + qttools + ]; + + buildInputs = [ + dtkcore + dtkwidget + ffmpeg + ffmpegthumbnailer + libdvdnav + libdvdread + mpv + pulseaudio + qtx11extras + xorg.libXdmcp + xorg.libXtst + xorg.libpthreadstubs + xorg.xcbproto + ]; + + NIX_LDFLAGS = "-ldvdnav"; + + postPatch = '' + sed -i src/CMakeLists.txt -e "s,/usr/lib/dtk2,${dtkcore}/lib/dtk2," + sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' + ''; + + meta = with stdenv.lib; { + description = "Deepin movie player"; + homepage = https://github.com/linuxdeepin/deepin-movie-reborn; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4e6530c2d18b..83a9de2d9b75 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -15,6 +15,7 @@ let deepin-image-viewer = callPackage ./deepin-image-viewer { }; deepin-menu = callPackage ./deepin-menu { }; deepin-metacity = callPackage ./deepin-metacity { }; + deepin-movie-reborn = callPackage ./deepin-movie-reborn { }; deepin-mutter = callPackage ./deepin-mutter { }; deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-sound-theme = callPackage ./deepin-sound-theme { }; From 290a7d2ee9394724c80df4fce4d102503c5d68fd Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Thu, 18 Oct 2018 13:11:52 +0200 Subject: [PATCH 951/992] nixos/openafs: Add defaultText to avoid evaluating packages --- nixos/modules/services/network-filesystems/openafs/client.nix | 2 ++ nixos/modules/services/network-filesystems/openafs/server.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index 52c0966e05bc..240c1392088f 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -149,11 +149,13 @@ in packages = { module = mkOption { default = config.boot.kernelPackages.openafs; + defaultText = "config.boot.kernelPackages.openafs"; type = types.package; description = "OpenAFS kernel module package. MUST match the userland package!"; }; programs = mkOption { default = getBin pkgs.openafs; + defaultText = "config.boot.kernelPackages.openafs"; type = types.package; description = "OpenAFS programs package. MUST match the kernel module package!"; }; diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix index 4c80ed0839f7..095024d2c8af 100644 --- a/nixos/modules/services/network-filesystems/openafs/server.nix +++ b/nixos/modules/services/network-filesystems/openafs/server.nix @@ -80,6 +80,7 @@ in { package = mkOption { default = pkgs.openafs.server or pkgs.openafs; + defaultText = "pkgs.openafs.server or pkgs.openafs"; type = types.package; description = "OpenAFS package for the server binaries"; }; From ab8ff7c07c7f90fa0a5969c21d0c5611924fac48 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Oct 2018 08:26:51 -0400 Subject: [PATCH 952/992] linux: 4.9.133 -> 4.9.134 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index cdf7000fba89..2810652aab67 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, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.133"; + version = "4.9.134"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qv5n8vipkqcd0hpf5l41h023n46rgja39h895phlcxs4p00ywsk"; + sha256 = "0xvsk5q4w4sa3vk0rhckxn7faj12rvmfpwn08m4qf7024b8yiyvd"; }; } // (args.argsOverride or {})) From 7abe0e881e4a1167f124234efe4f4ed43d84d6bd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Oct 2018 08:27:03 -0400 Subject: [PATCH 953/992] linux: 4.14.76 -> 4.14.77 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 60b3ffb2d8dc..f82f7406e91c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.76"; + version = "4.14.77"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gl2wkq4sazvpr0xnn4vrajj3j7w6hfiwdiy34y7jhlazyj1jgzf"; + sha256 = "1y567wkr4p7hywq3pdw06yc4hi16rp1vkx764wzy5nyajkhz95h4"; }; } // (args.argsOverride or {})) From 42cfc436ceae4861a6ef6737bab500ad0e82677b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Oct 2018 08:27:12 -0400 Subject: [PATCH 954/992] linux: 4.18.14 -> 4.18.15 --- pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 9bf33c068b55..c694d4503ed2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.14"; + version = "4.18.15"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lv2hpxzlk1yzr5dcjb0q0ylvlwx4ln2jvfvf01b9smr1lvd3iin"; + sha256 = "0cr9ash165yimwf8742c9cshfnjvmnzibyfrii9cnfig9m8m3hwg"; }; } // (args.argsOverride or {})) From e6cf58b6ce18e7c014be27d3f27fb66f6dcd1f9e Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Thu, 18 Oct 2018 14:49:56 +0200 Subject: [PATCH 955/992] btrbk: 0.26.1 -> 0.27.0 --- pkgs/tools/backup/btrbk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index e9ae73547863..6ff43a94af90 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "btrbk-${version}"; - version = "0.26.1"; + version = "0.27.0"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp"; + sha256 = "0nsqpmfymh9df32fy8qg6bhimd65yxdjpany97s1n08qb110zh2y"; }; nativeBuildInputs = [ asciidoc makeWrapper ]; From 788d32420506f691f05009be2a4fe5e99a3fc499 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 17 Oct 2018 18:49:53 -0500 Subject: [PATCH 956/992] linux-firmware: 2018-08-25 -> 2018-10-17 --- .../linux/firmware/firmware-linux-nonfree/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 82978d3e3ca9..43747aeaf0d0 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2018-08-25"; + version = "2018-10-17"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "fea76a04f25fd0a217c0d566ff5ff8f23ad3e648"; - sha256 = "1xy1s9vd7jny4hf4f1hzhlbnm0l4pnw7xycky0v6kfwlg5nnjii5"; + rev = "de9cefa74bba6fce3834144460868a468b8818f2"; + sha256 = "101j4jk3ixl8r3mxbkcrr5ybhb44ij3l52js4dqfxpylpiaw2cgk"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1p1dkzclj718w7di81s6486dn5zw77c4i2qn63bvp9q4vid452hn"; + outputHash = "1ndwp9yhpmx0kzayddy9i93mpv3d8gxypqm85069ic13lrjz1gdf"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; From 88cd633ea4dec7b9a247c0fd8ccb95f4982f5bf7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 18 Oct 2018 11:51:13 -0400 Subject: [PATCH 957/992] xorg: Don't use deprecated item --- pkgs/servers/x11/xorg/overrides.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ffee894fa60f..4cd121153cf4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -15,7 +15,7 @@ let (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"; in -super: self: +self: super: { bdftopcf = super.bdftopcf.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ self.xproto self.fontsproto ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 164d1c0ac071..a2152113ae57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13576,7 +13576,7 @@ with pkgs; # so as not to have the newly bound xorg items already in scope, which would # have created a cycle. xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { - }).overrideScope (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { + }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { inherit (darwin) apple_sdk; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; python = python2; # Incompatible with Python 3x From 0b6180aa893e60bf536b32ad3e32fea84e65e1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Oct 2018 14:56:55 +0200 Subject: [PATCH 958/992] home-assistant: 0.77.3 -> 0.80.2 --- .../home-assistant/component-packages.nix | 83 ++++++++++++++++--- pkgs/servers/home-assistant/default.nix | 24 +++--- pkgs/servers/home-assistant/frontend.nix | 4 +- 3 files changed, 88 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a67de2dab1aa..0db7189654de 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.77.3"; + version = "0.80.3"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -11,6 +11,7 @@ "alarm_control_panel.alarmdecoder" = ps: with ps; [ ]; "alarm_control_panel.alarmdotcom" = ps: with ps; [ ]; "alarm_control_panel.arlo" = ps: with ps; [ ]; + "alarm_control_panel.blink" = ps: with ps; [ ]; "alarm_control_panel.canary" = ps: with ps; [ ]; "alarm_control_panel.concord232" = ps: with ps; [ ]; "alarm_control_panel.demo" = ps: with ps; [ ]; @@ -18,7 +19,7 @@ "alarm_control_panel.envisalink" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; - "alarm_control_panel.ifttt" = ps: with ps; [ ]; + "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors ]; "alarm_control_panel.manual" = ps: with ps; [ ]; "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ]; "alarm_control_panel.mqtt" = ps: with ps; [ paho-mqtt ]; @@ -29,6 +30,7 @@ "alarm_control_panel.totalconnect" = ps: with ps; [ ]; "alarm_control_panel.verisure" = ps: with ps; [ ]; "alarm_control_panel.wink" = ps: with ps; [ ]; + "alarm_control_panel.yale_smart_alarm" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ ]; "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ aiohttp-cors ]; @@ -41,6 +43,7 @@ "apcupsd" = ps: with ps; [ ]; "api" = ps: with ps; [ aiohttp-cors ]; "apple_tv" = ps: with ps; [ ]; + "aqualogic" = ps: with ps; [ ]; "arduino" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ]; "asterisk_mbox" = ps: with ps; [ ]; @@ -59,6 +62,7 @@ "automation.sun" = ps: with ps; [ ]; "automation.template" = ps: with ps; [ ]; "automation.time" = ps: with ps; [ ]; + "automation.webhook" = ps: with ps; [ aiohttp-cors ]; "automation.zone" = ps: with ps; [ ]; "axis" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; @@ -90,6 +94,7 @@ "binary_sensor.ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "binary_sensor.ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; "binary_sensor.flic" = ps: with ps; [ ]; + "binary_sensor.fritzbox" = ps: with ps; [ ]; "binary_sensor.gc100" = ps: with ps; [ ]; "binary_sensor.hikvision" = ps: with ps; [ ]; "binary_sensor.hive" = ps: with ps; [ ]; @@ -179,6 +184,7 @@ "camera.foscam" = ps: with ps; [ ]; "camera.generic" = ps: with ps; [ ]; "camera.local_file" = ps: with ps; [ ]; + "camera.logi_circle" = ps: with ps; [ ]; "camera.mjpeg" = ps: with ps; [ ]; "camera.mqtt" = ps: with ps; [ paho-mqtt ]; "camera.neato" = ps: with ps; [ ]; @@ -207,6 +213,7 @@ "climate.econet" = ps: with ps; [ ]; "climate.ephember" = ps: with ps; [ ]; "climate.eq3btsmart" = ps: with ps; [ construct ]; + "climate.evohome" = ps: with ps; [ ]; "climate.flexit" = ps: with ps; [ ]; "climate.fritzbox" = ps: with ps; [ ]; "climate.generic_thermostat" = ps: with ps; [ ]; @@ -226,6 +233,7 @@ "climate.netatmo" = ps: with ps; [ ]; "climate.nuheat" = ps: with ps; [ ]; "climate.oem" = ps: with ps; [ ]; + "climate.opentherm_gw" = ps: with ps; [ ]; "climate.proliphix" = ps: with ps; [ ]; "climate.radiotherm" = ps: with ps; [ ]; "climate.sensibo" = ps: with ps; [ ]; @@ -251,9 +259,10 @@ "config" = ps: with ps; [ aiohttp-cors ]; "config.auth" = ps: with ps; [ ]; "config.automation" = ps: with ps; [ ]; - "config.config_entries" = ps: with ps; [ voluptuous-serialize ]; + "config.config_entries" = ps: with ps; [ ]; "config.core" = ps: with ps; [ ]; "config.customize" = ps: with ps; [ ]; + "config.device_registry" = ps: with ps; [ aiohttp-cors ]; "config.entity_registry" = ps: with ps; [ aiohttp-cors ]; "config.group" = ps: with ps; [ ]; "config.hassbian" = ps: with ps; [ ]; @@ -268,11 +277,13 @@ "cover.aladdin_connect" = ps: with ps; [ ]; "cover.brunt" = ps: with ps; [ ]; "cover.command_line" = ps: with ps; [ ]; + "cover.deconz" = ps: with ps; [ ]; "cover.demo" = ps: with ps; [ ]; "cover.garadget" = ps: with ps; [ ]; "cover.gogogate2" = ps: with ps; [ ]; "cover.group" = ps: with ps; [ ]; "cover.homematic" = ps: with ps; [ pyhomematic ]; + "cover.insteon" = ps: with ps; [ ]; "cover.isy994" = ps: with ps; [ ]; "cover.knx" = ps: with ps; [ ]; "cover.lutron" = ps: with ps; [ ]; @@ -322,6 +333,7 @@ "device_tracker.google_maps" = ps: with ps; [ ]; "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ]; "device_tracker.hitron_coda" = ps: with ps; [ ]; + "device_tracker.huawei_lte" = ps: with ps; [ ]; "device_tracker.huawei_router" = ps: with ps; [ ]; "device_tracker.icloud" = ps: with ps; [ ]; "device_tracker.keenetic_ndms2" = ps: with ps; [ ]; @@ -368,6 +380,7 @@ "dyson" = ps: with ps; [ ]; "ecobee" = ps: with ps; [ ]; "ecovacs" = ps: with ps; [ ]; + "edp_redy" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ]; "eight_sleep" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; @@ -377,6 +390,7 @@ "enocean" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; "eufy" = ps: with ps; [ ]; + "evohome" = ps: with ps; [ ]; "fan" = ps: with ps; [ ]; "fan.comfoconnect" = ps: with ps; [ ]; "fan.demo" = ps: with ps; [ ]; @@ -398,10 +412,12 @@ "fritzbox" = ps: with ps; [ ]; "frontend" = ps: with ps; [ aiohttp-cors ]; "gc100" = ps: with ps; [ ]; + "geo_location" = ps: with ps; [ ]; + "geo_location.demo" = ps: with ps; [ ]; + "geo_location.geo_json_events" = ps: with ps; [ ]; "goalfeed" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; - "google_assistant.auth" = ps: with ps; [ ]; "google_assistant.const" = ps: with ps; [ ]; "google_assistant.helpers" = ps: with ps; [ ]; "google_assistant.http" = ps: with ps; [ ]; @@ -410,11 +426,16 @@ "google_domains" = ps: with ps; [ ]; "graphite" = ps: with ps; [ ]; "group" = ps: with ps; [ ]; + "habitica" = ps: with ps; [ ]; "hangouts" = ps: with ps; [ ]; "hangouts.config_flow" = ps: with ps; [ ]; "hangouts.const" = ps: with ps; [ ]; "hangouts.hangouts_bot" = ps: with ps; [ ]; + "hangouts.intents" = ps: with ps; [ ]; "hassio" = ps: with ps; [ aiohttp-cors ]; + "hassio.auth" = ps: with ps; [ ]; + "hassio.const" = ps: with ps; [ ]; + "hassio.discovery" = ps: with ps; [ ]; "hassio.handler" = ps: with ps; [ ]; "hassio.http" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; @@ -441,13 +462,14 @@ "http.real_ip" = ps: with ps; [ ]; "http.static" = ps: with ps; [ ]; "http.view" = ps: with ps; [ ]; + "huawei_lte" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue ]; "hue.bridge" = ps: with ps; [ ]; "hue.config_flow" = ps: with ps; [ ]; "hue.const" = ps: with ps; [ ]; "hue.errors" = ps: with ps; [ ]; "hydrawise" = ps: with ps; [ ]; - "ifttt" = ps: with ps; [ ]; + "ifttt" = ps: with ps; [ aiohttp-cors ]; "ihc" = ps: with ps; [ ]; "ihc.const" = ps: with ps; [ ]; "ihc.ihcdevice" = ps: with ps; [ ]; @@ -525,6 +547,7 @@ "light.mysensors" = ps: with ps; [ ]; "light.mystrom" = ps: with ps; [ ]; "light.nanoleaf_aurora" = ps: with ps; [ ]; + "light.opple" = ps: with ps; [ ]; "light.osramlightify" = ps: with ps; [ ]; "light.piglow" = ps: with ps; [ ]; "light.qwikswitch" = ps: with ps; [ ]; @@ -580,9 +603,12 @@ "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; + "logi_circle" = ps: with ps; [ ]; + "lovelace" = ps: with ps; [ ]; "lutron" = ps: with ps; [ ]; "lutron_caseta" = ps: with ps; [ ]; "mailbox" = ps: with ps; [ aiohttp-cors ]; + "mailbox.asterisk_cdr" = ps: with ps; [ ]; "mailbox.asterisk_mbox" = ps: with ps; [ ]; "mailbox.demo" = ps: with ps; [ ]; "mailgun" = ps: with ps; [ aiohttp-cors ]; @@ -640,7 +666,7 @@ "media_player.sisyphus" = ps: with ps; [ ]; "media_player.snapcast" = ps: with ps; [ ]; "media_player.songpal" = ps: with ps; [ ]; - "media_player.sonos" = ps: with ps; [ soco ]; + "media_player.sonos" = ps: with ps; [ ]; "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; "media_player.spotify" = ps: with ps; [ aiohttp-cors ]; "media_player.squeezebox" = ps: with ps; [ ]; @@ -659,6 +685,8 @@ "mochad" = ps: with ps; [ ]; "modbus" = ps: with ps; [ ]; "mqtt" = ps: with ps; [ paho-mqtt ]; + "mqtt.config_flow" = ps: with ps; [ ]; + "mqtt.const" = ps: with ps; [ ]; "mqtt.discovery" = ps: with ps; [ ]; "mqtt.server" = ps: with ps; [ aiohttp-cors hbmqtt ]; "mqtt_eventstream" = ps: with ps; [ paho-mqtt ]; @@ -731,6 +759,7 @@ "notify.synology_chat" = ps: with ps; [ ]; "notify.syslog" = ps: with ps; [ ]; "notify.telegram" = ps: with ps; [ python-telegram-bot ]; + "notify.tibber" = ps: with ps; [ ]; "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twitter" = ps: with ps; [ ]; @@ -744,6 +773,8 @@ "onboarding.const" = ps: with ps; [ ]; "onboarding.views" = ps: with ps; [ ]; "openuv" = ps: with ps; [ ]; + "openuv.config_flow" = ps: with ps; [ ]; + "openuv.const" = ps: with ps; [ ]; "panel_custom" = ps: with ps; [ aiohttp-cors ]; "panel_iframe" = ps: with ps; [ aiohttp-cors ]; "persistent_notification" = ps: with ps; [ ]; @@ -805,6 +836,7 @@ "sensor.android_ip_webcam" = ps: with ps; [ ]; "sensor.apcupsd" = ps: with ps; [ ]; "sensor.api_streams" = ps: with ps; [ ]; + "sensor.aqualogic" = ps: with ps; [ ]; "sensor.arduino" = ps: with ps; [ ]; "sensor.arest" = ps: with ps; [ ]; "sensor.arlo" = ps: with ps; [ ]; @@ -853,6 +885,7 @@ "sensor.ebox" = ps: with ps; [ ]; "sensor.ecobee" = ps: with ps; [ ]; "sensor.eddystone_temperature" = ps: with ps; [ construct ]; + "sensor.edp_redy" = ps: with ps; [ ]; "sensor.efergy" = ps: with ps; [ ]; "sensor.eight_sleep" = ps: with ps; [ ]; "sensor.eliqonline" = ps: with ps; [ ]; @@ -877,14 +910,16 @@ "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "sensor.fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "sensor.gearbest" = ps: with ps; [ ]; - "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ]; - "sensor.geo_rss_events" = ps: with ps; [ feedparser ]; + "sensor.geizhals" = ps: with ps; [ ]; + "sensor.geo_rss_events" = ps: with ps; [ ]; + "sensor.gitlab_ci" = ps: with ps; [ ]; "sensor.gitter" = ps: with ps; [ ]; "sensor.glances" = ps: with ps; [ ]; "sensor.google_travel_time" = ps: with ps; [ ]; "sensor.google_wifi" = ps: with ps; [ ]; "sensor.gpsd" = ps: with ps; [ ]; "sensor.gtfs" = ps: with ps; [ ]; + "sensor.habitica" = ps: with ps; [ ]; "sensor.haveibeenpwned" = ps: with ps; [ ]; "sensor.hddtemp" = ps: with ps; [ ]; "sensor.history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ]; @@ -893,6 +928,7 @@ "sensor.homematicip_cloud" = ps: with ps; [ ]; "sensor.hp_ilo" = ps: with ps; [ ]; "sensor.htu21d" = ps: with ps; [ ]; + "sensor.huawei_lte" = ps: with ps; [ ]; "sensor.hydrawise" = ps: with ps; [ ]; "sensor.hydroquebec" = ps: with ps; [ ]; "sensor.ihc" = ps: with ps; [ ]; @@ -905,13 +941,16 @@ "sensor.iperf3" = ps: with ps; [ ]; "sensor.irish_rail_transport" = ps: with ps; [ ]; "sensor.isy994" = ps: with ps; [ ]; + "sensor.jewish_calendar" = ps: with ps; [ ]; "sensor.juicenet" = ps: with ps; [ ]; "sensor.kira" = ps: with ps; [ ]; "sensor.knx" = ps: with ps; [ ]; "sensor.kwb" = ps: with ps; [ ]; "sensor.lacrosse" = ps: with ps; [ ]; "sensor.lastfm" = ps: with ps; [ pylast ]; + "sensor.linky" = ps: with ps; [ ]; "sensor.linux_battery" = ps: with ps; [ batinfo ]; + "sensor.logi_circle" = ps: with ps; [ ]; "sensor.london_air" = ps: with ps; [ ]; "sensor.london_underground" = ps: with ps; [ ]; "sensor.loopenergy" = ps: with ps; [ ]; @@ -1001,6 +1040,7 @@ "sensor.speedtest" = ps: with ps; [ ]; "sensor.spotcrime" = ps: with ps; [ ]; "sensor.sql" = ps: with ps; [ sqlalchemy ]; + "sensor.starlingbank" = ps: with ps; [ ]; "sensor.startca" = ps: with ps; [ xmltodict ]; "sensor.statistics" = ps: with ps; [ ]; "sensor.steam_online" = ps: with ps; [ ]; @@ -1041,10 +1081,12 @@ "sensor.uscis" = ps: with ps; [ ]; "sensor.usps" = ps: with ps; [ ]; "sensor.vasttrafik" = ps: with ps; [ ]; + "sensor.velbus" = ps: with ps; [ ]; "sensor.vera" = ps: with ps; [ ]; "sensor.verisure" = ps: with ps; [ ]; "sensor.version" = ps: with ps; [ ]; "sensor.viaggiatreno" = ps: with ps; [ ]; + "sensor.volkszaehler" = ps: with ps; [ ]; "sensor.volvooncall" = ps: with ps; [ ]; "sensor.vultr" = ps: with ps; [ vultr ]; "sensor.waqi" = ps: with ps; [ ]; @@ -1079,9 +1121,9 @@ "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; "snips" = ps: with ps; [ paho-mqtt ]; - "sonos" = ps: with ps; [ soco ]; + "sonos" = ps: with ps; [ ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; - "spc" = ps: with ps; [ websockets ]; + "spc" = ps: with ps; [ ]; "spider" = ps: with ps; [ ]; "splunk" = ps: with ps; [ ]; "statsd" = ps: with ps; [ statsd ]; @@ -1093,6 +1135,7 @@ "switch.amcrest" = ps: with ps; [ ha-ffmpeg ]; "switch.android_ip_webcam" = ps: with ps; [ ]; "switch.anel_pwrctrl" = ps: with ps; [ ]; + "switch.aqualogic" = ps: with ps; [ ]; "switch.arduino" = ps: with ps; [ ]; "switch.arest" = ps: with ps; [ ]; "switch.bbb_gpio" = ps: with ps; [ ]; @@ -1106,6 +1149,7 @@ "switch.dlink" = ps: with ps; [ ]; "switch.doorbird" = ps: with ps; [ ]; "switch.edimax" = ps: with ps; [ ]; + "switch.edp_redy" = ps: with ps; [ ]; "switch.enocean" = ps: with ps; [ ]; "switch.eufy" = ps: with ps; [ ]; "switch.flux" = ps: with ps; [ ]; @@ -1157,6 +1201,8 @@ "switch.smappee" = ps: with ps; [ ]; "switch.snmp" = ps: with ps; [ pysnmp ]; "switch.spider" = ps: with ps; [ ]; + "switch.switchbot" = ps: with ps; [ ]; + "switch.switchmate" = ps: with ps; [ ]; "switch.tahoma" = ps: with ps; [ ]; "switch.tellduslive" = ps: with ps; [ ]; "switch.tellstick" = ps: with ps; [ ]; @@ -1166,6 +1212,7 @@ "switch.thinkingcleaner" = ps: with ps; [ ]; "switch.toon" = ps: with ps; [ ]; "switch.tplink" = ps: with ps; [ ]; + "switch.tradfri" = ps: with ps; [ ]; "switch.transmission" = ps: with ps; [ transmissionrpc ]; "switch.tuya" = ps: with ps; [ ]; "switch.upcloud" = ps: with ps; [ ]; @@ -1197,9 +1244,12 @@ "tesla" = ps: with ps; [ ]; "thethingsnetwork" = ps: with ps; [ ]; "thingspeak" = ps: with ps; [ ]; + "tibber" = ps: with ps; [ ]; "timer" = ps: with ps; [ ]; "toon" = ps: with ps; [ ]; "tradfri" = ps: with ps; [ ]; + "tradfri.config_flow" = ps: with ps; [ ]; + "tradfri.const" = ps: with ps; [ ]; "tts" = ps: with ps; [ aiohttp-cors mutagen ]; "tts.amazon_polly" = ps: with ps; [ boto3 ]; "tts.baidu" = ps: with ps; [ ]; @@ -1215,6 +1265,9 @@ "upcloud" = ps: with ps; [ ]; "updater" = ps: with ps; [ distro ]; "upnp" = ps: with ps; [ aiohttp-cors ]; + "upnp.config_flow" = ps: with ps; [ ]; + "upnp.const" = ps: with ps; [ ]; + "upnp.device" = ps: with ps; [ ]; "usps" = ps: with ps; [ ]; "vacuum" = ps: with ps; [ ]; "vacuum.demo" = ps: with ps; [ ]; @@ -1240,12 +1293,22 @@ "weather.demo" = ps: with ps; [ ]; "weather.ecobee" = ps: with ps; [ ]; "weather.ipma" = ps: with ps; [ ]; + "weather.met" = ps: with ps; [ ]; "weather.metoffice" = ps: with ps; [ ]; "weather.openweathermap" = ps: with ps; [ pyowm ]; "weather.yweather" = ps: with ps; [ yahooweather ]; "weather.zamg" = ps: with ps; [ ]; + "webhook" = ps: with ps; [ aiohttp-cors ]; "weblink" = ps: with ps; [ ]; "websocket_api" = ps: with ps; [ aiohttp-cors ]; + "websocket_api.auth" = ps: with ps; [ ]; + "websocket_api.commands" = ps: with ps; [ ]; + "websocket_api.connection" = ps: with ps; [ ]; + "websocket_api.const" = ps: with ps; [ ]; + "websocket_api.decorators" = ps: with ps; [ ]; + "websocket_api.error" = ps: with ps; [ ]; + "websocket_api.http" = ps: with ps; [ ]; + "websocket_api.messages" = ps: with ps; [ ]; "wemo" = ps: with ps; [ ]; "wink" = ps: with ps; [ ]; "wirelesstag" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e6bbd4ab259d..8503b53033cf 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -18,12 +18,12 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py - (mkOverride "aiohttp" "3.4.0" - "9b15efa7411dcf3b59c1f4766eb16ba1aba4531a33e54d469ee22106eabce460") + (mkOverride "aiohttp" "3.4.4" + "51afec6ffa50a9da4cdef188971a802beb1ca8e8edb40fa429e5e529db3475fa") (mkOverride "astral" "1.6.1" "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d") - (mkOverride "attrs" "18.1.0" - "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b") + (mkOverride "attrs" "18.2.0" + "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") (mkOverride "bcrypt" "3.1.4" "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d") (mkOverride "pyjwt" "1.6.4" @@ -36,6 +36,8 @@ let "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") + (mkOverride "voluptuous-serialize" "2.0.0" + "44be04d87aec34bd7d31ab539341fadc505205f2299031ed9be985112c21aa41") # used by check_config script # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved @@ -75,7 +77,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.77.3"; + hassVersion = "0.80.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -90,14 +92,14 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1c459iqbkhs6dv563zld6qb9avpx3h0fnxng476zahj9x9m5rzk6"; + sha256 = "0fjkw8kg0vsyrkcrx9jhqrh5nzxx5wphj6zglqgai2d635m8j2dg"; }; propagatedBuildInputs = [ # From setup.py - aiohttp astral async-timeout attrs bcrypt certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous - # From http, frontend, recorder and config.config_entries components and auth.mfa_modules.totp - sqlalchemy aiohttp-cors hass-frontend voluptuous-serialize pyotp pyqrcode + aiohttp astral async-timeout attrs bcrypt certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous voluptuous-serialize + # From http, frontend and recorder components and auth.mfa_modules.totp + sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ] ++ componentBuildInputs ++ extraBuildInputs; checkInputs = [ @@ -109,8 +111,8 @@ in with py.pkgs; buildPythonApplication rec { py.test --ignore tests/components # Some basic components should be tested however py.test \ - tests/components/{group,http,frontend} \ - tests/components/test_{api,configurator,demo,discovery,init,introduction,logger,script,shell_command,system_log,websocket_api}.py + tests/components/{group,http,frontend,config,websocket_api} \ + tests/components/test_{api,configurator,demo,discovery,init,introduction,logger,script,shell_command,system_log}.py ''; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index e04de7effcd4..25a63ef71a92 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180903.0"; + version = "20181018.0"; src = fetchPypi { inherit pname version; - sha256 = "54ba2ad2d1043952885f432d900025bd3eb11de180ac5147342cff585f44d4f9"; + sha256 = "83f52421056acda8297f174a7c4e3c540109673c2f2c25720638d171c6bc2653"; }; propagatedBuildInputs = [ user-agents ]; From 4a12a9321c567cae8e132c9d9b8b6255d52364d3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 18 Oct 2018 14:12:49 -0500 Subject: [PATCH 959/992] tests/systems.nix: fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit these weren’t being run correctly --- lib/systems/doubles.nix | 2 +- lib/tests/systems.nix | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index fddd5c85574a..58677c0bdd90 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -39,7 +39,7 @@ in rec { darwin = filterDoubles predicates.isDarwin; freebsd = filterDoubles predicates.isFreeBSD; # Should be better, but MinGW is unclear. - gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); illumos = filterDoubles predicates.isSunOS; linux = filterDoubles predicates.isLinux; netbsd = filterDoubles predicates.isNetBSD; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 91604280e4e7..5e1293658215 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -12,20 +12,21 @@ let expected = lib.sort lib.lessThan y; }; in with lib.systems.doubles; lib.runTests { - all = assertTrue (mseteq all (linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos)); + testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ windows); - arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]); - i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]); - mips = assertTrue (mseteq mips [ "mipsel-linux" ]); - x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]); + testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; + testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" ]; + testmips = mseteq mips [ "mipsel-linux" ]; + testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" ]; - cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]); - darwin = assertTrue (mseteq darwin [ "x86_64-darwin" ]); - freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]); - gnu = assertTrue (mseteq gnu (linux /* ++ kfreebsd ++ ... */)); - illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]); - linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]); - netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]); - openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]); - unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos)); + testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]; + testdarwin = mseteq darwin [ "x86_64-darwin" ]; + testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]; + testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); + testillumos = mseteq illumos [ "x86_64-solaris" ]; + testlinux = mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]; + testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]; + testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; + testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; + testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin); } From 503318127acfee53e90dd4d7607efc5b5a77abaa Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 18 Oct 2018 22:06:23 +0300 Subject: [PATCH 960/992] znc: add option to enable unicode support --- pkgs/applications/networking/znc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index ca5624d5b73f..861e7d24275d 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -3,6 +3,7 @@ , withPython ? false, python3 , withTcl ? false, tcl , withCyrus ? true, cyrus_sasl +, withUnicode ? true, icu }: with stdenv.lib; @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { ++ optional withPerl perl ++ optional withPython python3 ++ optional withTcl tcl - ++ optional withCyrus cyrus_sasl; + ++ optional withCyrus cyrus_sasl + ++ optional withUnicode icu; configureFlags = [ (stdenv.lib.enableFeature withPerl "perl") From 804e86c00439b17bcae00f2041ece0b527df567a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 20:48:47 +0200 Subject: [PATCH 961/992] libjson: add license + refactor longDescription --- pkgs/development/libraries/libjson/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index a53918fd5f77..c83143dd6b13 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -11,10 +11,17 @@ in stdenv.mkDerivation rec { buildInputs = [ unzip ]; makeFlags = [ "prefix=$(out)" ]; preInstall = "mkdir -p $out/lib"; - meta = { + + meta = with stdenv.lib; { homepage = http://libjson.sourceforge.net/; description = "A JSON reader and writer"; - longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language."; - platforms = stdenv.lib.platforms.unix; + longDescription = '' + A JSON reader and writer which is super-efficient and + usually runs circles around other JSON libraries. + It's highly customizable to optimize for your particular project, and + very lightweight. For Windows, OSX, or Linux. Works in any language. + ''; + platforms = platforms.unix; + license = licenses.bsd2; }; } From 53194bf4f2a2f195320869eae1b1364847e2db4e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 20:49:56 +0200 Subject: [PATCH 962/992] libkate: add license --- pkgs/development/libraries/libkate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 6c7e5881a784..7eff302397aa 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg libpng ]; - meta = { + meta = with stdenv.lib; { description = "A library for encoding and decoding Kate streams"; longDescription = '' This is libkate, the reference implementation of a codec for the Kate @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { in an Ogg container. It can carry Unicode text, images, and animate them.''; homepage = https://code.google.com/archive/p/libkate/; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } From 014c5c4b67f27350012ebbf6840a813f47cde830 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 20:51:13 +0200 Subject: [PATCH 963/992] liblastfm: add license --- pkgs/development/libraries/liblastfm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 331422dd8929..b7d90100837c 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -18,11 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/lastfm/liblastfm; repositories.git = git://github.com/lastfm/liblastfm.git; description = "Official LastFM library"; inherit (qt4.meta) platforms; - maintainers = with stdenv.lib.maintainers; [ phreedom ]; + maintainers = [ maintainers.phreedom ]; + license = licenses.gpl3; }; } From beabd0bb65aaea50cc9a48d6fc232d32989eab1c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 20:53:07 +0200 Subject: [PATCH 964/992] liblastfm-SF: add licenses --- pkgs/development/libraries/liblastfmSF/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 73d996c5ec86..d9f460d44e8c 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://liblastfm.sourceforge.net; description = "Unofficial C lastfm library"; + license = stdenv.lib.licenses.gpl3; }; } From b1800e3c18ed89afcb7be869fb4c355a04075005 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 20:54:39 +0200 Subject: [PATCH 965/992] liblqr: add licenses --- pkgs/development/libraries/liblqr-1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 4b445c93175f..aa6922ea3421 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://liblqr.wikidot.com; description = "Seam-carving C/C++ library called Liquid Rescaling"; platforms = platforms.all; - maintainers = [ ]; + license = with licenses; [ gpl3 lgpl3 ]; }; } From f5b9a9455ff68fb60a5b3ac64526d132005ca7a4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:00:17 +0200 Subject: [PATCH 966/992] libmilter: add license --- lib/licenses.nix | 5 +++++ pkgs/development/libraries/libmilter/default.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index c370af346791..611e6ddb35b7 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -585,6 +585,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Ruby License"; }; + sendmail = spdx { + spdxId = "Sendmail"; + fullName = "Sendmail License"; + }; + sgi-b-20 = spdx { spdxId = "SGI-B-2.0"; fullName = "SGI Free Software License B v2.0"; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index bd0cd9fe9041..7e3c45634d9e 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { description = "Sendmail Milter mail filtering API library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; + license = licenses.sendmail; }; } From b8253570a168997fce8d905642f4c87b642176ad Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:03:23 +0200 Subject: [PATCH 967/992] libmms: add license + description --- pkgs/development/libraries/libmms/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index d1dd7860de4e..7f73fb09cd16 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { + description = "Library for downloading (streaming) media files using the mmst and mmsh protocols"; homepage = http://libmms.sourceforge.net; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.lgpl21; }; } From 21a518cd3561e1b0ca735b2cc5e6d372fa828451 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:05:05 +0200 Subject: [PATCH 968/992] libmp3splt: add license --- pkgs/development/libraries/libmp3splt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index af8297e98549..52072000115c 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; maintainers = with maintainers; [ bosu ]; platforms = platforms.unix; + license = licenses.gpl2; }; } From 07b14d21ecfeadd5193551f75b0af8bafce4e6fd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:06:37 +0200 Subject: [PATCH 969/992] libmtp: add license --- pkgs/development/libraries/libmtp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index c3061626a6ae..1d8dd7e20f14 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # tried to install files to /lib/udev, hopefully OK configureFlags = [ "--with-udev=$$bin/lib/udev" ]; - meta = { + meta = with stdenv.lib; { homepage = http://libmtp.sourceforge.net; description = "An implementation of Microsoft's Media Transfer Protocol"; longDescription = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { in the form of a library suitable primarily for POSIX compliant operating systems. We implement MTP Basic, the stuff proposed for standardization. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = platforms.unix; + license = licenses.lgpl21; }; } From 2f28a5bccba809738a3ca775107cf35c563b07ff Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:09:34 +0200 Subject: [PATCH 970/992] libmusicbrainz: add license --- pkgs/development/libraries/libmusicbrainz/5.x.nix | 6 +++--- pkgs/development/libraries/libmusicbrainz/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index f197d5bcef98..2b59adf8f922 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir=true; - meta = { + meta = with stdenv.lib; { homepage = http://musicbrainz.org/doc/libmusicbrainz; description = "MusicBrainz Client Library (5.x version)"; longDescription = '' The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 596399c4fa8f..5335b6577f0a 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; - meta = { + meta = with stdenv.lib; { homepage = http://musicbrainz.org/doc/libmusicbrainz; description = "MusicBrainz Client Library (3.x version)"; longDescription = '' The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.lgpl21; }; } From 2ebc15f208a5f806b4c1d279a9a00ac7f12c17c9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:11:49 +0200 Subject: [PATCH 971/992] libnatspec: add license --- pkgs/development/libraries/libnatspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 9b692e9e3b2e..db4f6f5d4688 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (rec { buildInputs = [ popt ]; - meta = { + meta = with stdenv.lib; { homepage = http://natspec.sourceforge.net/ ; description = "A library intended to smooth national specificities in using of programs"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = platforms.unix; + license = licenses.lgpl21; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { propagatedBuildInputs = [ libiconv ]; From 4e6d420d915478cb71d1307ee30b2f63a87dc61d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:13:21 +0200 Subject: [PATCH 972/992] libnetfilter_queue: add license --- pkgs/development/libraries/libnetfilter_queue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 12a45d088ef6..94b3dc90a0b6 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libmnl libnfnetlink ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.netfilter.org/projects/libnetfilter_queue/; description = "Userspace API to packets queued by the kernel packet filter"; - - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From e7411d6eb5a4ffa9da3db6c96fc72a83eca083b3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:15:37 +0200 Subject: [PATCH 973/992] libnice: add licenses --- pkgs/development/libraries/libnice/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 1f58545574cd..8582dc4e1d90 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory" - meta = { + meta = with stdenv.lib; { homepage = https://nice.freedesktop.org/wiki/; description = "The GLib ICE implementation"; longDescription = '' @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { It provides a GLib-based library, libnice and a Glib-free library, libstun as well as GStreamer elements.''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = with licenses; [ lgpl21 mpl11 ]; }; } From 4877761ab8c3c2920895da814266dfbc1565dd1e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:17:47 +0200 Subject: [PATCH 974/992] libnotify: add license --- pkgs/development/libraries/libnotify/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index fbde49a54d08..11f2731eb725 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook gobjectIntrospection ]; buildInputs = [ glib gdk_pixbuf ]; - meta = { + meta = with stdenv.lib; { homepage = https://developer.gnome.org/notification-spec/; description = "A library that sends desktop notifications to a notification daemon"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl21; }; } From cee94fd5f28f5d8ec0d118ef808eeec8d3ad12f6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:19:20 +0200 Subject: [PATCH 975/992] libnova: add license --- pkgs/development/libraries/libnova/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index a66a1a88c743..cb70d803ac0c 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { name = "libnova-0.12.3"; - + src = fetchurl { url = "mirror://sourceforge/libnova/${name}.tar.gz"; sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc"; }; - - meta = { + + meta = with stdenv.lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; homepage = http://libnova.sf.net; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } From 4520ced68f13cb1cfe2c3a0aa7ddb1c44f841f31 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:23:39 +0200 Subject: [PATCH 976/992] liboauth: add license --- pkgs/development/libraries/liboauth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 855d921206e9..ea792b007bae 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "C library implementing the OAuth secure authentication protocol"; homepage = http://liboauth.sourceforge.net/; repositories.git = https://github.com/x42/liboauth.git; + license = licenses.mit; }; } From 4d291d5a77d4717171fdd67ec6b97b7a2c3930da Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:26:36 +0200 Subject: [PATCH 977/992] libofa: add license --- pkgs/development/libraries/libofa/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 531e30ba7552..8131420cfd65 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -27,12 +27,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; - meta = { + meta = with stdenv.lib; { homepage = https://code.google.com/archive/p/musicip-libofa/; description = "Library Open Fingerprint Architecture"; longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio fingerprint created and provided by MusicIP''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From 4009fa08d11add1b50730c679b1733701802c354 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:27:58 +0200 Subject: [PATCH 978/992] liboggz: add license --- pkgs/development/libraries/liboggz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index f6fe9ecd03a0..d7c3b747924a 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = https://xiph.org/oggz/; description = "A C library and tools for manipulating with Ogg files and streams"; longDescription = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { interleaving data container developed by Monty at Xiph.Org, originally to support the Ogg Vorbis audio format but now used for many free codecs including Dirac, FLAC, Speex and Theora.''; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } From a504cfa19069465491793aa3a5146410627d70b5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:33:10 +0200 Subject: [PATCH 979/992] libpcap: add license --- pkgs/development/libraries/libpcap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index f94f327ea02e..267859cb217c 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { description = "Packet Capture Library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; + license = licenses.bsd3; }; } From 0d12ce52e4117766681640c5bfab811ba3724b43 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:38:37 +0200 Subject: [PATCH 980/992] redland: add license + description --- pkgs/development/libraries/librdf/redland.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 422ace462a94..30d8d8a94e9d 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -38,8 +38,10 @@ stdenv.mkDerivation rec { doCheck = false; # fails 1 out of 17 tests with a segmentation fault - meta = { + meta = with stdenv.lib; { + description = "C libraries that provide support for the Resource Description Framework (RDF)"; homepage = http://librdf.org/; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.asl20; }; } From 3bd7ada09960d86c6a765ea657394942088e5631 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:47:12 +0200 Subject: [PATCH 981/992] libdbusmenu-qt: fix license --- pkgs/development/libraries/libdbusmenu-qt/default.nix | 2 +- pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 501341d202ba..72c3ca0e2b05 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; inherit (qt4.meta) platforms; - license = licenses.gpl2; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index e8651de2b346..60572e7676b2 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; inherit (qtbase.meta) platforms; - license = licenses.gpl2; + license = licenses.lgpl2; }; } From 4e6d2f8ec9547bd92b289dbc2ed03beb820d5bef Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:53:46 +0200 Subject: [PATCH 982/992] libgnome-keyring: fix license --- pkgs/development/libraries/libgnome-keyring/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 0b496ff593b3..8dcbab95e976 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { inherit (glib.meta) platforms maintainers; - license = stdenv.lib.licenses.gpl2; + license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; }; } From 96b77d8d4d34972b54ffdfea83913c06f47cc00c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 18 Oct 2018 21:56:33 +0200 Subject: [PATCH 983/992] libite: fix license --- pkgs/development/libraries/libite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 1616aa1e0cc1..0b00cf90ba00 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; - license = with licenses; [ mit isc ]; + license = with licenses; [ mit isc bsd2 bsd3 ]; }; } From 5a1f0f9aa363af6fe07926d7710c29f54b30919c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 18 Oct 2018 21:34:17 +0100 Subject: [PATCH 984/992] tinc: remove unnecessary networking.interfaces This breaks with networking backends enabled and also creates large delays on boot when some services depends on the network target. It is also not really required because tinc does create those interfaces itself. fixes #27070 --- nixos/modules/services/networking/tinc.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 35cdddc590b8..3379efd1afce 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -148,14 +148,6 @@ in } )); - networking.interfaces = flip mapAttrs' cfg.networks (network: data: nameValuePair - ("tinc.${network}") - ({ - virtual = true; - virtualType = "${data.interfaceType}"; - }) - ); - systemd.services = flip mapAttrs' cfg.networks (network: data: nameValuePair ("tinc.${network}") ({ From 43fc3bbb62ec90aec5e7929aba3e11290a520bfe Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Thu, 18 Oct 2018 22:42:17 +0200 Subject: [PATCH 985/992] wings: fix runtime failure. (#48681) Erlang/OTP 18 [erts-7.3.1.4] [source] [64-bit] [async-threads:10] [hipe] [kernel-poll:false] Eshell V7.3.1.4 (abort with ^G) 1> =ERROR REPORT==== 18-Oct-2018::21:29:53 === beam/beam_load.c(1189): Error loading module sdl: mandatory chunk of type 'Atom' not found =ERROR REPORT==== 18-Oct-2018::21:29:53 === Loading of /nix/store/qalvdrzjqqm3a8nsavjbhfiv1pzhw82k-esdl-1.3.1/lib/erlang/lib/esdl-1.3.1/ebin/sdl.beam failed: badfile =ERROR REPORT==== 18-Oct-2018::21:29:53 === Error in process <0.35.0> with exit value: {undef,[{sdl,init,[1048608],[]}, {wings_init,init,0,[{file,"wings_init.erl"},{line,28}]}, {wings,init,1,[{file,"wings.erl"},{line,105}]}]} Fatal internal error - log written to /home/milan/wings_crash.dump --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e6d0e750ad5..8a014f586227 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19493,6 +19493,7 @@ with pkgs; winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { + esdl = esdl.override { erlang = erlangR18; }; erlang = erlangR18; }; From 337d140953e2c2d7de81c76e236547021d6f43a5 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 18 Oct 2018 21:09:12 +0000 Subject: [PATCH 986/992] chromium: propagate stdenv for "chromium.override{ stdenv=gcc8Stdenv; }" (#48615) --- pkgs/applications/networking/browsers/chromium/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 51618a479d42..686e8fadec34 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -18,6 +18,8 @@ let callPackage = newScope chromium; chromium = { + inherit stdenv; + upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { From f3de52d25c80776e982037f6e5148f1fdf0d8dfc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 18 Oct 2018 16:11:58 -0500 Subject: [PATCH 987/992] radiotray-ng: 0.2.3 -> 0.2.4 (#48670) --- pkgs/applications/audio/radiotray-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 82bc42143c67..6f7ce9048c4c 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { name = "radiotray-ng-${version}"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "1sq7bc0dswv3vv56w527z268ib0pyhdxyf25388vnj1fv0c146wc"; + sha256 = "1jk80fv8ivwdx7waivls0mczn0rx4wv0fy7a28k77m88i5gkfgyw"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; From 168ccb3b0525e378e59129532ae00a95024eb145 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 18 Oct 2018 16:14:05 -0500 Subject: [PATCH 988/992] range-v3: 0.3.7 -> 0.4.0 https://github.com/ericniebler/range-v3/releases/tag/0.4.0 --- pkgs/development/libraries/range-v3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index cdb5297a6d87..7fe4b504a992 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "range-v3-${version}"; - version = "0.3.7"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; rev = version; - sha256 = "1zhsz1i4jy97idydg7ay3wazp7v2353vckkli5w9g51jka43h5x2"; + sha256 = "1s5gj799aa94nfg3r24whq7ck69g0zypf70w14wx64pgwg0424vf"; }; nativeBuildInputs = [ cmake ]; From a93c777c63b2bf7900209b7a2700649dd5f565e7 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 18 Oct 2018 19:12:01 -0400 Subject: [PATCH 989/992] haskellPackages.cabal-macosx: Tests don't build with Cabal >= 2.2 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e59e4a67269d..e05f19609ea3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1156,4 +1156,7 @@ self: super: { # https://github.com/yesodweb/yesod/issues/1563 yesod-core = dontCheck super.yesod-core; + # https://github.com/danfran/cabal-macosx/issues/13 + cabal-macosx = dontCheck super.cabal-macosx; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 8861eca0962a42e9982b24a1e93a6122ab754262 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 18 Oct 2018 22:35:07 -0400 Subject: [PATCH 990/992] vscode: 1.28.0 -> 1.28.2 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index b8a717fc0e70..8d5dca0a3454 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.28.0"; + version = "1.28.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "0f54py00lmw96x47nk823gwxxc9kr9haaa821ggi974ycr54af0y"; - "x86_64-linux" = "07bbzm1159k2gkajj6z7dsr0kmadd5gx721w92r252i5hcwg5sx4"; - "x86_64-darwin" = "019cl2rswls3gwwa8y70cllc4jnd8xj0y2m9rvg2rz695snp6rcm"; + "i686-linux" = "13zgx80qzq1wvss3byh56rvp2bdxywc4xmhhljsqrxf17g86g2zr"; + "x86_64-linux" = "1z50hkr9mcf76hlr1jb80nbvpxbpm2bh0l63yh9yqpalmz66xbfy"; + "x86_64-darwin" = "0n7lavpylg1q89qa64z4z1v7pgmwb2kidc57cgpvjnhjg8idys33"; }.${stdenv.hostPlatform.system}; archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz"; From f90009cbd7cb8f75e0d9d56dc12eea14b4b175a1 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 19 Oct 2018 08:30:36 +0000 Subject: [PATCH 991/992] nmap: fix cross-build (#48264) --- pkgs/tools/security/nmap/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 4c6df817a72d..09423a96ef96 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, pkgconfig, openssl +{ stdenv, fetchurl, libpcap, pkgconfig, openssl, lua5_3 , graphicalSupport ? false , libX11 ? null , gtk2 ? null @@ -35,11 +35,17 @@ in stdenv.mkDerivation rec { --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' ''; - configureFlags = [] + configureFlags = [ "--with-liblua=${lua5_3}" ] ++ optional (!pythonSupport) "--without-ndiff" ++ optional (!graphicalSupport) "--without-zenmap" ; + makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "AR=${stdenv.cc.bintools.targetPrefix}ar" + "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib" + "CC=${stdenv.cc.targetPrefix}gcc" + ]; + postInstall = optionalString pythonSupport '' wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" '' + optionalString graphicalSupport '' From 58a36edd205fcb38959fdc6fa896a3f4d629e162 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 19 Oct 2018 10:27:36 +0200 Subject: [PATCH 992/992] monkeysphere: Replace a hardcoded path and fix more tests --- pkgs/tools/security/monkeysphere/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index 228695878dcc..0cf59dc555c2 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper , perl, libassuan, libgcrypt -, perlPackages, lockfileProgs, gnupg +, perlPackages, lockfileProgs, gnupg, coreutils # For the tests: , bash, openssh, which, socat, cpio, hexdump }: @@ -16,10 +16,14 @@ stdenv.mkDerivation rec { patches = [ ./monkeysphere.patch ]; + postPatch = '' + sed -i "s,/usr/bin/env,${coreutils}/bin/env," src/share/ma/update_users + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl libassuan libgcrypt ] ++ stdenv.lib.optional doCheck - ([ gnupg openssh which socat cpio hexdump ] ++ + ([ gnupg openssh which socat cpio hexdump lockfileProgs ] ++ (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ])); makeFlags = '' @@ -31,10 +35,8 @@ stdenv.mkDerivation rec { # entropy (apparently GnuPG still uses /dev/random). doCheck = false; preCheck = '' - patchShebangs tests/keytrans - patchShebangs src/share/keytrans - patchShebangs src/share/checkperms - sed -i "s,/usr/bin/env\ bash,${bash}/bin/bash," tests/basic + patchShebangs tests/ + patchShebangs src/ sed -i "s,/usr/sbin/sshd,${openssh}/bin/sshd," tests/basic sed -i "s/<(hd/<(hexdump/" tests/keytrans '';