From 15bfee85f35231be92e439e7f3f02e9aba34dcdf Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 22 Mar 2018 01:22:05 +0300 Subject: [PATCH 001/340] 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 92d48c6a21a0fe1c814d611b8a923688404f83f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Jul 2018 22:20:07 -0700 Subject: [PATCH 002/340] 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 c79d054a4c579555a3c70b523c4efa02b6137c71 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 17 Apr 2018 20:37:01 +0100 Subject: [PATCH 003/340] 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 004/340] 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 005/340] 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 006/340] 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 007/340] 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 008/340] 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 009/340] 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 010/340] 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 011/340] 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 012/340] 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 013/340] 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 86b966f10862862f77f44ac7bc25d786d148a6f2 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Wed, 15 Aug 2018 09:10:28 +0100 Subject: [PATCH 014/340] 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 015/340] 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 899b7663b0ce22676884989cefdcff668cd20250 Mon Sep 17 00:00:00 2001 From: Alexandre Peyroux Date: Wed, 12 Sep 2018 21:35:16 +0200 Subject: [PATCH 016/340] 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 fd7bf0460d12dc06a144e2d0e200a31fe15eccff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 13:54:53 -0700 Subject: [PATCH 017/340] 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 d7c1d04af4085e0ae6fecbffdb0a19299de598e8 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 17 Aug 2018 20:48:40 -0400 Subject: [PATCH 018/340] 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 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 019/340] 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 19e7ae0fac348204ee6dedd85e9f1819e4ff4758 Mon Sep 17 00:00:00 2001 From: Red Davies Date: Tue, 2 Oct 2018 03:02:49 +0000 Subject: [PATCH 020/340] 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 021/340] 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 bccd0faee40cbaf2839d71cfb48f3a27d0d8d015 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Oct 2018 02:11:17 +0200 Subject: [PATCH 022/340] 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 ba02a2c3715e03329c143723c8c2c6b43fafd3a6 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 2 Oct 2018 22:53:48 -0400 Subject: [PATCH 023/340] 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 db013c461841a1aeeb965522ecba34a301dc7a2b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 01:49:57 -0700 Subject: [PATCH 024/340] 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 45d4712b712dbcd610fffeddfc2089e9fe933599 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 04:46:53 -0700 Subject: [PATCH 025/340] 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 f8f932769700f617e8bf4771b0583283be41345f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Oct 2018 07:27:52 -0700 Subject: [PATCH 026/340] 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 027/340] 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 0b82df8dbe8540eb8a3acc7ff093ea872ae131a8 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 4 Oct 2018 02:24:21 +0000 Subject: [PATCH 028/340] 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 a01cab05c626f17632edb3776f16fabb89afc106 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 7 Oct 2018 14:08:16 +0200 Subject: [PATCH 029/340] 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 030/340] 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 f41c55b2ca34ba8d6ad78ba8fc29d30a0075892f Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 25 Sep 2018 22:06:53 -0400 Subject: [PATCH 031/340] 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 032/340] 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 033/340] 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 de25f785e5739b8be708842d11aac9b8396f8af9 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 7 Oct 2018 20:31:33 -0400 Subject: [PATCH 034/340] 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 035/340] 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 036/340] 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 a29f2f20cd2deabccd3d0352504f828c8b7805a3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Sep 2018 18:43:49 -0700 Subject: [PATCH 037/340] 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 0d57159eca8f3bfc2d009da57a253298d127d0e4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 8 Oct 2018 22:21:09 +0200 Subject: [PATCH 038/340] 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 01a0b1f0c31f74b1744e40123cd0e7740c4c81e2 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Tue, 17 Jul 2018 00:10:15 +0000 Subject: [PATCH 039/340] 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 c7fa58f6b391625171c1aec7d636d89d7e280360 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 8 Oct 2018 20:02:24 -0300 Subject: [PATCH 040/340] 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 6424a1425c09f789b3e0fca3b9650e0ecb71e3ca Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Oct 2018 17:36:03 -0500 Subject: [PATCH 041/340] 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 0041d742aba89f035b3740b94a457a90e806f312 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Thu, 11 Oct 2018 01:53:34 +0200 Subject: [PATCH 042/340] 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 58654866ceab5d3161a4afcd037e425085dab652 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 12:12:54 +0200 Subject: [PATCH 043/340] 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 cc6e59e5d16d14281f0a9ccb8a9ef9073c71795a Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:24:40 +0200 Subject: [PATCH 044/340] 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 045/340] 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 046/340] 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 047/340] 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 0cda784a79ca48fe64f2b90241e32eb737130e39 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Thu, 11 Oct 2018 14:30:10 +0200 Subject: [PATCH 048/340] 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 74e6e0547999dca07c5bfe4d3f244b2647950384 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 11 Oct 2018 20:37:55 -0400 Subject: [PATCH 049/340] 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 0fc9fdf7f2e6bc36224275cebebb4992c7d31ea4 Mon Sep 17 00:00:00 2001 From: Sophia Donataccio Date: Thu, 11 Oct 2018 23:58:25 -0400 Subject: [PATCH 050/340] 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 051/340] 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 052/340] 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 053/340] 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 054/340] 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 055/340] 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 d4f88f1d0c8b3d80f2b1b9a15a6cb91786be8076 Mon Sep 17 00:00:00 2001 From: Shreyansh Khajanchi Date: Fri, 12 Oct 2018 17:39:58 +0530 Subject: [PATCH 056/340] 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 7658ae6b729a46b458f37243671db3d2cbe476d3 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Fri, 12 Oct 2018 17:59:49 +0300 Subject: [PATCH 057/340] 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 7bafe255530a73f8b68ed211099d7770277f9e1f Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Fri, 12 Oct 2018 09:33:37 -0700 Subject: [PATCH 058/340] 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 f969e6e4744f998454dafad2c69f2ccfbbb16da3 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 12 Oct 2018 19:29:34 +0000 Subject: [PATCH 059/340] 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 1ae8d8b793406434b8bf1e348931bb1a41973515 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 12 Oct 2018 18:58:38 +0000 Subject: [PATCH 060/340] 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 061/340] 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 062/340] 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 c02fc32e1d3fefb9ccc7e8f3b1cba7d11180851c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 12 Oct 2018 21:45:02 -0500 Subject: [PATCH 063/340] 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 064/340] 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 065/340] 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 066/340] 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 067/340] 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 068/340] 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 069/340] 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 070/340] 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 071/340] 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 072/340] 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 073/340] 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 074/340] 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 075/340] 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 076/340] 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 077/340] 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 078/340] 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 079/340] 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 080/340] 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 081/340] 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 082/340] 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 083/340] 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 084/340] 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 085/340] 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 086/340] 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 087/340] 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 088/340] 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 089/340] 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 090/340] 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 091/340] 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 092/340] 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 093/340] 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 094/340] 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 095/340] 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 096/340] 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 097/340] 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 098/340] 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 099/340] 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 100/340] 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 101/340] 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 102/340] 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 103/340] 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 104/340] 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 105/340] 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 106/340] 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 107/340] 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 108/340] 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 109/340] 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 110/340] 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 111/340] 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 112/340] 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 113/340] 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 114/340] 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 115/340] 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 116/340] 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 117/340] 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 118/340] 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 119/340] 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 120/340] 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 121/340] 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 122/340] 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 123/340] 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 124/340] 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 125/340] 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 126/340] 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 127/340] 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 128/340] 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 129/340] 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 130/340] 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 131/340] 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 132/340] 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 133/340] 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 134/340] 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 135/340] 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 136/340] 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 137/340] 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 138/340] 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 139/340] 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 140/340] 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 141/340] 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 142/340] 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 143/340] 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 144/340] 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 145/340] 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 146/340] 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 147/340] 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 148/340] 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 149/340] 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 150/340] 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 151/340] 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 152/340] 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 e2f8d7bd447bf06496cf3f8c151ccbb58e08ebbe Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Oct 2018 19:53:19 -0500 Subject: [PATCH 153/340] 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 154/340] 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 155/340] 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 156/340] 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 157/340] 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 158/340] 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 159/340] 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 160/340] 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 161/340] 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 162/340] 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 163/340] 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 164/340] 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 165/340] 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 166/340] 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 167/340] 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 168/340] 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 169/340] 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 170/340] 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 171/340] 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 172/340] 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 173/340] 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 174/340] 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 175/340] 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 176/340] 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 177/340] 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 178/340] 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 179/340] 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 180/340] 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 181/340] 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 182/340] 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 183/340] 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 184/340] 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 185/340] 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 186/340] 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 187/340] 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 188/340] 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 189/340] 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 190/340] 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 191/340] 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 192/340] 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 193/340] 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 194/340] 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 195/340] 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 196/340] 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 197/340] 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 198/340] 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 199/340] 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 200/340] 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 201/340] 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 202/340] 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 203/340] 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 204/340] 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 205/340] 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 206/340] 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 207/340] 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 208/340] 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 c8f7188f171aa7832595e623d602bb8ba090a644 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 14 Oct 2018 16:55:09 +0300 Subject: [PATCH 209/340] 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 210/340] 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 211/340] 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 212/340] 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 213/340] 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 214/340] 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 215/340] 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 216/340] 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 217/340] 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 218/340] 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 219/340] 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 220/340] 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 221/340] 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 222/340] 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 223/340] 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 224/340] 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 225/340] 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 226/340] 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 227/340] 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 228/340] 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 229/340] 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 230/340] 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 231/340] 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 232/340] 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 233/340] 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 234/340] 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 235/340] 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 236/340] 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 237/340] 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 238/340] 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 239/340] 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 240/340] 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 241/340] 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 242/340] 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 243/340] 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 244/340] 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 245/340] 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 246/340] 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 247/340] 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 248/340] 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 249/340] 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 250/340] 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 251/340] 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 252/340] 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 253/340] 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 254/340] 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 255/340] 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 256/340] 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 257/340] 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 258/340] 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 259/340] 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 260/340] 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 261/340] 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 262/340] 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 263/340] 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 264/340] 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 265/340] 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 266/340] 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 267/340] 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 268/340] 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 269/340] 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 270/340] 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 271/340] 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 272/340] 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 f028f77abe3faad0a2883ea10deca614d93cbc84 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 15 Oct 2018 14:30:45 +0200 Subject: [PATCH 273/340] 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 274/340] 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 275/340] 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 276/340] 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 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 277/340] 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 278/340] 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 279/340] 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 280/340] 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 281/340] 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 282/340] 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 283/340] 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 284/340] 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 285/340] 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 286/340] 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 287/340] 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 288/340] 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 289/340] 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 290/340] 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 291/340] 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 292/340] 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 293/340] 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 294/340] 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 295/340] 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 296/340] 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 297/340] 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 298/340] 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 299/340] 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 d953d8d424ba11a50ebe0dc32a59530c750c7023 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 20:56:02 -0700 Subject: [PATCH 300/340] 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 301/340] 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 f78fa3f28846d2a9919684236f0f2c50b4ff75c1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:22:12 -0700 Subject: [PATCH 302/340] 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 303/340] 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 4b43a79a5a266d944ea2f4d89ba202fb9282fbcc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Oct 2018 22:36:28 -0700 Subject: [PATCH 304/340] 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 305/340] 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 306/340] 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 307/340] 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 308/340] 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 309/340] 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 310/340] 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 311/340] 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 dec04173472a90643388c495d397a8c7732cb04f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 00:37:15 -0700 Subject: [PATCH 312/340] 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 b7a07313cc72219964b93e47c36fffeed314a351 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 11 Oct 2018 12:15:25 +0200 Subject: [PATCH 313/340] 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 314/340] 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 db7637377bf3b328008b8d77427ac75a193fcd94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 04:30:20 -0700 Subject: [PATCH 315/340] 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 316/340] 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 2e1b04b4efbc90555a34d44f00bc3ef92b1570d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Oct 2018 04:58:58 -0700 Subject: [PATCH 317/340] 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 318/340] 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 aac680d4c97cce08ce759043dd25a3efd5d9b5dd Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 16 Oct 2018 16:25:43 +0200 Subject: [PATCH 319/340] 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 320/340] 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 321/340] 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 322/340] 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 323/340] 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 324/340] 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 325/340] 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 326/340] 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 327/340] 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 328/340] 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 eca462813d7586063deb5c9989ae9bcef29f9495 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 16 Oct 2018 18:28:09 +0200 Subject: [PATCH 329/340] 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 7786575c6c0e1b010d46ad00b14d0bb5bf08d7d2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 16 Oct 2018 19:35:45 +0200 Subject: [PATCH 330/340] 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 331/340] 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 5edc1dd7a873bf1afaa9563def7b94d7b82a5421 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 16 Oct 2018 21:34:08 +0200 Subject: [PATCH 332/340] 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 333/340] 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 334/340] 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 b7632217aba97b805b79a52f6deb27a0d361a09b Mon Sep 17 00:00:00 2001 From: Lassulus Date: Wed, 17 Oct 2018 00:20:38 +0200 Subject: [PATCH 335/340] 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 336/340] 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 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 337/340] 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 338/340] 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 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 339/340] 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 1ba50fe163b03b4e1083c8baaa112c827f5197ab Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 14 Oct 2018 10:36:50 -0400 Subject: [PATCH 340/340] 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 { };