diff options
Diffstat (limited to 'pkgs/development')
914 files changed, 17442 insertions, 10580 deletions
diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix new file mode 100644 index 000000000000..c5a997ad75bc --- /dev/null +++ b/pkgs/development/compilers/acme/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchsvn }: + +stdenv.mkDerivation rec { + pname = "acme"; + version = "120"; + + src = fetchsvn { + url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; + rev = version; + sha256 = "0w17b8f8bis22m6l5bg8qg8nniy20f8yg2xmzjipblmc39vpv6s2"; + }; + + sourceRoot = "code-0-r${src.rev}/src"; + + makeFlags = [ "BINDIR=$(out)/bin" ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace "= gcc" "?= gcc" + ''; + + meta = with stdenv.lib; { + description = "A multi-platform cross assembler for 6502/6510/65816 CPUs."; + homepage = "https://sourceforge.net/projects/acme-crossass/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix deleted file mode 100644 index b70fde00e15e..000000000000 --- a/pkgs/development/compilers/as31/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchpatch, fetchurl, yacc }: - -let - - version = "2.3.1"; - -in stdenv.mkDerivation { - pname = "as31"; - inherit version; - src = fetchurl { - name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL - url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz"; - sha256 = "0mbk6z7z03xb0r0ccyzlgkjdjmdzknck4yxxmgr9k7v8f5c348fd"; - }; - - buildInputs = [ yacc ]; - - patches = [ - (fetchpatch { - name = "CVE-2012-0808.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=655496;filename=as31-mkstemps.patch;msg=5"; - sha256 = "0iia4wa8m141bwz4588yxb1dp2qwhapcii382sncm6jvwyngwh21"; - }) - ]; - - preConfigure = '' - chmod +x ./configure - ''; - - postConfigure = '' - rm as31/parser.c - ''; - - meta = with stdenv.lib; { - homepage = http://wiki.erazor-zone.de/wiki:projects:linux:as31; - description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats"; - maintainers = with maintainers; [ aneeshusa ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 0efdabcde2ee..5204932448b1 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200224"; + version = "20200315"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0qlnpnd64rrlyz7ybdnp7zk5ns2s0071zs1fcrcq9ba2lnhfbmmb"; + sha256 = "0akif1wgsyyqrfkidkwhw47dsx471h3b4zsjhnh4rf6kv7by3q65"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 3a6c5e9c2c7e..1665061125d6 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "compcert"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "AbsInt"; repo = "CompCert"; rev = "v${version}"; - sha256 = "1k9xhj7fgllhf7bn7rp3w6zfvs4clglnc4w39zp4678hrwvdcpha"; + sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix index 65cfcaa7ff63..36b71f3f38a0 100644 --- a/pkgs/development/compilers/computecpp/default.nix +++ b/pkgs/development/compilers/computecpp/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "computecpp"; - version = "1.2.0"; + version = "1.3.0"; src = fetchzip { url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/ubuntu-16.04-64bit.tar.gz"; - sha256 = "191kwvzxfg1sbaq6aw6f84chi7bhsibb2a63zsyz3gz8m0c0syr5"; + sha256 = "1q6gqjpzz4a260gsd6mm1iv4z8ar3vxaypmgdwl8pb4i7kg6ykaz"; stripRoot = true; }; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index fa9f72ebd044..3e2d3ce2ad2f 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -52,14 +52,6 @@ let })); elm-instrument = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-instrument.nix {}) (drv: { - patches = [( - # GHC 8.8.1 and Cabal >= 1.25.0 support - # https://github.com/zwilias/elm-instrument/pull/3 - fetchpatch { - url = "https://github.com/turboMaCk/elm-instrument/commit/4272db2aea742c8b54509e536fa4f35d04f95da5.patch"; - sha256 = "1d1lc43lp3x5jfhlyb1b7na7nj1g1i1vc1np26pcisg9c2s7gjz6"; - } - )]; prePatch = '' sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place ''; diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix index bd7690162277..54077994fbdd 100644 --- a/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -3,15 +3,15 @@ , fetchgit, filepath, free, HUnit, indents, json, mtl , optparse-applicative, parsec, process, QuickCheck, quickcheck-io , split, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck -, text, elm +, text }: mkDerivation { pname = "elm-instrument"; version = "0.0.7"; src = fetchgit { - url = "https://github.com/zwilias/elm-instrument.git"; - sha256 = "14yfzwsyvgc6rzn19sdmwk2mc1vma9hcljnmjnmlig8mp0271v56"; - rev = "31b527e405a6afdb25bb87ad7bd14f979e65cff7"; + url = "https://github.com/zwilias/elm-instrument"; + sha256 = "167d7l2547zxdj7i60r6vazznd9ichwc0bqckh3vrh46glkz06jv"; + rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix new file mode 100644 index 000000000000..afc8fbd7f499 --- /dev/null +++ b/pkgs/development/compilers/flutter/default.nix @@ -0,0 +1,31 @@ +{ callPackage }: + +let + mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; + getPatches = dir: + let files = builtins.attrNames (builtins.readDir dir); + in map (f: dir + ("/" + f)) files; +in { + stable = mkFlutter { + pname = "flutter"; + channel = "stable"; + version = "1.12.13+hotfix.9"; + sha256Hash = "1ql3zvmmk5zk47y30lajxaam04q6vr373dayq15jv4vpc0fzif1y"; + patches = getPatches ./patches/stable; + }; + beta = mkFlutter { + pname = "flutter-beta"; + channel = "beta"; + version = "1.15.17"; + sha256Hash = "0iil6y6y477dhjgzx54ab5m9nj0jg4xl8x4zzd9iwh8m756r7qsd"; + patches = getPatches ./patches/beta; + }; + dev = mkFlutter rec { + pname = "flutter-dev"; + channel = "dev"; + version = "1.17.0-dev.5.0"; + filename = "flutter_linux_${version}-${channel}.tar.xz"; + sha256Hash = "0ks2jf2bd42y2jsc91p33r57q7j3m94d8ihkmlxzwi53x1mwp0pk"; + patches = getPatches ./patches/beta; + }; +} diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix new file mode 100644 index 000000000000..fad2a646a165 --- /dev/null +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -0,0 +1,129 @@ +{ channel, pname, version, sha256Hash, patches +, filename ? "flutter_linux_v${version}-${channel}.tar.xz" }: + +{ bash, buildFHSUserEnv, cacert, coreutils, git, makeWrapper, runCommand, stdenv +, fetchurl, alsaLib, dbus, expat, libpulseaudio, libuuid, libX11, libxcb +, libXcomposite, libXcursor, libXdamage, libXfixes, libGL, nspr, nss, systemd }: + +let + drvName = "flutter-${channel}-${version}"; + flutter = stdenv.mkDerivation { + name = "${drvName}-unwrapped"; + + src = fetchurl { + url = + "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; + sha256 = sha256Hash; + }; + + buildInputs = [ makeWrapper git ]; + + inherit patches; + + postPatch = '' + patchShebangs --build ./bin/ + find ./bin/ -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; + ''; + + buildPhase = '' + FLUTTER_ROOT=$(pwd) + FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" + SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" + STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" + SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" + DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk" + + DART="$DART_SDK_PATH/bin/dart" + PUB="$DART_SDK_PATH/bin/pub" + + HOME=../.. # required for pub upgrade --offline, ~/.pub-cache + # path is relative otherwise it's replaced by /build/flutter + + (cd "$FLUTTER_TOOLS_DIR" && "$PUB" upgrade --offline) + + local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" + "$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" + echo "$revision" > "$STAMP_PATH" + echo -n "${version}" > version + + rm -rf bin/cache/{artifacts,downloads} + rm -f bin/cache/*.stamp + ''; + + installPhase = '' + mkdir -p $out + cp -r . $out + ''; + }; + + # Wrap flutter inside an fhs user env to allow execution of binary, + # like adb from $ANDROID_HOME or java from android-studio. + fhsEnv = buildFHSUserEnv { + name = "${drvName}-fhs-env"; + multiPkgs = pkgs: [ + # Flutter only use these certificates + (runCommand "fedoracert" { } '' + mkdir -p $out/etc/pki/tls/ + ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs + '') + pkgs.zlib + ]; + targetPkgs = pkgs: + with pkgs; [ + bash + curl + git + unzip + which + xz + + # flutter test requires this lib + libGLU + + # for android emulator + alsaLib + dbus + expat + libpulseaudio + libuuid + libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXfixes + libGL + nspr + nss + systemd + ]; + }; + +in runCommand drvName { + startScript = '' + #!${bash}/bin/bash + export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} + export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 + ${fhsEnv}/bin/${drvName}-fhs-env ${flutter}/bin/flutter --no-version-check "$@" + ''; + preferLocalBuild = true; + allowSubstitutes = false; + passthru = { unwrapped = flutter; }; + meta = with stdenv.lib; { + description = + "Flutter is Google's SDK for building mobile, web and desktop with Dart."; + longDescription = '' + Flutter is Google’s UI toolkit for building beautiful, + natively compiled applications for mobile, web, and desktop from a single codebase. + ''; + homepage = "https://flutter.dev"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ babariviere ]; + }; +} '' + mkdir -p $out/bin + + echo -n "$startScript" > $out/bin/${pname} + chmod +x $out/bin/${pname} +'' diff --git a/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch new file mode 100644 index 000000000000..42c09c805cb5 --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch @@ -0,0 +1,31 @@ +diff --git a/bin/flutter b/bin/flutter +index e0c18e235..2c3fb7ddd 100755 +--- a/bin/flutter ++++ b/bin/flutter +@@ -185,8 +185,6 @@ fi + # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" + # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" + +-(upgrade_flutter) 3< "$PROG_NAME" +- + # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as + # separate space-separated args. + "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +index 99455ae64..f5b0cb59c 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + } + + _checkFlutterCopy(); +- try { +- await globals.flutterVersion.ensureVersionFile(); +- } on FileSystemException catch (e) { +- globals.printError('Failed to write the version file to the artifact cache: "$e".'); +- globals.printError('Please ensure you have permissions in the artifact cache directory.'); +- throwToolExit('Failed to write the version file'); +- } + final bool machineFlag = topLevelResults['machine'] as bool; + if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) { + await globals.flutterVersion.checkFlutterVersionFreshness(); diff --git a/pkgs/development/compilers/flutter/patches/beta/move-cache.patch b/pkgs/development/compilers/flutter/patches/beta/move-cache.patch new file mode 100644 index 000000000000..4672d4c625d0 --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/beta/move-cache.patch @@ -0,0 +1,63 @@ +diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart +index 8e511eefd..fbc7d6ac3 100644 +--- a/dev/devicelab/lib/framework/runner.dart ++++ b/dev/devicelab/lib/framework/runner.dart +@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async { + print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); + final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; + final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); +- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); ++ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); + copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); + if (!Platform.isWindows) { + await exec( +diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart +index 79b06949f..9040ba0a8 100644 +--- a/packages/flutter_tools/lib/src/asset.dart ++++ b/packages/flutter_tools/lib/src/asset.dart +@@ -6,6 +6,7 @@ import 'dart:async'; + + import 'package:yaml/yaml.dart'; + ++import 'base/common.dart'; + import 'base/context.dart'; + import 'base/file_system.dart'; + import 'base/utils.dart'; +@@ -325,7 +326,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { + for (final Map<dynamic, dynamic> font in family['fonts']) { + final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); + result.add(_Asset( +- baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), ++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), + relativeUri: Uri(path: entryUri.pathSegments.last), + entryUri: entryUri, + )); +diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart +index 715189938..5afb2a0db 100644 +--- a/packages/flutter_tools/lib/src/cache.dart ++++ b/packages/flutter_tools/lib/src/cache.dart +@@ -189,8 +189,14 @@ class Cache { + return; + } + assert(_lock == null); ++ ++ final Directory dir = globals.fs.directory(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); ++ if (!dir.existsSync()) { ++ dir.createSync(recursive: true); ++ globals.os.chmod(dir, '755'); ++ } + final File lockFile = +- globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); ++ globals.fs.file(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile')); + try { + _lock = lockFile.openSync(mode: FileMode.write); + } on FileSystemException catch (e) { +@@ -290,7 +296,7 @@ class Cache { + if (_rootOverride != null) { + return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); + } else { +- return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache')); ++ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter')); + } + } + diff --git a/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch new file mode 100644 index 000000000000..16fe504595f3 --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch @@ -0,0 +1,31 @@ +diff --git a/bin/flutter b/bin/flutter +index 3955f8f39..1e7573d30 100755 +--- a/bin/flutter ++++ b/bin/flutter +@@ -185,8 +185,6 @@ fi + # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" + # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" + +-(upgrade_flutter) 3< "$PROG_NAME" +- + # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as + # separate space-separated args. + "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +index 5e45819d9..ab748b059 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +@@ -377,13 +377,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + } + + _checkFlutterCopy(); +- try { +- await FlutterVersion.instance.ensureVersionFile(); +- } on FileSystemException catch (e) { +- printError('Failed to write the version file to the artifact cache: "$e".'); +- printError('Please ensure you have permissions in the artifact cache directory.'); +- throwToolExit('Failed to write the version file'); +- } + if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool) { + await FlutterVersion.instance.checkFlutterVersionFreshness(); + } diff --git a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch new file mode 100644 index 000000000000..e5719a2867f9 --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch @@ -0,0 +1,63 @@ +diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart +index 9fae74726..d88d6ecbb 100644 +--- a/dev/devicelab/lib/framework/runner.dart ++++ b/dev/devicelab/lib/framework/runner.dart +@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async { + print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); + final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; + final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); +- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); ++ recursiveCopy(Directory(path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); + copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); + if (!Platform.isWindows) { + await exec( +diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart +index e6216c737..5ab497092 100644 +--- a/packages/flutter_tools/lib/src/asset.dart ++++ b/packages/flutter_tools/lib/src/asset.dart +@@ -6,6 +6,7 @@ import 'dart:async'; + + import 'package:yaml/yaml.dart'; + ++import 'base/common.dart'; + import 'base/context.dart'; + import 'base/file_system.dart'; + import 'base/platform.dart'; +@@ -326,7 +327,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { + for (Map<dynamic, dynamic> font in family['fonts']) { + final Uri entryUri = fs.path.toUri(font['asset'] as String); + result.add(_Asset( +- baseDir: fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), ++ baseDir: fs.path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), + relativeUri: Uri(path: entryUri.pathSegments.last), + entryUri: entryUri, + )); +diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart +index 5e1950b56..45585f9c0 100644 +--- a/packages/flutter_tools/lib/src/cache.dart ++++ b/packages/flutter_tools/lib/src/cache.dart +@@ -164,8 +164,14 @@ class Cache { + return; + } + assert(_lock == null); ++ ++ final Directory dir = fs.directory(fs.path.join(homeDirPath, '.cache', 'flutter')); ++ if (!dir.existsSync()) { ++ dir.createSync(recursive: true); ++ os.chmod(dir, '755'); ++ } + final File lockFile = +- fs.file(fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); ++ fs.file(fs.path.join(homeDirPath, '.cache', 'flutter', 'lockfile')); + try { + _lock = lockFile.openSync(mode: FileMode.write); + } on FileSystemException catch (e) { +@@ -239,7 +245,7 @@ class Cache { + if (_rootOverride != null) { + return fs.directory(fs.path.join(_rootOverride.path, 'bin', 'cache')); + } else { +- return fs.directory(fs.path.join(flutterRoot, 'bin', 'cache')); ++ return fs.directory(fs.path.join(homeDirPath, '.cache', 'flutter')); + } + } + diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index cf13ab6f5954..f160150d8b53 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "fpc-2.6.0-binary"; + name = "fpc-3.0.0-binary"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.i386-linux.tar"; - sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf"; + url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.i386-linux.tar"; + sha256 = "0h3f1dgs1zsx7vvk9kg67anjvgw5sslfbmjblif7ishbcp3k3g5k"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar"; - sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx"; + url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.x86_64-linux.tar"; + sha256 = "1m2xx3nda45cb3zidbjgdr8kddd19zk0khvp7xxdlclszkqscln9"; } else throw "Not supported on ${stdenv.hostPlatform.system}."; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 7bddafc6ff59..a3f5e30aea82 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -3,20 +3,22 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.0.4"; pname = "fpc"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; - sha256 = "1v40bjp0kvsi8y0mndqvvhnsqjfssl2w6wpfww51j4rxblfkp4fm"; + sha256 = "0xjyhlhz846jbnp12y68c7nq4xmp4i65akfbrjyf3r62ybk18rgn"; }; buildInputs = [ startFPC gawk ]; + glibc = stdenv.cc.libc.out; preConfigure = if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas + sed -e "s@/lib64[^']*@${glibc}/lib@" -i fpcsrc/compiler/systems/t_linux.pas '' else ""; makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 1b3f4d168ee9..faf040859991 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { pname = "lazarus"; - version = "1.8.4"; + version = "2.0.6"; src = fetchurl { url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz"; - sha256 = "1s8hdip973fc1lynklddl0mvg2jd2lzkfk8hzb8jlchs6jn0362s"; + sha256 = "0v1ax6039nm2bksh646znrkah20ak2zmhaz5p3mz2p60y2qazkc2"; }; buildInputs = [ diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index f660a59a790a..46918b1f0a1c 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -43,7 +43,7 @@ with stdenv.lib; with builtins; let majorVersion = "9"; - version = "${majorVersion}.2.0"; + version = "${majorVersion}.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -76,7 +76,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "01mj3yk7z49i49168hg2cg7qs4bsccrrnv7pjmbdlf8j2a7z0vpa"; + sha256 = "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi"; }; inherit patches; @@ -245,12 +245,6 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; - # In this particular combination it stopped creating lib output at all. - # TODO: perhaps find a better fix? (ideally understand what's going on) - postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.is32bit - then ''mkdir "$lib"'' - else null; - meta = { homepage = https://gcc.gnu.org/; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 112439ba4d36..8d03e0104646 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -201,11 +201,11 @@ postConfigure() { preInstall() { + mkdir -p "$out/${targetConfig}/lib" + mkdir -p "$lib/${targetConfig}/lib" # Make ‘lib64’ symlinks to ‘lib’. if [ -n "$is64bit" -a -z "$enableMultilib" ]; then - mkdir -p "$out/${targetConfig}/lib" ln -s lib "$out/${targetConfig}/lib64" - mkdir -p "$lib/${targetConfig}/lib" ln -s lib "$lib/${targetConfig}/lib64" fi } diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index bd67fae158af..9198d08cef45 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -88,12 +88,12 @@ let in stdenv.mkDerivation (rec { - version = "8.10.0.20200123"; + version = "8.10.1"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/ghc/8.10.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "162s5g33s918i12qfcqdj5wanc10xg07g5lq3gpm5j7c1v0y1zrf"; + url = "https://downloads.haskell.org/ghc/8.10.1/ghc-${version}-src.tar.xz"; + sha256 = "1xgdl6ig5jzli3bg054vfryfkg0y6wggf68g66c32sr67bw0ffsf"; }; enableParallelBuilding = true; @@ -149,15 +149,21 @@ stdenv.mkDerivation (rec { # 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.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--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" + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" ] ++ stdenv.lib.optionals useLdGold [ diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix index 1f24b9a1ff24..9f546bcb541c 100644 --- a/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -1,12 +1,15 @@ { stdenv, substituteAll , fetchurl, perl, gcc, llvm , ncurses5, gmp, glibc, libiconv +, llvmPackages }: # Prebuilt only does native assert stdenv.targetPlatform == stdenv.hostPlatform; let + useLLVM = !stdenv.targetPlatform.isx86; + libPath = stdenv.lib.makeLibraryPath ([ ncurses5 gmp ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); @@ -53,7 +56,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; - buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm ]; + propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 4bebd63956e7..57d6a108de09 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [(fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf"; + url = "https://github.com/haskell/hsc2hs/commit/738f3666c878ee9e79c3d5e819ef8b3460288edf.diff"; sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; extraPrefix = "utils/hsc2hs/"; stripLen = 1; @@ -112,7 +112,7 @@ stdenv.mkDerivation (rec { }) ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch ++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch { - url = "https://git.haskell.org/ghc.git/patch/d8495549ba9d194815c2d0eaee6797fc7c00756a"; + url = "https://github.com/ghc/ghc/commit/d8495549ba9d194815c2d0eaee6797fc7c00756a.diff"; sha256 = "1yjcma507c609bcim4rnxq0gaj2dg4d001jklmbpbqpzqzxkn5sz"; }); diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index fe576186b0e5..97793d912895 100644 --- a/pkgs/development/compilers/ghc/8.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -1,12 +1,15 @@ { stdenv , fetchurl, perl, gcc , ncurses5, gmp, glibc, libiconv +, llvmPackages }: # Prebuilt only does native assert stdenv.targetPlatform == stdenv.hostPlatform; let + useLLVM = !stdenv.targetPlatform.isx86; + libPath = stdenv.lib.makeLibraryPath ([ ncurses5 gmp ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); @@ -24,27 +27,33 @@ let in stdenv.mkDerivation rec { - version = "8.6.3"; + version = "8.6.5"; name = "ghc-${version}-binary"; + # https://downloads.haskell.org/~ghc/8.6.5/ src = fetchurl ({ i686-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; - sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m"; + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + sha256 = "1p2h29qghql19ajk755xa0yxkn85slbds8m9n5196ris743vkp8w"; }; x86_64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; - sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719"; + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb9-linux.tar.xz"; + sha256 = "1pqlx6rdjs2110g0y1i9f8x18lmdizibjqd15f5xahcz39hgaxdw"; + }; + aarch64-linux = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; + sha256 = "11n7l2a36i5vxzzp85la2555q4m34l747g0pnmd81cp46y85hlhq"; }; x86_64-darwin = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r"; + sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz"; }; }.${stdenv.hostPlatform.system} or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; + propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ @@ -168,5 +177,5 @@ stdenv.mkDerivation rec { }; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index e4ece9b8d8c1..237b03080f51 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -158,10 +158,10 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (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) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 35bcfa36e993..3b4091bf1140 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index aa8812730323..36345bb0dab8 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 3651b9361166..28a680f8d76e 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14"; + version = "1.14.1"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "12a3nzj4k4p5ica447sjfva9pvvj84a03b4xlg3mhl2nmm33wr3d"; + sha256 = "0xkna02clggcdgl5xxwani62krnf64x6p3hk9k5v9ldh2lhmglia"; }; # perl is used for testing go vet @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 0dd852a1ef16..c3c46de1fce0 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin Security; + depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; hardeningDisable = [ "all" ]; diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 3e10041c5c80..92b312ba19e5 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.3151"; + version = "1.0.3627"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "1c2ll563a2j4sv3r468i4lv158hkzywnyajyk7iyin7bhqhm2vzf"; + sha256 = "1x9fjvf7rbhil09am2v9j2jhwysdvwgshf9zidbirjgfrqn573h8"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix index a9613de91eb9..8ce55c757959 100644 --- a/pkgs/development/compilers/jwasm/default.nix +++ b/pkgs/development/compilers/jwasm/default.nix @@ -2,24 +2,30 @@ , cmake }: with stdenv.lib; -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "jwasm"; - version = "git-2017-11-22"; + version = "2.13"; src = fetchFromGitHub { owner = "JWasm"; repo = "JWasm"; - rev = "26f97c8b5c9d9341ec45538701116fa3649b7766"; + rev = version; sha256 = "0m972pc8vk8s9yv1pi85fsjgm6hj24gab7nalw2q04l0359nqi7w"; }; nativeBuildInputs = [ cmake ]; - installPhase = "mkdir -p $out/bin ; cp jwasm $out/bin/"; + installPhase = '' + install -Dpm755 jwasm -t $out/bin/ + install -Dpm644 $src/History.txt $src/Readme.txt \ + $src/Doc/enh.txt $src/Doc/fixes.txt \ + $src/Doc/gencode.txt $src/Doc/overview.txt \ + -t $out/share/doc/jwasm/ + ''; meta = { description = "A MASM-compatible x86 assembler"; - homepage = http://jwasm.github.io/; + homepage = "http://jwasm.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 9a124ad84771..d4f37d4f5cce 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.70"; + version = "1.3.71"; in stdenv.mkDerivation { inherit version; pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1iw9pjacjdhhvriaz2kzf677csq2nfx66k5cickk79h7ywppi7bh"; + sha256 = "0jp7z2lys02d0wmycdlfg9c08ji4qvjaz2wzvrxjyvcwv7d7gnvs"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index c397d02038da..7ed716bf866f 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata -, python, libconfig, lit, gdb, unzip, darwin, bash +, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , bootstrapVersion ? false , version ? "1.17.0" @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja makeWrapper unzip ] ++ stdenv.lib.optionals (!bootstrapVersion) [ - bootstrapLdc python lit + bootstrapLdc lit lit.python ] ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) # https://github.com/NixOS/nixpkgs/issues/57120 diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index dfdc9f74e15b..9b63b772ac09 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -8,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "0ap63qhz0j6m63l4njwp055xni4s71dsxqi1w5d2p93hbswaiiw2"; + src = fetch "clang" "08fbxa2a0kr3ni35ckppj0kyvlcyaywrhpqwcdrdy0z900mhcnw8"; unpackPhase = '' unpackFile $src @@ -95,7 +95,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index 8c870a610cc2..02bbc17c9673 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "1g067yx8qz0bmf00b2xqjqaayqj2xvrjp9smms3a16syj9m0hfri"; + src = fetch pname "0x9c531k6ww21s2mkdwqx1vbdjmx6d4wmfb8gdbj0wqa796sczba"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 574ab5ec4e77..462f246b89da 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -6,15 +6,14 @@ let release_version = "10.0.0"; - candidate = "rc5"; - version = "10.0.0${candidate}"; # differentiating these is important for rc's + version = release_version; # differentiating these (variables) is important for rc's fetch = name: sha256: fetchurl { - url = "https://prereleases.llvm.org/${release_version}/${candidate}/${name}-${version}.src.tar.xz"; + url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "0x23q70c0xcwdhj0d66nisr8rqq69qcshrbb4si9pxfsm0zs9h3i"; + clang-tools-extra_src = fetch "clang-tools-extra" "074ija5s2jsdn0k035r2dzmryjmqxdnyg4xwvaqych2bazv8rpxc"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 18eae91d3402..df009775978f 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "0qw85sy3y1mcdrj8yd1j1gmskh0vs4xdgrx80niigizhr7030vxs"; + src = fetch "libcxx" "1isnj78diknh0nvd73mlq8p8g209f9bab2mbysq826bg2wzql3r7"; postUnpack = '' unpackFile ${libcxxabi.src} @@ -47,7 +47,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix index ba51f0f33f1b..5af88369e789 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "15iclzxjqfjynqxjg8dahyr0gfg83blv9dm7z9hq5ipxw8x2sglf"; + src = fetch "libcxxabi" "1q8lrbh68a9v4lr88b8xsjpmwx5z96sa5wnkb92xx7ccm1ssq6z7"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; @@ -40,7 +40,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix index 6016d0536bff..4e55b28c2430 100644 --- a/pkgs/development/compilers/llvm/10/libunwind.nix +++ b/pkgs/development/compilers/llvm/10/libunwind.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "12c2fh63afav8rfmplfs628r74ksfs8fjls655rwjsrg1hk0gy3l"; + src = fetch pname "09n66dl9cc17d81qflj5h1l4garmhvzfi2lhcb7rx00l8z65xp09"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix index ab2dd8caee83..672105d7c507 100644 --- a/pkgs/development/compilers/llvm/10/lld.nix +++ b/pkgs/development/compilers/llvm/10/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "08zg546872b432qrx49i7k1c2vdq9yjvc7gnrvy2nywv0d2qf9nc"; + src = fetch pname "026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index 12cb43bc504c..6f83f5a23422 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/pkgs/development/compilers/llvm/10/lldb.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "0swv16n7gm12f399f7hxai1jh89s14h3yg7cci10yaiibpvwk73x"; + src = fetch pname "0ddikvc0kbqlqvsypsm9nhfwmyw4prp4rv49f0bgacyh5ssgq7yx"; patches = [ ./lldb-procfs.patch ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://lldb.llvm.org; + homepage = https://lldb.llvm.org; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 0405958070a2..9c8f4c5afcdf 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "1abfi0zqbcwxf68dk00szpjxkcd44589va243af8sg97hljq6709"; - polly_src = fetch "polly" "1fzg5934km69rwam6vgznk0p4slzhr0icwmj3jibw3p93ppa8k9r"; + src = fetch pname "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz"; + polly_src = fetch "polly" "15sd3dq0w60jsb76pis09lkagj5iy43h9hg4kd9gx5l8cbnsdyrm"; unpackPhase = '' unpackFile $src @@ -161,7 +161,7 @@ in stdenv.mkDerivation (rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix index 1cdd4cc9bba1..f0229d0b48e2 100644 --- a/pkgs/development/compilers/llvm/10/openmp.nix +++ b/pkgs/development/compilers/llvm/10/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "0swif1plz7drjha6rdw02b60symsz95w62wxpiygbpdwsmhbbgam"; + src = fetch pname "1ymd13gj07x0b0vxziygm0p41vrq6nsgx837jqg9ll6h8ndg57rv"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index e391ce046dbc..90a7ad966ce5 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -83,7 +83,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index b02e09a83a81..74e61a4a4ddf 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 1b891af09ed1..9655b48088a0 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index bfee91d91bf6..608211efb581 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index a91a7e4354ef..6bdd7f4be7d2 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 2ce17765d633..55eb61082e41 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation ({ requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 559377bcc1b7..03a98f13148f 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 9374fc0bda9f..113b36e32290 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -83,7 +83,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 831c6c9c7002..2dccac3938b8 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index ac1f4f653e6a..7c6d8974bbd0 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 58b9b8060fa3..30e612cebec0 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 30d72d944264..90b147fe0886 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 80acd3fa2fe1..7bb3d38033d8 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 447904b9ad5f..e1ed2d7438e2 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index 6e01f4259ee0..52ddbeccdff7 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -93,7 +93,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index f2cdd2f6f5fa..9537e97af997 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 9067bf43a8fa..99d7983691c8 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index 823e9640cf4e..275b551863ac 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index ace6ae812fde..305f1ad3595b 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index d7fb1fe4b93f..4a019b5ad255 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -170,7 +170,7 @@ in stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index 7adc2aa588e3..772693e54c39 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 81a069e6c01b..563986f16483 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -103,7 +103,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 883d9c8776f3..f29b60fa7316 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 58a1241d8236..dc2f02c1d996 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index fc52d691d030..fc7e4ca1c9d0 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index 75be5b993df3..8893371e2aa1 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index a9c4a6b0ba25..47535148f88a 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -145,7 +145,7 @@ in stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index 166e7f68eb3b..df3c8ab1702b 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index d8df52df553c..e0e448390b16 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -98,7 +98,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index 9e3525574d5c..67672a45d40e 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix index fbc9a3731ef8..4e3c7b6aeee2 100644 --- a/pkgs/development/compilers/llvm/9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/9/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix index 775dc2e19056..7378cf912a61 100644 --- a/pkgs/development/compilers/llvm/9/lld.nix +++ b/pkgs/development/compilers/llvm/9/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix index 506fc1c3e505..b1e375b336b0 100644 --- a/pkgs/development/compilers/llvm/9/lldb.nix +++ b/pkgs/development/compilers/llvm/9/lldb.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index 2cdc5a5fd066..089d66ba7507 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -162,7 +162,7 @@ in stdenv.mkDerivation (rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix index 4e0a5535ae35..9bf57451f324 100644 --- a/pkgs/development/compilers/llvm/9/openmp.nix +++ b/pkgs/development/compilers/llvm/9/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/matter-compiler/Gemfile.lock b/pkgs/development/compilers/matter-compiler/Gemfile.lock index ab1833b3cfe9..230b99d91a63 100644 --- a/pkgs/development/compilers/matter-compiler/Gemfile.lock +++ b/pkgs/development/compilers/matter-compiler/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES matter_compiler BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index afd08f6e96e7..b0fbc2eb8d13 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.02.04"; + version = "2020.03.25"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "ca733561873cd54be047ae30a94efcd71b3f8be5"; - sha256 = "176drrq6w53qbwmnksa1b22w9qz3gd1db9hy2lyv8svbcdxd9qwp"; + rev = "a3ede0293a50c910e7d96319b2084d50f2501a6b"; + sha256 = "0ikfjva4gqmlx6y7mjamg03ad7x9gnz32ahqv798ynd87svq10aq"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 316ddbfcb607..53854d4fa35c 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "nim"; - version = "1.0.6"; + version = "1.2.0"; src = fetchurl { url = "https://nim-lang.org/download/${pname}-${version}.tar.xz"; - sha256 = "1cv6bxc7w21455c0pv0r2h64ljyzw266jsk1fsgiiyk2rx8mfkhk"; + sha256 = "TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU="; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/pkgs/development/compilers/ocaml/4.09.nix index 4b56d82eba54..a093a2446419 100644 --- a/pkgs/development/compilers/ocaml/4.09.nix +++ b/pkgs/development/compilers/ocaml/4.09.nix @@ -1,6 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "09"; - patch_version = "0"; - sha256 = "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj"; + patch_version = "1"; + sha256 = "1aq5505lpa39garky2icgfv4c7ylpx3j623cz9bsz5c466d2kqls"; + + # Breaks build with Clang + hardeningDisable = [ "strictoverflow" ]; } diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 6980b6e5ff13..12369ebcc6f1 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -11,7 +11,7 @@ let in { stdenv, fetchurl, ncurses, buildEnv -, libX11, xorgproto, useX11 ? safeX11 stdenv +, libX11, xorgproto, useX11 ? safeX11 stdenv && !stdenv.lib.versionAtLeast version "4.09" , aflSupport ? false , flambdaSupport ? false }: diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 908a8e943e78..0bebd5d2f50d 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -1,27 +1,61 @@ -{ haskellPackages, mkDerivation, fetchFromGitHub, lib }: +# Based on https://github.com/justinwoo/easy-purescript-nix/blob/master/psc-package-simple.nix +{ stdenv, lib, fetchurl, gmp, zlib, libiconv, darwin, installShellFiles }: -with lib; +let + dynamic-linker = stdenv.cc.bintools.dynamicLinker; + +in +stdenv.mkDerivation rec { + pname = "psc-package-simple"; -mkDerivation rec { - pname = "psc-package"; version = "0.6.2"; - src = fetchFromGitHub { - owner = "purescript"; - repo = pname; - rev = "v${version}"; - sha256 = "0536mijma61khldnpbdviq2vvpfzzz7w8bxr59mvr19i10njdq0y"; + src = if stdenv.isDarwin + then fetchurl { + url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/macos.tar.gz"; + sha256 = "17dh3bc5b6ahfyx0pi6n9qnrhsyi83qdynnca6k1kamxwjimpcq1"; + } + else fetchurl { + url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/linux64.tar.gz"; + sha256 = "1zvay9q3xj6yd76w6qyb9la4jaj9zvpf4dp78xcznfqbnbhm1a54"; }; - isLibrary = false; - isExecutable = true; + buildInputs = [ gmp zlib ]; + nativeBuildInputs = [ installShellFiles ]; + + libPath = lib.makeLibraryPath buildInputs; + + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin - executableHaskellDepends = with haskellPackages; [ - aeson aeson-pretty either errors optparse-applicative - system-filepath turtle - ]; + PSC_PACKAGE=$out/bin/psc-package - description = "A package manager for PureScript based on package sets"; - license = licenses.bsd3; - maintainers = with lib.maintainers; [ Profpatsch ]; + install -D -m555 -T psc-package $PSC_PACKAGE + chmod u+w $PSC_PACKAGE + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool \ + -change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \ + -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \ + $PSC_PACKAGE + '' + lib.optionalString (!stdenv.isDarwin) '' + patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PSC_PACKAGE + '' + '' + chmod u-w $PSC_PACKAGE + + $PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash + $PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish + $PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package + installShellCompletion \ + psc-package.{bash,fish} \ + --zsh _psc-package + ''; + + meta = with lib; { + description = "A package manager for PureScript based on package sets"; + license = licenses.bsd3; + maintainers = with maintainers; [ Profpatsch ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + }; } diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index d1797a448ad1..6f61068738af 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A strongly-typed functional programming language that compiles to JavaScript"; - homepage = http://www.purescript.org/; + homepage = "https://www.purescript.org/"; license = licenses.bsd3; maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index ef27fc41b077..94ed520ee6c1 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.5.4"; + version = "3.6.0"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "e3287476e5c3f0cbcd9dc7ab18d290f81f4afa0c"; - sha256 = "02p5d1x6lr7jp9mvgvsas3nnq3a97chxp5q6rl07n5qm61d5b4dl"; + rev = "2860cc274b1b5b76a71d0e5190bf67a133d6f809"; + sha256 = "05wcg0gfln85spjfgsij818h2sp4y6s8bvdcwmzv0r8jblr8402b"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index bf2594b9bf4c..52d388beaed5 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -6,18 +6,18 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "rednex"; repo = "rgbds"; rev = "v${version}"; - sha256 = "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv"; + sha256 = "0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = [ "PREFIX=\${out}" ]; meta = with stdenv.lib; { - homepage = https://rednex.github.io/rgbds/; + homepage = "https://rednex.github.io/rgbds/"; description = "A free assembler/linker package for the Game Boy and Game Boy Color"; license = licenses.mit; longDescription = diff --git a/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch b/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch new file mode 100644 index 000000000000..0b9359221a78 --- /dev/null +++ b/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch @@ -0,0 +1,52 @@ +From 036c87c82793f1da9f98445e8e27462cc19bbe0a Mon Sep 17 00:00:00 2001 +From: John Ericson <John.Ericson@Obsidian.Systems> +Date: Sat, 22 Feb 2020 14:38:38 -0500 +Subject: [PATCH] Allow getting `no_std` from the config file + +Currently, it is only set correctly in the sanity checking implicit +default fallback code. Having a config file at all will for force +`no_std = false`. +--- + src/bootstrap/config.rs | 3 +++ + src/bootstrap/sanity.rs | 4 +--- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs +index 110c8b844d5..83a6934d477 100644 +--- a/src/bootstrap/config.rs ++++ b/src/bootstrap/config.rs +@@ -350,6 +350,7 @@ struct TomlTarget { + musl_root: Option<String>, + wasi_root: Option<String>, + qemu_rootfs: Option<String>, ++ no_std: Option<bool>, + } + + impl Config { +@@ -610,6 +611,8 @@ impl Config { + target.musl_root = cfg.musl_root.clone().map(PathBuf::from); + target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from); + target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from); ++ target.no_std ++ = cfg.no_std.unwrap_or(triple.contains("-none-") || triple.contains("nvptx")); + + config.target_config.insert(INTERNER.intern_string(triple.clone()), target); + } +diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs +index 8ff7056e628..76e721ed8e3 100644 +--- a/src/bootstrap/sanity.rs ++++ b/src/bootstrap/sanity.rs +@@ -194,9 +194,7 @@ pub fn check(build: &mut Build) { + + if target.contains("-none-") || target.contains("nvptx") { + if build.no_std(*target).is_none() { +- let target = build.config.target_config.entry(target.clone()).or_default(); +- +- target.no_std = true; ++ build.config.target_config.entry(target.clone()).or_default(); + } + + if build.no_std(*target) == Some(false) { +-- +2.24.1 + diff --git a/pkgs/development/compilers/rust/1_41_0.nix b/pkgs/development/compilers/rust/1_41_0.nix deleted file mode 100644 index b73d9b8ef269..000000000000 --- a/pkgs/development/compilers/rust/1_41_0.nix +++ /dev/null @@ -1,48 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security -, llvmPackages_5 -, pkgsBuildTarget, pkgsBuildBuild -, fetchpatch -} @ args: - -import ./default.nix { - rustcVersion = "1.41.0"; - rustcSha256 = "0jypz2mrzac41sj0zh07yd1z36g2s2rvgsb8g624sk4l14n84ijm"; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.40.0"; - - # fetch hashes by running `print-hashes.sh 1.40.0` - bootstrapHashes = { - i686-unknown-linux-gnu = "d050d3a1c7c45ba9c50817d45bf6d7dd06e1a4d934f633c8096b7db6ae27adc1"; - x86_64-unknown-linux-gnu = "fc91f8b4bd18314e83a617f2389189fc7959146b7177b773370d62592d4b07d0"; - arm-unknown-linux-gnueabihf = "4be9949c4d3c572b69b1df61c3506a3a3ac044851f025d38599612e7caa933c5"; - armv7-unknown-linux-gnueabihf = "ebfe3978e12ffe34276272ee6d0703786249a9be80ca50617709cbfdab557306"; - aarch64-unknown-linux-gnu = "639271f59766d291ebdade6050e7d05d61cb5c822a3ef9a1e2ab185fed68d729"; - i686-apple-darwin = "ea189b1fb0bfda367cde6d43c18863ab4c64ffca04265e5746bf412a186fe1a2"; - x86_64-apple-darwin = "749ca5e0b94550369cc998416b8854c13157f5d11d35e9b3276064b6766bcb83"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_41_0; - - rustcPatches = [ - (fetchpatch { - url = "https://github.com/QuiltOS/rust/commit/f1803452b9e95bfdbc3b8763138b9f92c7d12b46.diff"; - sha256 = "1mzxaj46bq7ll617wg0mqnbnwr1da3hd4pbap8bjwhs3kfqnr7kk"; - }) - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/1_42.nix b/pkgs/development/compilers/rust/1_42.nix new file mode 100644 index 000000000000..8717aaf76a23 --- /dev/null +++ b/pkgs/development/compilers/rust/1_42.nix @@ -0,0 +1,44 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, buildPackages +, newScope, callPackage +, CoreFoundation, Security +, llvmPackages_5 +, pkgsBuildTarget, pkgsBuildBuild +} @ args: + +import ./default.nix { + rustcVersion = "1.42.0"; + rustcSha256 = "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j"; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.41.0"; + + # fetch hashes by running `print-hashes.sh 1.42.0` + bootstrapHashes = { + i686-unknown-linux-gnu = "a93a34f9cf3d35de2496352cb615b42b792eb09db3149b3a278efd2c58fa7897"; + x86_64-unknown-linux-gnu = "343ba8ef7397eab7b3bb2382e5e4cb08835a87bff5c8074382c0b6930a41948b"; + arm-unknown-linux-gnueabihf = "d0b33fcc97eeb96d716b30573c7e66affdf9077ecdecb30df2498b49f8284047"; + armv7-unknown-linux-gnueabihf = "3c8e787fb4f4f304a065e78c38010f0b5722d809f9dafb0e904084bf0f54f7be"; + aarch64-unknown-linux-gnu = "79ddfb5e2563d0ee09a567fbbe121a2aed3c3bc61255b2787f2dd42183a10f27"; + i686-apple-darwin = "628134b3fbaf5c0e7a25bd9a2b8d25f6e68bb256c8b04a3332ec979f5a1cd339"; + x86_64-apple-darwin = "b6504003ab70b11f278e0243a43ba9d6bf75e8ad6819b4058a2b6e3991cc8d7a"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_42; + + rustcPatches = [ + ./0001-Allow-getting-no_std-from-the-config-file.patch + ]; +} + +(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 6498c34ce8bb..40de5f61e034 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, file, python3 -, llvm_9, darwin, git, cmake, rust, rustPlatform +, llvm_9, darwin, cmake, rust, rustPlatform , pkgconfig, openssl , which, libffi , withBundledLLVM ? false @@ -125,7 +125,7 @@ in stdenv.mkDerivation rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ - file python3 rustPlatform.rust.rustc git cmake + file python3 rustPlatform.rust.rustc cmake which libffi removeReferencesTo pkgconfig ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index d84503caa607..792b8d9ea620 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -36,6 +36,8 @@ let "0.46" = ./disable-graphviz-0.46.1.patch; + "0.48" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -120,5 +122,10 @@ in rec { sha256 = "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s"; }; - vala = vala_0_46; + vala_0_48 = generic { + version = "0.48.1"; + sha256 = "61c5TAqQj/Y2I9F54J+h6dazjTHH61l9MCFInyl+cdQ="; + }; + + vala = vala_0_48; } diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 5e26e37b4438..3a54d42498ce 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.03.16"; + version = "2020.03.24"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "ed4fa19ba2812c286562baf26bbbcb49afad83bc"; - sha256 = "1sza5ng0q8dy6p4hks9b2db129xjcid9n6l8aglf2cj5ks82k5nv"; + rev = "c9555c9adeba886a308c60615ac794ec20d9276e"; + sha256 = "1fh118fv06jyfmkx6zy0w2k0rjj22m0ffyll3k5giaw8zzaf0j3a"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/development/compilers/zasm/default.nix new file mode 100644 index 000000000000..174092496bab --- /dev/null +++ b/pkgs/development/compilers/zasm/default.nix @@ -0,0 +1,44 @@ +{ fetchFromGitHub, zlib, stdenv }: +let + libs-src = fetchFromGitHub { + owner = "megatokio"; + repo = "Libraries"; + rev = "97ea480051b106e83a086dd42583dfd3e9d458a1"; + sha256 = "1kqmjb9660mnb0r18s1grrrisx6b73ijsinlyr97vz6992jd5dzh"; + }; +in +stdenv.mkDerivation { + pname = "zasm"; + version = "4.2.6"; + src = fetchFromGitHub { + owner = "megatokio"; + repo = "zasm"; + rev = "f1424add17a5514895a598d6b5e3982579961519"; + sha256 = "1kqnqdqp2bfsazs6vfx2aiqanxxagn8plx8g6rc11vmr8yqnnpks"; + }; + + buildInputs = [ zlib ]; + + configurePhase = '' + ln -sf ${libs-src} Libraries + ''; + + buildPhase = '' + cd Linux + make + ''; + + installPhase = '' + mkdir -p $out/bin + mv zasm $out/bin + ''; + + meta = with stdenv.lib; { + description = "Z80 / 8080 assembler (for unix-style OS)"; + homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/"; + license = licenses.bsd2; + maintainers = [ maintainers.turbomack ]; + platforms = platforms.linux; + badPlatforms = platforms.aarch64; + }; +} diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 83a505017fbc..7d9ec5e7312b 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -3,17 +3,25 @@ let params = { "8.8" = { + version = "1.1"; sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.9" = { - sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5"; + version = "1.1.1"; + sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; + }; + "8.10" = { + version = "1.1.1"; + sha256 = "0b6r7bsygl1axbqybkhkr7zlwcd51ski5ql52994klrrxvjd58df"; }; }; param = params.${coq.coq-version}; in stdenv.mkDerivation rec { - version = "1.1"; + inherit (param) version; name = "coq${coq.coq-version}-coqhammer-${version}"; src = fetchFromGitHub { @@ -31,8 +39,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ - ocaml findlib camlp5 - ]); + ocaml findlib + ]) ++ (param.buildInputs or []); preInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index a57d1bc9088d..67e420b4e89e 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -3,33 +3,40 @@ let params = { "8.7" = { - version = "1.1.1+coq8.7"; - sha256 = "1i7b5pkx46zf9il2xikbp3rhpnh3wdfbhw5yxcf9yk28ky9s0a0l"; + sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.8" = { - version = "1.1.1"; - sha256 = "0b07zvgm9cx6j2d9631zmqjs6sf30kiqg6k15xk3km7n80d53wfh"; + sha256 = "0rc4lshqvnfdsph98gnscvpmlirs9wx91qcvffggg73xw0p1g9s0"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.9" = { - version = "1.1.1+coq8.9"; - sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll"; + sha256 = "1jjzgpff09xjn9kgp7w69r096jkj0x2ksng3pawrmhmn7clwivbk"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; + }; + "8.10" = { + sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8"; + }; + "8.11" = { + sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; }; }; param = params.${coq.coq-version}; in stdenv.mkDerivation rec { - inherit (param) version; + version = "1.1.2"; name = "coq${coq.coq-version}-paramcoq-${version}"; src = fetchFromGitHub { owner = "coq-community"; repo = "paramcoq"; - rev = "v${version}"; + rev = "v${version}+coq${coq.coq-version}"; inherit (param) sha256; }; buildInputs = [ coq ] - ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]) + ++ (with coq.ocamlPackages; [ ocaml findlib ]) + ++ (param.buildInputs or []) ; installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 2de234c9a1eb..388280a905fb 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -214,6 +214,8 @@ let find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; + strictDeps = true; + shellHook = '' d=$(mktemp -d "--suffix=-$name") '' + toString (map (dep: '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index afa3c5338949..9ecf7e3bd1f0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -37,9 +37,6 @@ self: super: { # compiled on Linux. We provide the name to avoid evaluation errors. unbuildable = throw "package depends on meta package 'unbuildable'"; - # The test suite depends on old versions of tasty and QuickCheck. - hackage-security = dontCheck super.hackage-security; - # enable using a local hoogle with extra packagages in the database # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" # $ hoogle server @@ -86,7 +83,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 = "0y2qcjahi705c6nnypqpa5w3bzyzk4kqvbwfnpiaxzk5vna589gg"; + sha256 = "1jjw6ar8ddcncwzksyx2xky50sm2jg1zjr7iiqk0vn8qq0fn2gwy"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -326,6 +323,7 @@ self: super: { hs2048 = dontCheck super.hs2048; hsbencher = dontCheck super.hsbencher; hsexif = dontCheck super.hsexif; + hspec-core = if pkgs.stdenv.isi686 then dontCheck super.hspec-core else super.hspec-core; # tests rely on `Int` being 64-bit; https://github.com/hspec/hspec/issues/431 hspec-server = dontCheck super.hspec-server; HTF = dontCheck super.HTF; htsn = dontCheck super.htsn; @@ -359,7 +357,6 @@ self: super: { optional = dontCheck super.optional; orgmode-parse = dontCheck super.orgmode-parse; os-release = dontCheck super.os-release; - pandoc-crossref = dontCheck super.pandoc-crossref; # (most likely change when no longer 0.3.2.1) https://github.com/lierdakil/pandoc-crossref/issues/199 persistent-redis = dontCheck super.persistent-redis; pipes-extra = dontCheck super.pipes-extra; pipes-websockets = dontCheck super.pipes-websockets; @@ -1192,10 +1189,10 @@ self: super: { }); # Remove unecessary constraint: - # https://github.com/agrafix/superbuffer/pull/2 - superbuffer = overrideCabal super.superbuffer (drv: { + # https://github.com/haskell-infra/hackage-trustees/issues/258 + data-accessor-template = overrideCabal super.data-accessor-template (drv: { postPatch = '' - sed -i 's#QuickCheck < 2.10#QuickCheck < 2.13#' superbuffer.cabal + sed -i 's#template-haskell >=2.11 && <2.15#template-haskell#' data-accessor-template.cabal ''; }); @@ -1344,7 +1341,7 @@ self: super: { }); # cabal-fmt requires Cabal3 - cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_0_0_0; }; + cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; }; # Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin # until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that @@ -1463,6 +1460,11 @@ self: super: { # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. haskell-ci = doJailbreak super.haskell-ci; + # Needs the latest version of vty. + matterhorn = super.matterhorn.overrideScope (self: super: { + vty = self.vty_5_28_2; + }); + persistent-mysql = dontCheck super.persistent-mysql; # Fix EdisonAPI and EdisonCore for GHC 8.8: @@ -1488,4 +1490,16 @@ self: super: { # Needs a version that's newer than LTS-15.x provides. weeder = super.weeder.override { generic-lens = self.generic-lens_2_0_0_0; }; + polysemy-plugin = super.polysemy-plugin.override { + # polysemy-plugin 0.2.5.0 has constraint ghc-tcplugins-extra (==0.3.*) + # This upstream issue is relevant: + # https://github.com/polysemy-research/polysemy/issues/322 + ghc-tcplugins-extra = self.ghc-tcplugins-extra_0_3_2; + # version of Polysemy the plugin goes with + polysemy = self.polysemy_1_3_0_0; + }; + + # Fixed at head, but hasn't cut a release in awhile. + darcs = doJailbreak super.darcs; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 045c5dc1e5b1..ce52ccb11693 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -44,7 +44,7 @@ self: super: { text = self.text_1_2_4_0; # Needs Cabal 3.0.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; }; # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index c4c5ed9422f7..785bab743a4f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -40,9 +40,9 @@ self: super: { unix = null; xhtml = null; - # Needs Cabal 3.0.x. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; + # Needs Cabal 3.2.x. + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; }; # Restricts aeson to <1.4 # https://github.com/purescript/purescript/pull/3537 diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 915f7b3e635f..ff69c809288a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -42,8 +42,8 @@ self: super: { xhtml = null; # Needs Cabal 3.0.x. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; }; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; @@ -76,13 +76,10 @@ self: super: { # cabal2nix needs the latest version of Cabal, and the one # hackage-db uses must match, so take the latest - cabal2nix = super.cabal2nix.overrideScope (self: super: { - Cabal = self.Cabal_3_0_0_0; - hackage-db = self.hackage-db_2_1_0; - }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); # cabal2spec needs a recent version of Cabal - cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); + cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); # Builds only with ghc-8.8.x and beyond. policeman = markBroken super.policeman; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 1b5f64bea6b8..8b38f8cef74c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,10 +41,13 @@ self: super: { unix = null; xhtml = null; + # These builds need Cabal 3.2.x. + cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; }; + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); + # Ignore overly restrictive upper version bounds. aeson-diff = doJailbreak super.aeson-diff; async = doJailbreak super.async; - cabal-install = doJailbreak super.cabal-install; ChasingBottoms = doJailbreak super.ChasingBottoms; chell = doJailbreak super.chell; cryptohash-sha256 = doJailbreak super.cryptohash-sha256; @@ -72,12 +75,6 @@ self: super: { time-compat = doJailbreak super.time-compat; http-media = doJailbreak super.http-media; servant-server = doJailbreak super.servant-server; - - # These packages don't work and need patching and/or an update. - hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; - sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; - }); foundation = dontCheck super.foundation; vault = dontHaddock super.vault; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f0717b3514f6..2f6a0b8978d2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -69,14 +69,10 @@ core-packages: default-package-overrides: # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag - MissingH ==1.4.2.0 - # for cabal-install-3.0.0.0 - - hackage-security >=0.5.2.2 && <0.6 - # pandoc-2.9 does not accept the 0.3 version yet - - doclayout < 0.3 # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 15.4 + # LTS Haskell 15.6 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -88,7 +84,7 @@ default-package-overrides: - adjunctions ==4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.2.7.0 - - aeson ==1.4.6.0 + - aeson ==1.4.7.1 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 @@ -238,7 +234,7 @@ default-package-overrides: - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - - asn1-types ==0.3.3 + - asn1-types ==0.3.4 - assert-failure ==0.1.2.2 - assoc ==1.0.1 - astro ==0.4.2.1 @@ -250,7 +246,7 @@ default-package-overrides: - atom-basic ==0.2.5 - atomic-primops ==0.8.3 - atomic-write ==0.2.0.7 - - attoparsec ==0.13.2.3 + - attoparsec ==0.13.2.4 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 @@ -267,7 +263,7 @@ default-package-overrides: - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.4.7.0 - - aws-cloudfront-signed-cookies ==0.2.0.1 + - aws-cloudfront-signed-cookies ==0.2.0.4 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 - base58string ==0.10.0 @@ -314,7 +310,7 @@ default-package-overrides: - bits ==0.5.2 - bitset-word8 ==0.1.1.1 - bits-extra ==0.0.1.5 - - bitvec ==1.0.2.0 + - bitvec ==1.0.3.0 - blake2 ==0.3.0 - blanks ==0.3.0 - blas-carray ==0.1.0.1 @@ -323,7 +319,7 @@ default-package-overrides: - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.1.0 - blaze-html ==0.9.1.2 - - blaze-markup ==0.8.2.3 + - blaze-markup ==0.8.2.4 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 @@ -342,10 +338,10 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.52 + - brick ==0.52.1 - brittany ==0.12.1.1 - bsb-http-chunked ==0.0.0.4 - - bson ==0.4.0.0 + - bson ==0.4.0.1 - btrfs ==0.2.0.0 - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 @@ -406,10 +402,10 @@ default-package-overrides: - Chart ==1.9.3 - Chart-diagrams ==1.9.3 - chaselev-deque ==0.5.0.5 - - ChasingBottoms ==1.3.1.7 - - checkers ==0.5.4 + - ChasingBottoms ==1.3.1.8 + - checkers ==0.5.5 - checksum ==0.0 - - chimera ==0.3.0.0 + - chimera ==0.3.1.0 - choice ==0.2.2 - chronologique ==0.3.1.1 - chronos ==1.1 @@ -448,6 +444,7 @@ default-package-overrides: - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.5 + - colourista ==0.0.0.0 - combinatorial ==0.1.0.1 - comfort-array ==0.4 - comfort-graph ==0.0.3.1 @@ -466,11 +463,11 @@ default-package-overrides: - concurrent-output ==1.10.11 - concurrent-split ==0.0.1.1 - cond ==0.4.1.1 - - conduit ==1.3.1.2 + - conduit ==1.3.2 - conduit-algorithms ==0.0.11.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - - conduit-extra ==1.3.4 + - conduit-extra ==1.3.5 - conduit-parse ==0.2.1.0 - conduit-zstd ==0.0.1.1 - conferer ==0.2.0.0 @@ -577,7 +574,7 @@ default-package-overrides: - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 - DAV ==1.3.4 - - dbus ==1.2.12 + - dbus ==1.2.13 - debian-build ==0.10.2.0 - debug-trace-var ==0.2.0 - dec ==0.0.3 @@ -617,7 +614,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.1 - - dl-fedora ==0.7.3 + - dl-fedora ==0.7.4 - dlist ==0.8.0.7 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -625,7 +622,7 @@ default-package-overrides: - dockerfile ==0.2.0 - doclayout ==0.2.0.1 - doctemplates ==0.8 - - doctest ==0.16.2 + - doctest ==0.16.3 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.2 - doldol ==0.4.1.2 @@ -680,12 +677,12 @@ default-package-overrides: - epub-metadata ==4.5 - eq ==4.2 - equal-files ==0.0.5.3 - - equational-reasoning ==0.6.0.1 + - equational-reasoning ==0.6.0.2 - erf ==2.0.0.0 - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.8 - - esqueleto ==3.3.1.1 + - esqueleto ==3.3.3.0 - etc ==0.4.1.0 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 @@ -703,8 +700,8 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.0.0 - - express ==0.1.2 - - extended-reals ==0.2.3.0 + - express ==0.1.3 + - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - extra ==1.6.21 @@ -721,7 +718,7 @@ default-package-overrides: - feature-flags ==0.1.0.1 - fedora-dists ==1.1.2 - fedora-haskell-tools ==0.9 - - feed ==1.3.0.0 + - feed ==1.3.0.1 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - fgl ==5.7.0.2 @@ -739,9 +736,9 @@ default-package-overrides: - finite-typelits ==0.1.4.2 - first-class-families ==0.7.0.0 - first-class-patterns ==0.3.2.5 - - fitspec ==0.4.7 + - fitspec ==0.4.8 - fixed ==0.3 - - fixed-length ==0.2.1 + - fixed-length ==0.2.2 - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.5.0.0 - flac ==0.2.0 @@ -803,10 +800,10 @@ default-package-overrides: - generic-lens ==1.2.0.1 - generic-monoid ==0.1.0.0 - GenericPretty ==1.2.2 - - generic-random ==1.3.0.0 - - generics-sop ==0.5.0.0 - - generics-sop-lens ==0.2 - - genvalidity ==0.10.0.1 + - generic-random ==1.3.0.1 + - generics-sop ==0.5.1.0 + - generics-sop-lens ==0.2.0.1 + - genvalidity ==0.10.0.2 - genvalidity-aeson ==0.3.0.0 - genvalidity-bytestring ==0.5.0.1 - genvalidity-containers ==0.8.0.2 @@ -834,12 +831,12 @@ default-package-overrides: - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-exactprint ==0.6.2 - - ghcid ==0.8.3 + - ghcid ==0.8.5 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - ghc-lib ==8.8.3.20200224 - ghc-lib-parser ==8.8.3.20200224 - - ghc-lib-parser-ex ==8.8.5.6 + - ghc-lib-parser-ex ==8.8.5.8 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.6 - ghc-source-gen ==0.3.0.0 @@ -892,7 +889,7 @@ default-package-overrides: - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - greskell ==1.0.0.1 - - greskell-core ==0.1.3.1 + - greskell-core ==0.1.3.2 - greskell-websocket ==0.1.2.1 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 @@ -918,7 +915,7 @@ default-package-overrides: - haskell-lexer ==1.1 - haskell-lsp ==0.20.0.1 - haskell-lsp-types ==0.20.0.0 - - haskell-names ==0.9.7 + - haskell-names ==0.9.8 - haskell-src ==1.0.3.1 - haskell-src-exts ==1.22.0 - haskell-src-exts-util ==0.2.5 @@ -926,7 +923,7 @@ default-package-overrides: - haskey-btree ==0.3.0.1 - haskoin-core ==0.10.1 - haskoin-node ==0.9.16 - - hasql ==1.4.1 + - hasql ==1.4.2 - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.1 - hasql-transaction ==1.0.0.1 @@ -934,7 +931,7 @@ default-package-overrides: - HaXml ==1.25.5 - haxr ==3000.11.4 - hdaemonize ==0.5.6 - - headroom ==0.1.2.0 + - headroom ==0.1.3.0 - heap ==1.0.4 - heaps ==0.3.6.1 - heart-core ==0.1.1 @@ -943,7 +940,7 @@ default-package-overrides: - hedgehog-corpus ==0.2.0 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.12.11 + - hedis ==0.12.13 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.3 @@ -985,7 +982,7 @@ default-package-overrides: - hreader-lens ==0.1.3.0 - hruby ==0.3.8 - hs-bibutils ==6.8.0.0 - - hsc2hs ==0.68.6 + - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.0.0 @@ -1014,7 +1011,7 @@ default-package-overrides: - hspec-expectations-pretty-diff ==0.7.2.5 - hspec-golden ==0.1.0.1 - hspec-golden-aeson ==0.7.0.0 - - hspec-leancheck ==0.0.3 + - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.1.0 - hspec-meta ==2.6.0 - hspec-need-env ==0.1.0.4 @@ -1150,7 +1147,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.1.0 - ip ==1.7.1 - ip6addr ==1.0.1 - - iproute ==1.7.8 + - iproute ==1.7.9 - IPv6Addr ==1.1.3 - ipynb ==0.1 - ipython-kernel ==0.10.1.0 @@ -1206,7 +1203,7 @@ default-package-overrides: - language-c-quote ==0.12.2.1 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - - language-javascript ==0.7.0.0 + - language-javascript ==0.7.1.0 - language-protobuf ==1.0.1 - language-puppet ==1.4.6.2 - lapack-carray ==0.0.3 @@ -1220,7 +1217,7 @@ default-package-overrides: - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 - lca ==0.3.1 - - leancheck ==0.9.1 + - leancheck ==0.9.3 - leancheck-instances ==0.0.3 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.5 @@ -1272,7 +1269,7 @@ default-package-overrides: - loopbreaker ==0.1.1.1 - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - - lsp-test ==0.10.1.0 + - lsp-test ==0.10.2.0 - lucid ==2.9.12 - lucid-extras ==0.2.2 - lzma ==0.0.0.3 @@ -1469,7 +1466,7 @@ default-package-overrides: - once ==0.4 - one-liner ==1.0 - one-liner-instances ==0.1.2.1 - - OneTuple ==0.2.2 + - OneTuple ==0.2.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.6.7004.1 @@ -1654,7 +1651,7 @@ default-package-overrides: - purescript-bridge ==0.13.0.0 - pushbullet-types ==0.4.1.0 - pusher-http-haskell ==1.5.1.11 - - PyF ==0.9.0.0 + - PyF ==0.9.0.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qrcode-core ==0.9.2 @@ -1727,16 +1724,16 @@ default-package-overrides: - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.2 - - relational-schemas ==0.1.7.0 + - relational-schemas ==0.1.8.0 - relude ==0.6.0.0 - renderable ==0.2.0.1 - - replace-attoparsec ==1.2.0.0 + - replace-attoparsec ==1.2.1.0 - replace-megaparsec ==1.2.1.0 - repline ==0.2.2.0 - req ==3.1.0 - req-conduit ==1.0.0 - rerebase ==1.4.1 - - resolv ==0.1.1.3 + - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - resourcet ==1.2.3 - result ==0.2.6.0 @@ -1770,7 +1767,7 @@ default-package-overrides: - safe-json ==1.1.0 - safe-money ==0.9 - SafeSemaphore ==0.10.1 - - salak ==0.3.5.3 + - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.0 - salve ==1.0.8 @@ -1848,7 +1845,7 @@ default-package-overrides: - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 - - set-cover ==0.1 + - set-cover ==0.1.1 - setenv ==0.1.1.3 - setlocale ==1.0.0.9 - SHA ==1.6.4.4 @@ -1868,7 +1865,7 @@ default-package-overrides: - simple-affine-space ==0.1 - simple-cabal ==0.1.1 - simple-cmd ==0.2.1 - - simple-cmd-args ==0.1.5 + - simple-cmd-args ==0.1.6 - simple-log ==0.9.12 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.30 @@ -1878,7 +1875,7 @@ default-package-overrides: - simplistic-generics ==0.1.0.0 - since ==0.0.0 - singleton-bool ==0.1.5 - - singleton-nats ==0.4.3 + - singleton-nats ==0.4.4 - singletons ==2.6 - singletons-presburger ==0.3.0.0 - siphash ==1.0.3 @@ -1901,7 +1898,7 @@ default-package-overrides: - soap-tls ==0.1.1.4 - socks ==0.6.1 - some ==1.0.1 - - sop-core ==0.5.0.0 + - sop-core ==0.5.0.1 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - sourcemap ==0.1.6 @@ -1939,7 +1936,7 @@ default-package-overrides: - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - - storable-record ==0.0.4.1 + - storable-record ==0.0.5 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - stratosphere ==0.49.0 @@ -2093,7 +2090,7 @@ default-package-overrides: - timezone-series ==0.1.9 - tinylog ==0.15.0 - titlecase ==1.0.1 - - tldr ==0.6.2 + - tldr ==0.6.4 - tls ==1.5.4 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 @@ -2102,7 +2099,7 @@ default-package-overrides: - tmp-postgres ==1.34.1.0 - tomland ==1.2.1.0 - tonalude ==0.1.1.0 - - topograph ==1 + - topograph ==1.0.0.1 - torsor ==0.1 - tostring ==0.2.1.1 - tracing ==0.0.4.0 @@ -2125,7 +2122,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.17 + - turtle ==1.5.18 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - typed-uuid ==0.0.0.2 @@ -2179,7 +2176,7 @@ default-package-overrides: - unix-time ==0.4.7 - unliftio ==0.2.12.1 - unliftio-core ==0.1.2.0 - - unliftio-pool ==0.2.1.0 + - unliftio-pool ==0.2.1.1 - unlit ==0.4.0.0 - unordered-containers ==0.2.10.0 - unordered-intmap ==0.1.1 @@ -2194,7 +2191,7 @@ default-package-overrides: - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - util ==0.1.17.1 - - utility-ht ==0.0.14 + - utility-ht ==0.0.15 - uuid ==1.3.13 - uuid-types ==1.0.3 - validation ==1.1 @@ -2261,7 +2258,7 @@ default-package-overrides: - websockets ==0.12.7.0 - websockets-snap ==0.10.3.1 - weigh ==0.0.16 - - wide-word ==0.1.1.0 + - wide-word ==0.1.1.1 - wikicfp-scraper ==0.1.0.11 - wild-bind ==0.1.2.5 - wild-bind-x11 ==0.2.0.9 @@ -2320,7 +2317,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.3.0 - yesod ==1.6.0.1 - - yesod-auth ==1.6.9 + - yesod-auth ==1.6.10 - yesod-auth-hashdb ==1.7.1.2 - yesod-bin ==1.6.0.4 - yesod-core ==1.6.17.3 @@ -2373,6 +2370,7 @@ extra-packages: - dhall == 1.29.0 # required for spago 0.14.0. - doctemplates == 0.8 # required by pandoc-2.9.x - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x + - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock == 2.22.* # required on GHC 8.0.x - haddock-api == 2.22.* # required on GHC 7.8.x @@ -2456,7 +2454,10 @@ package-maintainers: # - pipes-mongodb - streaming-wai kiwi: - # - glirc + - glirc + - matterhorn + - mattermost-api + - mattermost-api-qc - Unique psibi: - path-pieces @@ -2466,12 +2467,16 @@ package-maintainers: - shakespeare abbradar: - Agda + roberth: + - arion-compose cdepillabout: - pretty-simple - spago - termonad rkrzr: - icepeak + terlar: + - nix-diff unsupported-platforms: alsa-mixer: [ x86_64-darwin ] @@ -2677,7 +2682,6 @@ broken-packages: - adaptive-containers - adaptive-tuple - adb - - adblock2privoxy - adhoc-network - adict - adobe-swatch-exchange @@ -2733,12 +2737,10 @@ broken-packages: - aivika-distributed - ajhc - AlanDeniseEricLauren - - alarmclock - alerta - alex-prelude - alfred - alga - - algebra-checkers - algebra-dag - algebra-sql - algebraic @@ -2787,7 +2789,6 @@ broken-packages: - animate-frames - animate-preview - animate-sdl2 - - anki-tools - annah - Annotations - anonymous-sums @@ -2860,7 +2861,6 @@ broken-packages: - arguedit - ariadne - arion - - arion-compose - armada - armor - arpa @@ -2879,9 +2879,7 @@ broken-packages: - artery - artifact - asap - - ascetic - ascii - - ascii-cows - ascii-flatten - ascii-string - ascii-table @@ -2979,7 +2977,6 @@ broken-packages: - aws-kinesis-client - aws-kinesis-reshard - aws-lambda - - aws-lambda-haskell-runtime - aws-mfa-credentials - aws-performance-tests - aws-route53 @@ -3019,7 +3016,6 @@ broken-packages: - bamstats - Bang - bank-holiday-usa - - bank-holidays-england - banwords - barchart - barcodes-code128 @@ -3028,7 +3024,6 @@ broken-packages: - barrie - barrier - barrier-monad - - base-compat-migrate - base-feature-macros - base-generics - base-io-access @@ -3109,7 +3104,6 @@ broken-packages: - binary-search - binary-streams - binary-strict - - binary-tagged - binary-typed - bind-marshal - BinderAnn @@ -3361,7 +3355,6 @@ broken-packages: - cabal-dependency-licenses - cabal-dev - cabal-dir - - cabal-file-th - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps @@ -3380,7 +3373,6 @@ broken-packages: - cabal-sort - cabal-src - cabal-test - - cabal-toolkit - cabal-upload - cabal2arch - cabal2doap @@ -3426,7 +3418,6 @@ broken-packages: - cao - cap - Capabilities - - capability - capnp - capped-list - capri @@ -3440,7 +3431,6 @@ broken-packages: - carte - cartel - Cartesian - - cas-store - casa-abbreviations-and-acronyms - casadi-bindings - casadi-bindings-control @@ -3506,12 +3496,12 @@ broken-packages: - cgrep - chalkboard - chalkboard-viewer - - character-cases - charade - chart-cli - Chart-fltkhs - chart-histogram - Chart-simple + - chart-svg - chart-unit - chatter - chatty-text @@ -3569,8 +3559,6 @@ broken-packages: - clarifai - CLASE - clash - - clash-ghc - - clash-lib - clash-multisignal - Clash-Royale-Hack-Cheats - clash-systemverilog @@ -3595,7 +3583,6 @@ broken-packages: - clckwrks-theme-clckwrks - clckwrks-theme-geo-bootstrap - Clean - - clean-home - clean-unions - cless - clevercss @@ -3657,7 +3644,6 @@ broken-packages: - codemonitor - codepad - codeworld-api - - codex - codo-notation - coin - coinbase-exchange @@ -3740,7 +3726,6 @@ broken-packages: - concurrent-buffer - Concurrent-Cache - concurrent-machines - - concurrent-resource-map - concurrent-state - concurrent-utilities - Concurrential @@ -3767,7 +3752,6 @@ broken-packages: - conferer-provider-dhall - conferer-provider-yaml - conferer-snap - - confetti - conffmt - confide - config-parser @@ -3779,7 +3763,6 @@ broken-packages: - configuration - configuration-tools - configurator-ng - - configurator-pg - confsolve - congruence-relation - conjure @@ -3869,7 +3852,6 @@ broken-packages: - cparsing - CPBrainfuck - cpio-conduit - - cpkg - CPL - cplusplus-th - cprng-aes-effect @@ -3969,7 +3951,6 @@ broken-packages: - Dao - dao - dapi - - darcs - darcs-benchmark - darcs-beta - darcs-buildpackage @@ -3988,14 +3969,12 @@ broken-packages: - dash-haskell - data-accessor-monads-fd - data-accessor-monads-tf - - data-accessor-template - data-aviary - data-base - data-basic - data-category - data-check - data-combinator-gen - - data-compat - data-concurrent-queue - data-construction - data-cycle @@ -4018,8 +3997,6 @@ broken-packages: - data-lens-ixset - data-lens-template - data-map-multikey - - data-msgpack - - data-msgpack-types - data-nat - data-object - data-object-json @@ -4133,7 +4110,6 @@ broken-packages: - dependent-monoidal-map - dependent-state - dependent-sum-aeson-orphans - - dependent-sum-template - depends - dephd - deptrack-core @@ -4146,13 +4122,11 @@ broken-packages: - derive-gadt - derive-IG - derive-monoid - - derive-storable-plugin - derive-topdown - derive-trie - derp-lib - describe - descript-lang - - desert - deterministic-game-engine - detour-via-uom - deunicode @@ -4187,7 +4161,6 @@ broken-packages: - diagrams-wx - dialogflow-fulfillment - dib - - dice - dice-entropy-conduit - dice2tex - dicom @@ -4230,7 +4203,6 @@ broken-packages: - dirtree - discogs-haskell - discord-gateway - - discord-haskell - discord-hs - discord-rest - discord-types @@ -4415,35 +4387,27 @@ broken-packages: - effect-monad - effect-stack - effin - - egison-pattern-src-th-mode - egison-quote - ehaskell - ehs - eibd-client-simple - eigen - Eight-Ball-Pool-Hack-Cheats - - either-list-functions - either-unwrap - EitherT - - ekg - ekg-bosun - ekg-carbon - - ekg-cloudwatch - ekg-elastic - ekg-elasticsearch - - ekg-influxdb - - ekg-json - ekg-log - ekg-push - ekg-rrd - - ekg-statsd - ekg-wai - elerea-examples - elevator - elision - elm-street - elm-websocket - - elsa - elynx-seq - elynx-tools - elynx-tree @@ -4697,14 +4661,12 @@ broken-packages: - fibon - ficketed - fields - - fields-json - FieldTrip - fieldwise - fig - file-collection - file-command-qq - file-location - - file-modules - filediff - FileManip - FileManipCompat @@ -4794,7 +4756,6 @@ broken-packages: - FModExRaw - fmt-for-rio - fn-extra - - Focus - foldl-incremental - foldl-statistics - foldl-transduce @@ -5050,6 +5011,7 @@ broken-packages: - ghc-srcspan-plugin - ghc-syb - ghc-syb-utils + - ghc-tags-core - ghc-tags-plugin - ghc-time-alloc-prof - ghc-usage @@ -5140,7 +5102,6 @@ broken-packages: - gli - glicko - glider-nlp - - glirc - GLMatrix - glob-posix - global @@ -5160,10 +5121,6 @@ broken-packages: - gloss-sodium - glpk-hs - glue - - glue-common - - glue-core - - glue-ekg - - glue-example - GLUtil - gmap - gmndl @@ -5220,8 +5177,6 @@ broken-packages: - gps2htmlReport - GPX - gpx-conduit - - grab - - grab-form - graceful - grafana - graflog @@ -5295,11 +5250,9 @@ broken-packages: - gsl-random-fu - gstorable - gstreamer - - gt-tools - GTALib - gtfs - gtfs-realtime - - gtk-jsinput - gtk-serialized-event - gtk-toy - gtk2hs-hello @@ -5399,7 +5352,6 @@ broken-packages: - hakyll-R - hakyll-series - hakyll-shortcode - - hakyll-shortcut-links - hakyll-typescript - hal - halberd @@ -5487,8 +5439,6 @@ broken-packages: - harvest-api - has - has-th - - hasbolt - - hasbolt-extras - HasCacBDD - hascar - hascas @@ -5510,7 +5460,6 @@ broken-packages: - haskarrow - haskbot-core - haskdeep - - haskdogs - haskeem - haskeline-class - haskelisp @@ -5556,10 +5505,8 @@ broken-packages: - haskell-src-exts-prisms - haskell-src-exts-qq - haskell-src-exts-sc - - haskell-src-exts-simple - haskell-src-meta-mwotton - haskell-stack-trace-plugin - - haskell-to-elm - haskell-token-utils - haskell-tools-ast - haskell-tools-ast-fromghc @@ -5678,7 +5625,6 @@ broken-packages: - haste-lib - haste-markup - haste-prim - - Hastodon - Hate - hatex-guide - HaTeX-meta @@ -5755,7 +5701,6 @@ broken-packages: - HDRUtils - headed-megaparsec - headergen - - headroom - heapsort - heart-app - heart-core @@ -5780,7 +5725,6 @@ broken-packages: - hedis-pile - hedis-simple - hedis-tags - - hedn - hedn-functor - hedra - hein @@ -5992,7 +5936,6 @@ broken-packages: - hmumps - hnetcdf - hnix - - hnix-store-core - hnix-store-remote - HNM - hnormalise @@ -6041,7 +5984,6 @@ broken-packages: - hoodle-types - hoogle-index - hooks-dir - - hookup - hoopl - hoovie - hopencc @@ -6141,7 +6083,6 @@ broken-packages: - hs-re - hs-rs-notify - hs-scrape - - hs-server-starter - hs-snowtify - hs-twitter - hs-twitterarchiver @@ -6150,7 +6091,6 @@ broken-packages: - hs2bf - Hs2lib - hs2ps - - hS3 - hsaml2 - hsay - hsbackup @@ -6201,7 +6141,6 @@ broken-packages: - hsgnutls - hsgnutls-yj - hsgsom - - HSH - HsHaruPDF - HSHHelpers - HsHTSLib @@ -6240,13 +6179,11 @@ broken-packages: - hspec-expectations-pretty - hspec-experimental - hspec-hashable - - hspec-hedgehog - hspec-jenkins - hspec-monad-control - hspec-pg-transact - hspec-setup - hspec-shouldbe - - hspec-snap - hspec-structured-formatter - hspec-test-sandbox - hspec-webdriver @@ -6277,6 +6214,7 @@ broken-packages: - hssqlppp - hssqlppp-th - HsSVN + - hstar - hstatistics - hstats - hstatsd @@ -6298,7 +6236,6 @@ broken-packages: - hsXenCtrl - hsyscall - hsyslog-tcp - - hsyslog-udp - hszephyr - HTab - hTalos @@ -6342,7 +6279,6 @@ broken-packages: - http-response-decoder - http-server - http-shed - - http-trace - http-wget - http2-client - http2-client-exe @@ -6455,7 +6391,6 @@ broken-packages: - identifiers - idiii - idna2008 - - idringen - idris - IDynamic - ieee-utils @@ -6552,7 +6487,6 @@ broken-packages: - InternedData - internetmarke - intero - - interp - interpol - interpolatedstring-qq - interpolatedstring-qq-mwotton @@ -6637,7 +6571,6 @@ broken-packages: - ivy-web - ixdopp - ixmonad - - ixset-typed - ixshader - iyql - j2hs @@ -6693,7 +6626,6 @@ broken-packages: - json-assertions - json-ast-json-encoder - json-ast-quickcheck - - json-autotype - json-b - json-builder - json-bytes-builder @@ -6896,7 +6828,6 @@ broken-packages: - language-csharp - language-css - language-dart - - language-docker - language-dockerfile - language-ecmascript-analysis - language-eiffel @@ -6937,7 +6868,6 @@ broken-packages: - latest-npm-version - latex-formulae-hakyll - latex-formulae-pandoc - - latex-live-snippets - LATS - launchdarkly-server-sdk - launchpad-control @@ -6969,7 +6899,6 @@ broken-packages: - learn - learn-physics-examples - Learning - - learning-hmm - leetify - legion - legion-discovery @@ -7004,7 +6933,6 @@ broken-packages: - lhe - lhs2TeX-hl - lhslatex - - libarchive - LibClang - libconfig - libcspm @@ -7036,7 +6964,6 @@ broken-packages: - libxslt - licensor - lie - - life-sync - lifted-base-tf - lifted-protolude - lifted-stm @@ -7118,6 +7045,7 @@ broken-packages: - llvm-base-types - llvm-base-util - llvm-data-interop + - llvm-dsl - llvm-extension - llvm-extra - llvm-ffi @@ -7137,8 +7065,6 @@ broken-packages: - lmonad-yesod - load-balancing - load-font - - loc - - loc-test - local-address - local-search - localize @@ -7150,7 +7076,6 @@ broken-packages: - log-elasticsearch - log-postgres - log-utils - - log-warper - log2json - logentries - logger @@ -7224,7 +7149,6 @@ broken-packages: - lxd-client - lye - Lykah - - lz4-bytes - lz4-conduit - lzma-enumerator - lzma-streams @@ -7256,7 +7180,6 @@ broken-packages: - mahoro - maid - mail-pool - - mailbox-count - mailchimp - mailchimp-subscribe - MailchimpSimple @@ -7316,14 +7239,10 @@ broken-packages: - math-metric - mathblog - mathflow - - mathista - mathlink - matrix-as-xyz - matrix-market - matsuri - - matterhorn - - mattermost-api - - mattermost-api-qc - maude - maxent - maxent-learner-hw @@ -7336,7 +7255,6 @@ broken-packages: - MazesOfMonad - MBot - mbox-tools - - mbtiles - mbug - MC-Fold-DP - mcl @@ -7424,7 +7342,6 @@ broken-packages: - miku - milena - mime-directory - - min-max-pqueue - minecraft-data - minesweeper - miniforth @@ -7439,7 +7356,6 @@ broken-packages: - minst-idx - mios - mirror-tweet - - misfortune - miso-action-logger - miso-examples - miss @@ -7492,7 +7408,6 @@ broken-packages: - monad-logger-syslog - monad-lrs - monad-mersenne-random - - monad-metrics - monad-metrics-extensible - monad-mock - monad-open @@ -7554,7 +7469,6 @@ broken-packages: - monus - monzo - moo - - moonshine - morfette - morfeusz - morley @@ -7621,7 +7535,6 @@ broken-packages: - multibase - multifocal - multihash - - multihash-cryptonite - multihash-serialise - multilinear - multilinear-io @@ -7689,7 +7602,6 @@ broken-packages: - n-tuple - n2o-protocols - n2o-web - - nagios-perfdata - nagios-plugin-ekg - nakadi-client - named-lock @@ -7722,7 +7634,6 @@ broken-packages: - needle - neet - nehe-tuts - - neil - neither - neko-lib - Neks @@ -7771,7 +7682,6 @@ broken-packages: - network-hans - network-house - network-interfacerequest - - network-messagepack-rpc - network-messagepack-rpc-websocket - network-minihttp - network-msgpack-rpc @@ -7821,7 +7731,6 @@ broken-packages: - nitro - nix-delegate - nix-deploy - - nix-diff - nix-eval - nix-freeze-tree - nix-tools @@ -7990,7 +7899,6 @@ broken-packages: - ordrea - organize-imports - orgmode - - orgstat - origami - orizentic - OrPatterns @@ -8007,7 +7915,6 @@ broken-packages: - OTP - otp-authenticator - ottparse-pretty - - outsort - overload - overloaded-records - overture @@ -8033,7 +7940,6 @@ broken-packages: - pam - pan-os-syslog - panda - - pandoc-crossref - pandoc-emphasize-code - pandoc-filter-graphviz - pandoc-include @@ -8099,13 +8005,10 @@ broken-packages: - parser-helper - parser241 - parsergen - - parsers-megaparsec - parsestar - parsimony - - parsix - partage - partial-lens - - partial-order - partial-records - partial-semigroup - partial-semigroup-hedgehog @@ -8197,7 +8100,6 @@ broken-packages: - persistent-redis - persistent-relational-record - persistent-template-classy - - persistent-typed-db - persistent-vector - persistent-zookeeper - persona @@ -8216,7 +8118,6 @@ broken-packages: - phasechange - phaser - phoityne - - phoityne-vscode - phone-numbers - phone-push - phooey @@ -8258,7 +8159,6 @@ broken-packages: - pipes-conduit - pipes-core - pipes-courier - - pipes-csv - pipes-errors - pipes-extra - pipes-files @@ -8337,11 +8237,9 @@ broken-packages: - polydata - polydata-core - polynomial - - polysemy-plugin - polysemy-RandomFu - polysemy-zoo - polyseq - - polysoup - polytypeable - polytypeable-utils - pomodoro @@ -8647,17 +8545,12 @@ broken-packages: - random-derive - random-eff - random-effin - - random-extras - - random-fu - - random-fu-multivariate - random-hypergeometric - random-stream - RandomDotOrg - - Randometer - Range - range-space - rangemin - - rank-product - rank1dynamic - Ranka - rapid @@ -8746,8 +8639,6 @@ broken-packages: - Referees - references - refh - - refined - - refined-http-api-data - reflection-extras - reflex - reflex-animation @@ -8850,7 +8741,6 @@ broken-packages: - req-conduit - req-oauth2 - req-url-extra - - reqcatcher - request-monad - require - reserve @@ -8874,7 +8764,6 @@ broken-packages: - rest-types - rest-wai - restful-snap - - restless-git - restricted-workers - restyle - rethinkdb @@ -8903,7 +8792,6 @@ broken-packages: - rib - ribbit - RichConditional - - richreports - ridley - ridley-extras - riemann @@ -8989,7 +8877,6 @@ broken-packages: - rungekutta - runmany - runtime-arbitrary - - rvar - rws - RxHaskell - s-expression @@ -9000,10 +8887,8 @@ broken-packages: - safe-failure-cme - safe-freeze - safe-globals - - safe-json - safe-lazy-io - safe-length - - safe-money-xmlbf - safe-plugins - safe-printf - safecopy-migrate @@ -9169,7 +9054,6 @@ broken-packages: - servant-db-postgresql - servant-dhall - servant-ede - - servant-ekg - servant-errors - servant-examples - servant-exceptions @@ -9203,15 +9087,12 @@ broken-packages: - servant-scotty - servant-server-namedargs - servant-smsc-ru - - servant-snap - servant-streaming - servant-streaming-client - servant-streaming-docs - servant-streaming-server - servant-swagger-tags - - servant-to-elm - servant-waargonaut - - servant-xml - servant-zeppelin - servant-zeppelin-client - servant-zeppelin-server @@ -9220,7 +9101,6 @@ broken-packages: - serversession-backend-acid-state - serversession-backend-persistent - serversession-backend-redis - - serversession-frontend-snap - serversession-frontend-yesod - services - ses-html-snaplet @@ -9231,7 +9111,6 @@ broken-packages: - set-of - set-with - setdown - - setgame - setoid - setters - sexp @@ -9356,7 +9235,6 @@ broken-packages: - siphon - siren-json - sirkel - - sitepipe - sixfiguregroup - sized-grid - sized-types @@ -9368,7 +9246,6 @@ broken-packages: - skeletons - skell - skemmtun - - skews - skulk - skylark-client - skylighting-lucid @@ -9377,7 +9254,6 @@ broken-packages: - slack-notify-haskell - slack-web - slave-thread - - slice-cpp-gen - sliceofpy - slidemews - Slides @@ -9440,7 +9316,6 @@ broken-packages: - snaplet-customauth - snaplet-environments - snaplet-fay - - snaplet-ghcjs - snaplet-hasql - snaplet-haxl - snaplet-hdbc @@ -9485,7 +9360,6 @@ broken-packages: - snowflake-server - snowtify - Snusmumrik - - soap-openssl - SoccerFun - SoccerFunGL - socket-activation @@ -9549,7 +9423,6 @@ broken-packages: - spiros - splay - splaytree - - spline3 - splines - split-morphism - splitter @@ -9608,7 +9481,6 @@ broken-packages: - stack-prism - stack-run - stack-run-auto - - stack-tag - stack-type - stack-wrapper - stack2cabal @@ -9639,10 +9511,8 @@ broken-packages: - stateWriter - static-canvas - static-closure - - static-resources - static-tensor - static-text - - staticanalysis - statistics-dirichlet - statistics-fusion - statistics-hypergeometric-genvar @@ -9850,7 +9720,6 @@ broken-packages: - tagsoup-parsec - tagsoup-selection - tagstream-conduit - - tai - tai64 - takahashi - Takusen @@ -9907,7 +9776,6 @@ broken-packages: - template-yj - templateify - templatepg - - tempo - tempodb - temporal-csound - tempus @@ -9957,7 +9825,6 @@ broken-packages: - text-containers - text-format - text-format-heavy - - text-format-simple - text-generic-pretty - text-icu-normalized - text-lens @@ -9969,7 +9836,6 @@ broken-packages: - text-plus - text-position - text-register-machine - - text-replace - text-time - text-trie - text-utf8 @@ -9989,7 +9855,6 @@ broken-packages: - th-dict-discovery - th-fold - th-format - - th-instance-reification - th-instances - th-kinds - th-kinds-fork @@ -10010,7 +9875,6 @@ broken-packages: - Thingie - thorn - threadmanager - - threadscope - threepenny-editors - threepenny-gui-contextmenu - threepenny-gui-flexbox @@ -10056,7 +9920,6 @@ broken-packages: - timeseries - timespan - timeutils - - timezone-olson-th - timezone-unix - tintin - tiny-scheduler @@ -10109,6 +9972,7 @@ broken-packages: - touched - Tournament - toxcore + - toxcore-c - toxiproxy-haskell - toysolver - tpar @@ -10157,17 +10021,6 @@ broken-packages: - treap - tree-monad - tree-render-text - - tree-sitter - - tree-sitter-go - - tree-sitter-haskell - - tree-sitter-java - - tree-sitter-json - - tree-sitter-php - - tree-sitter-python - - tree-sitter-ql - - tree-sitter-ruby - - tree-sitter-tsx - - tree-sitter-typescript - tree-traversals - TreeCounter - treemap-html @@ -10266,7 +10119,6 @@ broken-packages: - type-tree - typeable-th - TypeClass - - typed-spreadsheet - typed-streams - typed-wire - typedflow @@ -10327,7 +10179,6 @@ broken-packages: - uniquely-represented-sets - units-attoparsec - unittyped - - unity-testresult-parser - unitym-yesod - universal-binary - universe-th @@ -10385,7 +10236,6 @@ broken-packages: - usb-id-database - usb-iteratee - usb-safe - - useragents - users-mysql-haskell - users-persistent - utc @@ -10422,7 +10272,6 @@ broken-packages: - validate-input - validated-types - Validation - - validation-selective - validations - validationt - value-supply @@ -10472,7 +10321,6 @@ broken-packages: - verifiable-expressions - verify - verilog - - verismith - versioning - versioning-servant - vflow-types @@ -10548,7 +10396,6 @@ broken-packages: - wai-middleware-etag - wai-middleware-headers - wai-middleware-hmac-client - - wai-middleware-metrics - wai-middleware-preprocessor - wai-middleware-rollbar - wai-middleware-route @@ -10590,7 +10437,6 @@ broken-packages: - weather-api - web-css - web-encodings - - web-fpco - web-inv-route - web-mongrel2 - web-output @@ -10639,7 +10485,6 @@ broken-packages: - whiskers - whitespace - whois - - wholepixels - why3 - WikimediaParser - wikipedia4epub @@ -10670,7 +10515,6 @@ broken-packages: - word2vec-model - WordAlignment - wordify - - wordlist - WordNet - WordNet-ghc74 - wordpass @@ -10697,7 +10541,6 @@ broken-packages: - wsdl - wsedit - wshterm - - wss-client - wtk - wtk-gtk - wu-wei @@ -10764,9 +10607,6 @@ broken-packages: - xml-tydom-core - xml2json - xml2x - - xmlbf - - xmlbf-xeno - - xmlbf-xmlhtml - XmlHtmlWriter - xmltv - XMMS diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ff1c01aa8e87..4aa3327e2b48 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -572,17 +572,34 @@ self: super: builtins.intersectAttrs super { # The test-suite requires a running PostgreSQL server. Frames-beam = dontCheck super.Frames-beam; - futhark = if pkgs.stdenv.isDarwin then super.futhark else with pkgs; - let path = stdenv.lib.makeBinPath [ gcc ]; - in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: { - postInstall = '' - wrapProgram $out/bin/futhark \ - --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${ocl-icd}/lib" - ''; - }); + # * Compile manpages (which are in RST and are compiled with Sphinx). + # + # * Wrap so that binary can find GCC and OpenCL headers (dubious if + # a good idea). + futhark = with pkgs; + let maybeWrap = + if pkgs.stdenv.isDarwin then "" + else + let path = stdenv.lib.makeBinPath [ gcc ]; + in '' + wrapProgram $out/bin/futhark \ + --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${ocl-icd}/lib" + ''; + in overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx]) + (_drv: { + postBuild = (_drv.postBuild or "") + '' + make -C docs man + ''; + + postInstall = (_drv.postInstall or "") + '' + mkdir -p $out/share/man/man1 + mv docs/_build/man/*.1 $out/share/man/man1/ + '' + + maybeWrap; + }); git-annex = with pkgs; if (!stdenv.isLinux) then diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5d7e04c71354..1a9e75a37cd1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2722,7 +2722,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_3_0_0_0" = callPackage + "Cabal_3_2_0_0" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, binary , bytestring, containers, deepseq, Diff, directory, filepath , integer-logarithms, mtl, optparse-applicative, parsec, pretty @@ -2732,8 +2732,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "3.0.0.0"; - sha256 = "11yjd0cmqngi1yr7v0dr55n59rq78kk6121sr44abha0swkfqhsi"; + version = "3.2.0.0"; + sha256 = "0vz6bl1ia7wjc62sj5iw5jhigdwfz6yz01mripjcymv4qrbkl1gj"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -3090,8 +3090,8 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.7"; - sha256 = "0ziiqfsvv1ypdra6kd0bhbsl852i0wqn43jkfii38yl879cdacan"; + version = "1.3.1.8"; + sha256 = "1madbhhxi5awh74q0z2mx1la5jbkvx26zvhl4x8237sjzs0k51wx"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -6108,8 +6108,6 @@ self: { libraryHaskellDepends = [ base MissingH split ]; description = "Tools for focusing in on locations within numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Folly" = callPackage @@ -7199,6 +7197,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "Gleam" = callPackage + ({ mkDerivation, base, mtl, split, threepenny-gui }: + mkDerivation { + pname = "Gleam"; + version = "0.1.0.0"; + sha256 = "0j822hblrd0p343w9ds0fa75s3grgpiyv180hsw3ld3pj30fcc8b"; + libraryHaskellDepends = [ base mtl split threepenny-gui ]; + description = "HTML Canvas graphics, animations and simulations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Glob" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -9129,8 +9138,6 @@ self: { ]; description = "Library to mix shell scripting with Haskell programs"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "HSHHelpers" = callPackage @@ -9326,6 +9333,8 @@ self: { pname = "HTTP"; version = "4000.3.14"; sha256 = "0yv8mbjicpl7l2017c4dhm49117lblgwpy1llv368wci1vrxf0m6"; + revision = "1"; + editedCabalFile = "1inz9grpl9605bbymy6n5y4as54mlykbsiw8wpm5gl6qvxgrf69w"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -9578,8 +9587,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.1.0"; - sha256 = "1an10gxrhb6kxrp2hgmya6bx06xmr6y4dhvz5wnz6jqavnv2mmwh"; + version = "3.22.2.0"; + sha256 = "0l2csqvyxl399p6jmp8nkabsn8bh4k94wblh7qbn13q8zrmzmmzp"; libraryHaskellDepends = [ base bibtex bytestring containers hashable matrix parsec prettyprinter QuickCheck text transformers @@ -10098,8 +10107,6 @@ self: { ]; description = "mastodon client module for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Hate" = callPackage @@ -10688,6 +10695,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_4_18" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.4.18"; + sha256 = "1nz4d6pwcnv775ncyg85ckx8kkzj2y3h17i40jc0yna8ai7driyx"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -10799,6 +10821,8 @@ self: { pname = "HsYAML"; version = "0.2.1.0"; sha256 = "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0"; + revision = "1"; + editedCabalFile = "0bfwdwwj5wgqrrbw1cwaxwxy9970dzln7w20f21mlg2l374wnqvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10820,6 +10844,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.0"; sha256 = "12sxww260pc0bbpiyirm7911haxhljdi2f08a9ddpbgw8d5n7ffg"; + revision = "1"; + editedCabalFile = "1454jwcjaala8drxn7x765bqnzivdys99nl95mbd3yv2c6s1173g"; libraryHaskellDepends = [ aeson base bytestring containers HsYAML mtl scientific text unordered-containers vector @@ -11656,8 +11682,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "4"; - editedCabalFile = "0r6v9iv7fkslznn6fw2132j1gpxk9dyccdg8r5qj2vvsrbp0dpjf"; + revision = "5"; + editedCabalFile = "0aar0h109fiy6pads3rlmhjsaj5528yn4zay5ps0zf8yb9dyd82s"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -14720,10 +14746,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "OneTuple"; - version = "0.2.2"; - sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq"; - revision = "3"; - editedCabalFile = "0m3a9fj2h0v529q3i1kq1jfbdj68wxsmhq65hgx2rwjpgb8cqf0z"; + version = "0.2.2.1"; + sha256 = "15ls6kkf953288q7rsc49bvw467ll4nq28hvsgbaazdn7hf75ixc"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -16052,8 +16076,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.9.0.0"; - sha256 = "0jf8nzdq8jpw8pkcvy31fjg44bdlrbjl7ssj9kcqcn314yszanhw"; + version = "0.9.0.1"; + sha256 = "00pmpm2g7161bksc1l5clkghi0sbzh8y0f6xd52gwx9h6zxacns3"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec mtl template-haskell text @@ -16204,6 +16228,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_14" = callPackage + ({ mkDerivation, base, containers, deepseq, process, random + , splitmix, template-haskell, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.14"; + sha256 = "0jiqdk8ma8m68vg6vbxd0s1x0djmfjn1zm06masz7x8rzc3i9gjj"; + libraryHaskellDepends = [ + base containers deepseq random splitmix template-haskell + transformers + ]; + testHaskellDepends = [ base deepseq process ]; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -16679,8 +16721,6 @@ self: { executableHaskellDepends = [ base random-fu ]; description = "Randomness intuition trainer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Range" = callPackage @@ -16767,6 +16807,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Rasterific_0_7_5_2" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity + , free, JuicyPixels, mtl, primitive, transformers, vector + , vector-algorithms + }: + mkDerivation { + pname = "Rasterific"; + version = "0.7.5.2"; + sha256 = "0f2qskrkxpj728zplrjz3j6h5cxwqvr0qi3614krjgcx69iym3sx"; + libraryHaskellDepends = [ + base bytestring containers dlist FontyFruity free JuicyPixels mtl + primitive transformers vector vector-algorithms + ]; + description = "A pure haskell drawing engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ReadArgs" = callPackage ({ mkDerivation, base, hspec, system-filepath, text }: mkDerivation { @@ -20218,8 +20276,8 @@ self: { ({ mkDerivation, base, bytestring, containers, parseargs }: mkDerivation { pname = "WAVE"; - version = "0.1.4"; - sha256 = "1zr2sw3m0pwbn5qfxhgf8195f4pjj3azc2w849l0cdi3znvmlxih"; + version = "0.1.6"; + sha256 = "1jm0zs4v38agy0rinlxkgx5zgdy0qizy2nb73wfzprk5kka5kn37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -22424,13 +22482,14 @@ self: { }) {}; "acme-dont" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "acme-dont"; - version = "1.1"; - sha256 = "1kj3qjgn1rz093050z49w3js4is9p0g9pk5g7d7wvg28hpzk28n3"; + version = "1.2"; + sha256 = "0pi5xdbsbbrl6g23v41505vgzv5mr6l9r9iwv6l2gg6vzmsk42r7"; libraryHaskellDepends = [ base ]; - description = "A don't construct"; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "A \"don't\" construct"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -23142,8 +23201,6 @@ self: { ]; description = "Convert adblock config files to privoxy format"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "addLicenseInfo" = callPackage @@ -23424,38 +23481,6 @@ self: { }) {}; "aeson" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, Diff - , directory, dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, integer-logarithms, primitive, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, text - , th-abstraction, time, time-compat, unordered-containers - , uuid-types, vector - }: - mkDerivation { - pname = "aeson"; - version = "1.4.6.0"; - sha256 = "12s8nfsady47zlz94f7m978irwwj0l0v2x41hk8w1i14wb3b4gwj"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable primitive scientific tagged template-haskell text - th-abstraction time time-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers Diff directory dlist filepath - generic-deriving ghc-prim hashable hashable-time integer-logarithms - QuickCheck quickcheck-instances scientific tagged tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-compat unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_4_7_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring , bytestring, containers, deepseq, Diff, directory, dlist, filepath @@ -23467,8 +23492,10 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.4.7.0"; - sha256 = "15ykkxa636jnx1zcyq4yxgjz78m5fp315gg0llbjf44jk4fbhndh"; + version = "1.4.7.1"; + sha256 = "1502yjw4y5ggp1gmrx0d3pcgrx3zhwbmcz4jb4fcignrbxjldrq7"; + revision = "1"; + editedCabalFile = "1fih6nmhvg0dvhngk2bjsr9s0804lgng971qz4fjl4mpb7cjz3bd"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers deepseq dlist ghc-prim hashable primitive scientific tagged @@ -23485,7 +23512,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -23605,8 +23631,8 @@ self: { pname = "aeson-compat"; version = "0.3.9"; sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0"; - revision = "2"; - editedCabalFile = "1y07skwfg22z37fvjmqcpcl1yz1kx2zn4zz3n1bfghk7740c4gyd"; + revision = "3"; + editedCabalFile = "1fnahwplqcnv9m4kcf8i588ankafd2125ch71027plciqxxwid70"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -24163,6 +24189,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-schemas_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, first-class-families + , megaparsec, QuickCheck, raw-strings-qq, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text + , th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.1.0"; + sha256 = "1w01mdixja6f8176ra0lrkhbrr68hcsiib7sq8sdfh1rsx3hsn62"; + libraryHaskellDepends = [ + aeson base bytestring first-class-families megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring first-class-families megaparsec QuickCheck + raw-strings-qq tasty tasty-golden tasty-hunit tasty-quickcheck + template-haskell text th-test-utils unordered-containers + ]; + description = "Easily consume JSON data on-demand with type-safety"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -24306,16 +24356,17 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable, mtl - , scientific, text, transformers, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable + , megaparsec, mtl, scientific, text, text-builder, transformers + , unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.18"; - sha256 = "1n288jb8ksjb6psgal4q6p7ad13sdak3llk54nc0gg5w2r20x634"; + version = "0.19"; + sha256 = "1v8s1f0zxhvf0r0cr800x363361g7il2wmbah04kr1vl376ydcjy"; libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable mtl scientific text - transformers unordered-containers vector + aeson attoparsec base bytestring hashable megaparsec mtl scientific + text text-builder transformers unordered-containers vector ]; description = "API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; @@ -24983,8 +25034,6 @@ self: { ]; description = "Wake up and perform an action at a certain time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "alea" = callPackage @@ -25196,8 +25245,6 @@ self: { ]; description = "Model and test API surfaces algebraically"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "algebra-dag" = callPackage @@ -25913,8 +25960,8 @@ self: { pname = "amazonka"; version = "1.6.1"; sha256 = "104ifvmwdc1w3y42qcbq57v579zcnmlfv3f0bsazbcqdxnvr9dzd"; - revision = "1"; - editedCabalFile = "0xn4wy5gb1h4f4wd2h5ic17nb6ilikmsp1qip6xxc3img5rmaqyq"; + revision = "2"; + editedCabalFile = "171rp3cbgy58lps437c1jfpmi4xsp0z4pral7jh3mybn73l672zm"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-client http-conduit http-types ini mmorph @@ -28890,8 +28937,6 @@ self: { executableHaskellDepends = [ base data-default ]; description = "Tools for interacting with Anki database"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "annah" = callPackage @@ -29720,6 +29765,18 @@ self: { broken = true; }) {}; + "aop-prelude" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "aop-prelude"; + version = "0.1.0.0"; + sha256 = "0jgv33h50mb5i0fignmxngijcrv59wnnljnf1idrf7n57kgrrjlg"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base ghc-prim ]; + description = "prelude for Algebra of Programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aos-signature" = callPackage ({ mkDerivation, base, bytestring, cryptonite, memory, mtl , protolude, QuickCheck, random, tasty, tasty-hunit @@ -31129,8 +31186,8 @@ self: { }: mkDerivation { pname = "archive-libarchive"; - version = "0.2.2.2"; - sha256 = "12a7rvzbywz5kh403q0q612z1f2arb74jgjx9qk1vdhiyasgwnkh"; + version = "1.0.0.0"; + sha256 = "0pqq76gnk6y71c5wwjhq99y2695v6bfyzjb8gakp6h3jivcpd2gb"; libraryHaskellDepends = [ base bytestring composition-prelude libarchive ]; @@ -31147,8 +31204,8 @@ self: { }: mkDerivation { pname = "archive-sig"; - version = "0.2.3.0"; - sha256 = "0zpi4kqd4g298xlcmsk30kpahmlfgmxany3mny1zpzd8968qn5za"; + version = "1.0.0.0"; + sha256 = "1n8b10l5fq11kvph6j3qysm4ih6yi02167hixx98sa5c6bgba5z5"; libraryHaskellDepends = [ base bytestring composition-prelude dir-traverse ]; @@ -31177,8 +31234,8 @@ self: { }: mkDerivation { pname = "archive-tar-bytestring"; - version = "0.1.0.0"; - sha256 = "0s1x4krnjdf1gq0f1krqdhxjkz4yanl5ayr0mdg6bcprlpzf3ib9"; + version = "1.0.0.0"; + sha256 = "0gda7vpzjxsi8qidzqz1967a3nbap8m52f4ncfj8ph6kwh3pw2zb"; libraryHaskellDepends = [ base bytestring composition-prelude tar-bytestring text unix ]; @@ -31491,8 +31548,8 @@ self: { }: mkDerivation { pname = "arion-compose"; - version = "0.1.1.0"; - sha256 = "0d90m39gir2371wgjkkmb7yrqr92zncjr6naz68r64a9mq38ga90"; + version = "0.1.1.1"; + sha256 = "0qi9mj67j3kq02psm3qa855rk0hpz2pvfa7ggx4jhzqnf60xd9ph"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -31510,8 +31567,7 @@ self: { ]; description = "Run docker-compose with help from Nix/NixOS"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "arith-encode" = callPackage @@ -32078,8 +32134,6 @@ self: { libraryHaskellDepends = [ base MissingH ]; description = "Generic markup builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ascii" = callPackage @@ -32126,8 +32180,6 @@ self: { libraryHaskellDepends = [ base random-extras random-fu text ]; description = "A collection of ASCII cows. Moo."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ascii-flatten" = callPackage @@ -32470,8 +32522,8 @@ self: { ({ mkDerivation, base, bytestring, hourglass, memory }: mkDerivation { pname = "asn1-types"; - version = "0.3.3"; - sha256 = "162lacdl9jr42pdhaj9hxqlba6hjxm6g866anna74q6v3cvw5ssp"; + version = "0.3.4"; + sha256 = "1a119qxhxhr0yn37r26dkydm6g5kykdkx98ghb59i4ipa6i95vkq"; libraryHaskellDepends = [ base bytestring hourglass memory ]; description = "ASN.1 types"; license = stdenv.lib.licenses.bsd3; @@ -32495,12 +32547,12 @@ self: { }) {}; "aspell-pipe" = callPackage - ({ mkDerivation, base, process, text }: + ({ mkDerivation, async, base, process, text }: mkDerivation { pname = "aspell-pipe"; - version = "0.3"; - sha256 = "1jl332g0v3zsjx4c340y5cw8rfpi527gki86y14zps6rb9b9nvzi"; - libraryHaskellDepends = [ base process text ]; + version = "0.4"; + sha256 = "0vwav0xdrsb9kww7p1z63wifxd5bfd247vdqscf2amkdgm5k716m"; + libraryHaskellDepends = [ async base process text ]; description = "Pipe-based interface to the Aspell program"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -32619,6 +32671,8 @@ self: { pname = "assoc"; version = "1.0.1"; sha256 = "1m9n4vp190bvn2wcrd4ggfwa9pi93jp0zgx02mdgywn2zfidw020"; + revision = "1"; + editedCabalFile = "1q6sc9v79p2pdm7aa6mfbn824vc01wj267saf2gp86b3wzgp0mrh"; libraryHaskellDepends = [ base bifunctors tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = stdenv.lib.licenses.bsd3; @@ -32837,6 +32891,8 @@ self: { pname = "async"; version = "2.2.2"; sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb"; + revision = "1"; + editedCabalFile = "1kg9xmby0wkx31998h2r43yr8bl1aixk6025zqigz9vdhmkc2y51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -33611,10 +33667,8 @@ self: { }: mkDerivation { pname = "attoparsec"; - version = "0.13.2.3"; - sha256 = "1ngjn9h5n0vyki0m2jir4mg85875ysswy9hznpmj1r856mqwc6ix"; - revision = "1"; - editedCabalFile = "164n392qrgyb8mg3xxaxym0ffvqyjr4ny4lfrr81y7hk3947yw9q"; + version = "0.13.2.4"; + sha256 = "1cpgxc17lh4lnpblb3cimpq4ka23bf89q6yvd0jwk7klw5nwsrms"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -34641,6 +34695,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avro_0_5_1_0" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors + , binary, bytestring, containers, data-binary-ieee754, deepseq + , directory, doctest, doctest-discover, extra, fail, gauge + , generic-lens, HasBigDecimal, hashable, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, mtl + , QuickCheck, random, raw-strings-qq, scientific, semigroups + , tagged, template-haskell, text, tf-random, time, transformers + , unordered-containers, uuid, vector, zlib + }: + mkDerivation { + pname = "avro"; + version = "0.5.1.0"; + sha256 = "0yhv29ahwbj97l30knaid8l6v1n9k3ayv67qfkchd2m6qhzm7ns5"; + libraryHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers data-binary-ieee754 deepseq fail HasBigDecimal hashable + mtl raw-strings-qq scientific semigroups tagged template-haskell + text tf-random time unordered-containers uuid vector zlib + ]; + testHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers directory doctest doctest-discover extra fail + generic-lens HasBigDecimal hashable hedgehog hspec + hw-hspec-hedgehog lens lens-aeson mtl QuickCheck raw-strings-qq + scientific semigroups tagged text tf-random time transformers + unordered-containers uuid vector zlib + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base binary bytestring containers deepseq gauge hashable mtl + random raw-strings-qq text transformers unordered-containers vector + ]; + description = "Avro serialization support for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avro-piper" = callPackage ({ mkDerivation, aeson, avro, base, bytestring, conduit , conduit-combinators, conduit-extra, hedgehog, hspec @@ -34797,31 +34889,6 @@ self: { }: mkDerivation { pname = "aws-cloudfront-signed-cookies"; - version = "0.2.0.1"; - sha256 = "1yk40n6gjs72pyi6yjwhqj0dngqc4b74rpg0ji61852nbb0snl28"; - revision = "3"; - editedCabalFile = "1v0bbyskwbawfhaji3s63hjrzwsi2bb7l8g6yxdp02bp6zb92757"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring - bytestring cookie cryptonite lens lens-aeson optparse-applicative - pem text time unordered-containers vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog neat-interpolation ]; - description = "Generate signed cookies for AWS CloudFront"; - license = stdenv.lib.licenses.mit; - }) {}; - - "aws-cloudfront-signed-cookies_0_2_0_4" = callPackage - ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types - , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog - , lens, lens-aeson, neat-interpolation, optparse-applicative, pem - , text, time, unordered-containers, vector - }: - mkDerivation { - pname = "aws-cloudfront-signed-cookies"; version = "0.2.0.4"; sha256 = "0j40760k1ackwhsy279ir8jybnvis5m56i5hy3rppjybhjiyyd4v"; isLibrary = true; @@ -34835,7 +34902,6 @@ self: { testHaskellDepends = [ base hedgehog neat-interpolation ]; description = "Generate signed cookies for AWS CloudFront"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-cloudfront-signer" = callPackage @@ -35170,8 +35236,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "2.0.3"; - sha256 = "1ycqwmpgqzdb8kz3w6yzf44id32pc3vin1w3j0klzzg2k51l4nnr"; + version = "2.0.4"; + sha256 = "0gzg1g5669lr7p5sg22r6b952c7pn39rjr9y0ss77jvl7klhykr8"; libraryHaskellDepends = [ aeson base bytestring http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -35179,8 +35245,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Haskell runtime for AWS Lambda"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-lambda-runtime" = callPackage @@ -36170,8 +36234,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "banwords" = callPackage @@ -36402,16 +36464,14 @@ self: { ({ mkDerivation, base, base-compat }: mkDerivation { pname = "base-compat-migrate"; - version = "0.2.0.0"; - sha256 = "0xc9fjdv4bx5isw39l9aknvwvi46zpc4930wxvsx0v4qa8yhfpaa"; + version = "0.2.0.1"; + sha256 = "18nyacdji89ys6h7hw28b6rz6p9gkasd4c0l7awz79wp0w8a0cdm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat ]; doHaddock = false; description = "Helps migrating projects to base-compat(-batteries)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "base-encoding" = callPackage @@ -36525,8 +36585,8 @@ self: { }: mkDerivation { pname = "base16"; - version = "0.1.2.1"; - sha256 = "1dqkqyyqdym48fh59zz3jyvhbbc70q37fvx2zv80cmysa929d1fr"; + version = "0.2.0.0"; + sha256 = "0j4mk7w8bg3q3ln5lcffdvaz36frizzq82z05l699y5g25abzrx4"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring memory random-bytestring tasty @@ -36557,8 +36617,8 @@ self: { }: mkDerivation { pname = "base16-lens"; - version = "0.1.0.0"; - sha256 = "17cckwpl3c7bf6jj8l1jbwpb0hlsqp7iv3mllb59gp38nfdn51rd"; + version = "0.1.2.0"; + sha256 = "1mgy1adhlw2sra8lfc2cklfn9w7jj2f9pilifnnfk2jq6hwalpn8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base16 bytestring lens text ]; testHaskellDepends = [ base doctest lens ]; @@ -36779,8 +36839,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "3"; - editedCabalFile = "0gqyij803y0shpc5knljbffss6c1pbdanfzwlws01vkl4y10sfja"; + revision = "4"; + editedCabalFile = "0w7pzjyyhan42zbk8mn9dw1hzjcr0nv9nhpi4hs7s16d6cc80qwa"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -38625,6 +38685,8 @@ self: { pname = "bin"; version = "0.1"; sha256 = "008i0yxvg9v05gby6ysq3f7ygh125p9xa5vwrcrbq5xw79igyzq5"; + revision = "2"; + editedCabalFile = "1zmzi566syvrm9bk0mxj3dycd3i4b33018c644qxdqdb00mlvayh"; libraryHaskellDepends = [ base dec deepseq fin hashable QuickCheck ]; @@ -38851,10 +38913,8 @@ self: { }: mkDerivation { pname = "binary-instances"; - version = "1"; - sha256 = "07y9582vsw94ks8whkd3dcmf4wdwlq8riyk2shmxxprkq0gsv3z0"; - revision = "2"; - editedCabalFile = "0yawdwm086gk51y5s5zbybiwiv386cx8xyj6kcgj9wwdidcnaxdi"; + version = "1.0.0.1"; + sha256 = "0f8ilzpwj7gbyvlswlkd48dzpj9m13ipinw55lvjag0ir52idk9a"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable scientific tagged text text-binary time-compat unordered-containers @@ -38906,8 +38966,8 @@ self: { pname = "binary-orphans"; version = "1.0.1"; sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; - revision = "3"; - editedCabalFile = "1s3bk63x2rxwk611jbvpvvgrq1k7k0gd9q105cqxcbcih396ac0s"; + revision = "4"; + editedCabalFile = "07jwyndphnfr20ihagncpl8rr7i62hxf0b9m2bdahyzvz0yzdsl2"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary QuickCheck quickcheck-instances tagged tasty @@ -39136,8 +39196,6 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "binary-tree" = callPackage @@ -41200,8 +41258,8 @@ self: { }: mkDerivation { pname = "bitvec"; - version = "1.0.2.0"; - sha256 = "0ciri2zaifrli1zas0z75vdx97sns1fdvmghx9mlx8pi875f6b85"; + version = "1.0.3.0"; + sha256 = "0s3gdh2rgz9wdnin5h2yhvnr8gy3sgcl9sbb1k4069ap4svrg8hd"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp primitive vector ]; @@ -41849,8 +41907,8 @@ self: { }: mkDerivation { pname = "blaze-markup"; - version = "0.8.2.3"; - sha256 = "1g9m7ansj7fdyzhz1wqkbzn5amjm50vjgjdwkbjc5qqhagnv1y3j"; + version = "0.8.2.4"; + sha256 = "0xb2hd5n6ymax6yw5hyi05lgllq5ldw28mgfxjpljrws9m8i078w"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck tasty @@ -43091,6 +43149,8 @@ self: { pname = "boring"; version = "0.1.3"; sha256 = "1fljlkzc5016xbq9jykh0wr1mbyfcikh818pp54djws5vm66hh6d"; + revision = "1"; + editedCabalFile = "1gn2f035fmn2l56a507x080cl1apddszhlsf6lriwyass4v58mfl"; libraryHaskellDepends = [ adjunctions base base-compat bin constraints dec fin generics-sop ral singleton-bool streams tagged transformers transformers-compat @@ -43206,8 +43266,8 @@ self: { pname = "bound-extras"; version = "0.0.1"; sha256 = "0f49yqz5s5h4f3m3i7kpm2fqnd42nl4dbl24lvm6z3nb8qrx6ynq"; - revision = "2"; - editedCabalFile = "1a88bxgz9r1v6lqkab12ljw3vknx7sgi6vi3fsqli8ji2ajfn5k1"; + revision = "3"; + editedCabalFile = "10vv6dsfia3fdclvnhp8q76s3zgmxwzi4bvvii6g6ic8wid6asvg"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -43315,23 +43375,24 @@ self: { "box" = callPackage ({ mkDerivation, async, attoparsec, base, concurrency , contravariant, dejafu, doctest, exceptions, foldl, generic-lens - , lens, mtl, pipes, profunctors, random, streaming, text, time - , transformers, transformers-base + , lens, managed, mtl, pipes, profunctors, protolude, random + , streaming, text, time, transformers, transformers-base + , typed-process, websockets }: mkDerivation { pname = "box"; - version = "0.2.0"; - sha256 = "0100vq8fb2lihnas6cqrigrrndzj48icsl56kdyi6vvkr9aclzm2"; + version = "0.3.0"; + sha256 = "1xm4dd2h8fylfadfb4gsw1vs2a5l5ngjz956zh5cnm0rdma63j14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec base concurrency contravariant exceptions foldl lens pipes profunctors streaming text time transformers - transformers-base + transformers-base typed-process ]; executableHaskellDepends = [ - base concurrency dejafu generic-lens lens mtl random streaming text - transformers + base concurrency dejafu generic-lens lens managed mtl protolude + random streaming text transformers websockets ]; testHaskellDepends = [ base doctest ]; description = "boxes"; @@ -43544,8 +43605,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.52"; - sha256 = "10734nqmmix3ddab30a02dn9sma2aywg358q156b392g0nxzv39n"; + version = "0.52.1"; + sha256 = "1jqs75k7r98c6k8d14arhiz49xy7k0jaymlmijx0pma3yrha90pl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43983,8 +44044,8 @@ self: { pname = "brotli"; version = "0.0.0.0"; sha256 = "1l9qiw5cl0k1rcnqnj9pb7vgj1b06wckkk5i73nqr15ixgcjmr9j"; - revision = "1"; - editedCabalFile = "0fw26rv8i9zz4qyr32paz2y0psdppdaz427jp8mpbanwmg763024"; + revision = "2"; + editedCabalFile = "0iny0gbb5b3a8n8rpriz7620fnhw70c0pgl615s4b1rhrnj87wrb"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; testHaskellDepends = [ @@ -44099,8 +44160,8 @@ self: { }: mkDerivation { pname = "bson"; - version = "0.4.0.0"; - sha256 = "0fcwqxzh678j48b04rbk7jwbnpp4859w389fb0fl7d5hvvw9kj19"; + version = "0.4.0.1"; + sha256 = "1xmxhq1f8v00mbq2l1sb7akzhy0gd9wcylkanpizn68wczqkdi3b"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 data-binary-ieee754 mtl network text time @@ -44400,8 +44461,8 @@ self: { }: mkDerivation { pname = "buffet"; - version = "0.3.0"; - sha256 = "1dsnbx148yrqikqx9qfxivz52szlqaah7q6dg80m87g997x428m7"; + version = "0.4.0"; + sha256 = "04q4k7bfbh41jg869w71wv4idlxbpf48cz2sg5m3ds66wknnhqwq"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -45825,10 +45886,8 @@ self: { ({ mkDerivation, base, bytestring, composition-prelude, lens }: mkDerivation { pname = "bzip-signature"; - version = "0.1.2.0"; - sha256 = "077bwh3rwig9rml5pz49m4rxbn0j9q6cv7zlc5xlhkmw6plwg4ps"; - revision = "1"; - editedCabalFile = "003197s08saac5azpwc4vqvs65244pvp019j9lhr76my6a98iz0f"; + version = "0.2.0.0"; + sha256 = "1d2k6dv2wakq51z365s37hn1k1zs785z3f01b90x2dcg6y1xgln7"; libraryHaskellDepends = [ base bytestring composition-prelude lens ]; @@ -46227,8 +46286,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.1.5"; - sha256 = "0bzxpr1lalj3i4qickxpch3ky5d686k1rdba2aymhcr8g89l4m0m"; + version = "1.0.1.8"; + sha256 = "0yxq73bdw1ai0yv54prcxpm1ygkpa8m0jnznwm975b82qlmplynw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46410,16 +46469,14 @@ self: { }: mkDerivation { pname = "cabal-file-th"; - version = "0.2.6"; - sha256 = "0kam97xbmsn0alqyw709fpvj7j5dhdi90n98dmg1sfr5i54gh1nw"; + version = "0.2.7"; + sha256 = "1pp8jk7k8nbvhy6vaxsqa7cd321yw1a3685n4fbhgb096hkrldkl"; libraryHaskellDepends = [ base Cabal directory pretty template-haskell ]; testHaskellDepends = [ base Cabal ]; description = "Template Haskell expressions for reading fields from a project's cabal file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cabal-flatpak" = callPackage @@ -46446,6 +46503,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-flatpak_0_1_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan + , containers, cryptohash-sha256, http-client, http-client-tls + , http-types, optparse-applicative, pathtype, shell-utility, tar + , text, utility-ht, zlib + }: + mkDerivation { + pname = "cabal-flatpak"; + version = "0.1.0.1"; + sha256 = "12jyzbh4xhqj6rhg9n2za5r8n4j6zdw3x5ixdh5xvw4wivfxqxq9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cabal-plan containers + cryptohash-sha256 http-client http-client-tls http-types + optparse-applicative pathtype shell-utility tar text utility-ht + zlib + ]; + description = "Generate a FlatPak manifest from a Cabal package description"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-fmt" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, mtl, optparse-applicative, parsec, pretty, process @@ -46580,21 +46660,23 @@ self: { ({ mkDerivation, array, async, base, base16-bytestring, binary , bytestring, Cabal, containers, cryptohash-sha256, deepseq , directory, echo, edit-distance, filepath, hackage-security - , hashable, HTTP, mtl, network, network-uri, parsec, pretty - , process, random, resolv, stm, tar, text, time, unix, zlib + , hashable, HTTP, lukko, mtl, network, network-uri, parsec, pretty + , process, random, resolv, stm, tar, text, time, transformers, unix + , zlib }: mkDerivation { pname = "cabal-install"; - version = "3.0.0.0"; - sha256 = "1wda29ifkn50376jidj6ihfk60a64y0bsd7lh3yw15py7a2sfcm4"; + version = "3.2.0.0"; + sha256 = "1c0cc256bha97aj7l0lf76l5swlnmwcqppiz8l4cl5xgba4mwmd0"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; executableHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal containers cryptohash-sha256 deepseq directory echo edit-distance - filepath hackage-security hashable HTTP mtl network network-uri - parsec pretty process random resolv stm tar text time unix zlib + filepath hackage-security hashable HTTP lukko mtl network + network-uri parsec pretty process random resolv stm tar text time + transformers unix zlib ]; doCheck = false; postInstall = '' @@ -47033,15 +47115,13 @@ self: { }: mkDerivation { pname = "cabal-toolkit"; - version = "0.0.6"; - sha256 = "0r42hvlzykmas03smsxz8484gnc1r1pan66rcv8ihibj0zw42qb4"; + version = "0.0.7"; + sha256 = "08im4qqrg3ribbh6rg2rk7jynnjwjgaysfvgbamanjdwqldjwx7f"; libraryHaskellDepends = [ base binary bytestring Cabal containers ghc template-haskell ]; description = "Helper functions for writing custom Setup.hs scripts."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cabal-uninstall" = callPackage @@ -47189,8 +47269,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.5"; - sha256 = "1z6sxjgsbp0gz6rv9camkbmnazj3gn5j4wsxmmwpchv0n6vmcmzw"; + version = "2.6"; + sha256 = "173qiqpzcvihdv0jd0z15wgxzars0kybcyhxprmypk232c9pa48v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -48294,8 +48374,6 @@ self: { ]; description = "Extensional capabilities and deriving combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "capataz" = callPackage @@ -48623,8 +48701,6 @@ self: { ]; description = "A content-addressed storage"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "casa-abbreviations-and-acronyms" = callPackage @@ -49162,6 +49238,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; + revision = "1"; + editedCabalFile = "1ph8rf91z4nf1ryrh9s4gd1kq98jlgk2manwddkpch8k0n9xvfk4"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -50596,8 +50674,8 @@ self: { }: mkDerivation { pname = "character-cases"; - version = "0.1.0.0"; - sha256 = "1383g5fwy11h43268609n9dmvp0wqwgycn9ly8c7g8h4qpyckh38"; + version = "0.1.0.3"; + sha256 = "05vpi3q44ywljkbxrcx9xqxsw86dxh2ipcsbfmn55d9vkl901hry"; libraryHaskellDepends = [ base containers here megaparsec prettyprinter template-haskell ]; @@ -50605,10 +50683,8 @@ self: { base containers doctest Glob here megaparsec prettyprinter template-haskell ]; - description = "Exposes subspecies types of Char. And naming cases. e.g. meaning of [a-z], [A-Z], [0-9], PascalCase, camelCase, and sneak_case."; + description = "Exposes subspecies types of Char. And naming cases."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "charade" = callPackage @@ -50709,6 +50785,36 @@ self: { broken = true; }) {}; + "chart-svg" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, colour, containers + , foldl, generic-lens, javascript-bridge, JuicyPixels, lens, lucid + , lucid-svg, numhask-space, palette, pretty-simple, protolude + , scientific, scotty, tagsoup, text, text-format, time + , transformers, unordered-containers, wai-middleware-static + , web-rep + }: + mkDerivation { + pname = "chart-svg"; + version = "0.0.1"; + sha256 = "1mdvqvj5bj04vgfl7wv64kbx096hrlhwr78jxg2mdnhhzr4xciq6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bifunctors colour foldl generic-lens JuicyPixels + lens lucid lucid-svg numhask-space palette pretty-simple protolude + scientific tagsoup text text-format time transformers web-rep + ]; + executableHaskellDepends = [ + base bifunctors containers generic-lens javascript-bridge lens + lucid-svg numhask-space protolude scotty text transformers + unordered-containers wai-middleware-static web-rep + ]; + description = "See readme.md"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "chart-unit" = callPackage ({ mkDerivation, base, colour, data-default, diagrams-lib , diagrams-svg, doctest, foldl, formatting, generic-lens, lens @@ -50878,6 +50984,8 @@ self: { pname = "cheapskate"; version = "0.1.1.2"; sha256 = "17n6laihqrjn62l8qw4565nf77zkvrl68bjmc3vzr4ckqfblhdzd"; + revision = "1"; + editedCabalFile = "15hdlp062gv8x7giwcfbj1kfmhpj1bg7y2w4wr2yl436haxkrbmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50999,19 +51107,6 @@ self: { ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; - version = "0.5.4"; - sha256 = "09g1430hjqxy01w0rgp0d03z2y8nw2zjyvfxs0kl9j0gyv57a10v"; - libraryHaskellDepends = [ - array base QuickCheck random semigroupoids - ]; - description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "checkers_0_5_5" = callPackage - ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: - mkDerivation { - pname = "checkers"; version = "0.5.5"; sha256 = "1g16603803xzz73md1azlcpd6xz7gkwjpy66l638v6lvipdl9hr9"; libraryHaskellDepends = [ @@ -51019,7 +51114,6 @@ self: { ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "checkmate" = callPackage @@ -51202,18 +51296,22 @@ self: { }) {}; "chimera" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, vector + ({ mkDerivation, adjunctions, base, distributive, gauge, mtl + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, vector }: mkDerivation { pname = "chimera"; - version = "0.3.0.0"; - sha256 = "0zdfh9vmhy006n6vkpkvycl5m90z1w8060dzvi0p28z7lhffb2ld"; - libraryHaskellDepends = [ base vector ]; + version = "0.3.1.0"; + sha256 = "09dk9x2har2k6apm1wlm2k5k97jf3qxy4rzx94rbfmhs5fhz0i99"; + libraryHaskellDepends = [ + adjunctions base distributive mtl vector + ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck vector ]; + benchmarkHaskellDepends = [ base gauge mtl random ]; description = "Lazy infinite streams with O(1) indexing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -51618,6 +51716,8 @@ self: { pname = "chs-cabal"; version = "0.1.1.0"; sha256 = "0zan47md9zivzc1gd1j1g0200n8d0ffx4dcmkd9vriqjsdwhqvl5"; + revision = "1"; + editedCabalFile = "04fh1g2wfm69hz1hjg4ds2c3npdx6z2mgwddlkqr2sdbnngnmv10"; libraryHaskellDepends = [ base Cabal chs-deps ]; description = "Cabal with c2hs dependencies"; license = stdenv.lib.licenses.bsd3; @@ -52516,8 +52616,6 @@ self: { executableHaskellDepends = [ base ]; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "clash-lib" = callPackage @@ -52551,8 +52649,6 @@ self: { ]; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "clash-multisignal" = callPackage @@ -53163,8 +53259,6 @@ self: { ]; description = "Keep your home dir clean by finding old conf files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "clean-unions" = callPackage @@ -54546,8 +54640,8 @@ self: { }: mkDerivation { pname = "cobot"; - version = "0.1.1.0"; - sha256 = "17cl8dh4y7wyas6afslb1d27ibjc2633dcyx6pc6zng2p36m83l9"; + version = "0.1.1.1"; + sha256 = "12bq23am5q0cb58sgifdihc53rwg91m1wvkyr06nkjddh8vgfc3g"; libraryHaskellDepends = [ array base bytestring containers deepseq lens linear megaparsec mtl split template-haskell text @@ -54572,8 +54666,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.2.8"; - sha256 = "1snq2ypf7blknhpv86xq1n7f6a9pifd77yylsirqj358j590c4i6"; + version = "0.1.3.1"; + sha256 = "1b64ixkcagcx8d7y5nym9njllndbbb108cp1k31qr4p6yijyw15m"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -54850,8 +54944,6 @@ self: { ]; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "codo-notation" = callPackage @@ -56780,8 +56872,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "2.0.5.0"; - sha256 = "1iiqv3wkkqijdg9nxmc8c539wflc5yhp9b9d0g5nfkg01s376c98"; + version = "3.0.0.0"; + sha256 = "14dpxpcbpchlppx64k3i7rwq94f1x4vvnd0d6bnwfcpw46hbjlsl"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -57471,8 +57563,6 @@ self: { testHaskellDepends = [ base containers random stm ]; description = "Concurrent resource map"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "concurrent-rpc" = callPackage @@ -57728,34 +57818,6 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.3.1.2"; - sha256 = "12c21vrij63z60y3xd0dkg0da8sdhfq6nj5s3p5qknys5klwpqkq"; - libraryHaskellDepends = [ - base bytestring directory exceptions filepath mono-traversable mtl - primitive resourcet text transformers unix unliftio-core vector - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - mono-traversable mtl QuickCheck resourcet safe silently split text - transformers unliftio vector - ]; - benchmarkHaskellDepends = [ - base containers deepseq gauge hspec kan-extensions mwc-random - transformers vector - ]; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_3_2" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, gauge, hspec, kan-extensions - , mono-traversable, mtl, mwc-random, primitive, QuickCheck - , resourcet, safe, silently, split, text, transformers, unix - , unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "conduit"; version = "1.3.2"; sha256 = "0vmcyi3f280b6ll6pcyma4aqrl6m69n6y6x7wplxgsmxz5q7kng3"; libraryHaskellDepends = [ @@ -57773,7 +57835,6 @@ self: { ]; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -57972,34 +58033,6 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.3.4"; - sha256 = "1d853d39vj5pb8yxfcsnjwdzqzkm34ixzbnba8bslpihb7182wxi"; - libraryHaskellDepends = [ - async attoparsec base bytestring conduit directory filepath network - primitive process resourcet stm streaming-commons text transformers - typed-process unliftio-core - ]; - testHaskellDepends = [ - async attoparsec base bytestring bytestring-builder conduit - directory exceptions filepath hspec process QuickCheck resourcet - stm streaming-commons text transformers transformers-base - ]; - benchmarkHaskellDepends = [ - base bytestring bytestring-builder conduit gauge transformers - ]; - description = "Batteries included conduit: adapters for common libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-extra_1_3_5" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring - , bytestring-builder, conduit, directory, exceptions, filepath - , gauge, hspec, network, primitive, process, QuickCheck, resourcet - , stm, streaming-commons, text, transformers, transformers-base - , typed-process, unliftio-core - }: - mkDerivation { - pname = "conduit-extra"; version = "1.3.5"; sha256 = "1n8js1y1rdswvp0bkjmmz19fag19bdxgwsrqz93yc09w43p8sr4a"; libraryHaskellDepends = [ @@ -58017,7 +58050,6 @@ self: { ]; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-find" = callPackage @@ -58564,8 +58596,6 @@ self: { ]; description = "A simple config file swapping tool"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conffmt" = callPackage @@ -58666,6 +58696,8 @@ self: { pname = "config-schema"; version = "1.2.0.0"; sha256 = "0lz9y2qnjc576mbl3qnhyf4c1y5f71q7f5jgv8rj7vsg855q99hm"; + revision = "1"; + editedCabalFile = "1hlk2syn4z5zzvdc8nr3wprdpbmcjyp77spdzvyma626931m8p3a"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -58698,8 +58730,8 @@ self: { pname = "config-value"; version = "0.7.0.1"; sha256 = "0r7qylqmdvif75ylb0d0zryl2ghxl3ip9a2jhyq70aqxwdjh18g4"; - revision = "1"; - editedCabalFile = "10rdyg984dkd0xq9z54300wkkgl7zfj4l8bi4vlplvw6jh65v36c"; + revision = "2"; + editedCabalFile = "1kwn53qb7hzjgkk9fh8mabyhxjm5rkw9qapk16isx1s4vns8x9l6"; libraryHaskellDepends = [ array base pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -58713,6 +58745,8 @@ self: { pname = "config-value-getopt"; version = "0.1.1.1"; sha256 = "103afdadsh7vqfam61mixk0l2fxy41m0451bl2hl2djs3acj60b2"; + revision = "1"; + editedCabalFile = "1b5wfbqjjx6y8ll5h3vp2cmcdrcnjd3295y8ykd25yjx6f3swsja"; libraryHaskellDepends = [ base config-value text ]; description = "Interface between config-value and System.GetOpt"; license = stdenv.lib.licenses.mit; @@ -58882,8 +58916,6 @@ self: { ]; description = "Reduced parser for configurator-ng config files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "confsolve" = callPackage @@ -60449,8 +60481,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.1.1"; - sha256 = "0hja6fp7n4zrhm73fvjkisspc7cyp53blhn4maqis8lw27svjq66"; + version = "3.1.2"; + sha256 = "1mxkn9mvcxlycrrha023nppn8005n26mqhklcw2hf8l3aq2ij7mf"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -61137,8 +61169,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.4.6"; - sha256 = "0ll0qxn7s29ys8w71dvfz3qy0f5rzihz0q3axg1g73pmhqbxqi2m"; + version = "0.2.5.0"; + sha256 = "0h2h19qld1n26vap7vmcf8fzpjgdryjd09qf0ky5smhcqq81kyrj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61155,8 +61187,6 @@ self: { testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ]; description = "Build tool for C"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cplex-hs" = callPackage @@ -61224,6 +61254,21 @@ self: { license = "LGPL"; }) {}; + "cpphs_1_20_9_1" = callPackage + ({ mkDerivation, base, directory, polyparse, time }: + mkDerivation { + pname = "cpphs"; + version = "1.20.9.1"; + sha256 = "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory polyparse time ]; + executableHaskellDepends = [ base directory polyparse time ]; + description = "A liberalised re-implementation of cpp, the C pre-processor"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cprng-aes" = callPackage ({ mkDerivation, base, byteable, bytestring, cipher-aes, criterion , crypto-random, mtl @@ -62268,6 +62313,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cron_0_7_0" = callPackage + ({ mkDerivation, attoparsec, base, criterion, data-default-class + , hedgehog, mtl, mtl-compat, old-locale, semigroups, tasty + , tasty-hedgehog, tasty-hunit, text, time, transformers-compat + }: + mkDerivation { + pname = "cron"; + version = "0.7.0"; + sha256 = "0f8jb2pxy89hkdnm20yz88b3j3vgh1a9c1dxiym3150izp34ikd5"; + libraryHaskellDepends = [ + attoparsec base data-default-class mtl mtl-compat old-locale + semigroups text time + ]; + testHaskellDepends = [ + attoparsec base hedgehog semigroups tasty tasty-hedgehog + tasty-hunit text time transformers-compat + ]; + benchmarkHaskellDepends = [ attoparsec base criterion text time ]; + description = "Cron datatypes and Attoparsec parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cron-compat" = callPackage ({ mkDerivation, attoparsec, base, cron, derive, hspec , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text @@ -62333,8 +62401,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "3"; - editedCabalFile = "1l8glrv7bhdi0p1m1xq9majlbh8n9agai9d4mldzi5bnp5m5b79q"; + revision = "4"; + editedCabalFile = "0a4282bhh21l7vk79hpgcz7kj9n05r0ilgdksjkimkydg7sxgldb"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -62764,8 +62832,8 @@ self: { }: mkDerivation { pname = "cryptoconditions"; - version = "0.2.4"; - sha256 = "1mbi3h21xfzsripixkvakw4kp36n8jzwsyajjxwllq3nxq3lwgp0"; + version = "0.2.5"; + sha256 = "0p4y5irjqvd79qr1gq5v57pnyg1z4vm9pmlv9dx3v59vakz0yfcf"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base64-bytestring bytestring containers cryptonite memory text @@ -62862,8 +62930,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.100.1"; sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w"; - revision = "4"; - editedCabalFile = "0qb2wasfc4dpf6f9ahvhlv8njb3p3p9iwblg4032ssi95cg85718"; + revision = "5"; + editedCabalFile = "1qay4qlvmwpllsqn1yd8gyraifx5ydl4chgg3dj4gzgmi36i9n0l"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -62882,8 +62950,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.101.0"; sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"; - revision = "3"; - editedCabalFile = "1arhz4y792kx439s2zv9x291gvvl2zxcfx9sq0nxsjlz7c3hpyp1"; + revision = "4"; + editedCabalFile = "00p6sx2n1pzykm3my68hjfk8l66g66rh7inrfcnkd5mhilqdcqxr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -63336,6 +63404,44 @@ self: { broken = true; }) {}; + "css-easings" = callPackage + ({ mkDerivation, aeson, base, blaze-markup, data-default + , QuickCheck, scientific, shakespeare, text + }: + mkDerivation { + pname = "css-easings"; + version = "0.2.0.0"; + sha256 = "0i969cp4j154ddq7x2821p53qh8dnsr7f74rsdi4y9rbbls1fnpv"; + libraryHaskellDepends = [ + aeson base blaze-markup data-default QuickCheck scientific + shakespeare text + ]; + description = "Defining and manipulating css easing strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "css-selectors" = callPackage + ({ mkDerivation, aeson, alex, array, base, blaze-markup + , data-default, Decimal, happy, QuickCheck, shakespeare + , template-haskell, test-framework, test-framework-quickcheck2 + , text + }: + mkDerivation { + pname = "css-selectors"; + version = "0.2.0.0"; + sha256 = "1wyc06f14nj5v5ysjly3jimja3y47pvnm8vm2knlw3sli1h0pgxi"; + libraryHaskellDepends = [ + aeson array base blaze-markup data-default Decimal QuickCheck + shakespeare template-haskell text + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 text + ]; + description = "Parsing, rendering and manipulating css selectors in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "css-syntax" = callPackage ({ mkDerivation, base, criterion, deepseq, directory, hspec , QuickCheck, scientific, text @@ -64386,8 +64492,8 @@ self: { ({ mkDerivation, base, doctest, template-haskell }: mkDerivation { pname = "d10"; - version = "0.2.1.0"; - sha256 = "0dbz1lil7qm0qnn1y5kakh6nyyc3jkv00125vfp9nk2n25yckb9z"; + version = "0.2.1.2"; + sha256 = "1y1rqx02qycw01921rrgd6daq91hnbzy35cflbl94maylvi3ryjk"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base doctest ]; description = "Digits 0-9"; @@ -64627,8 +64733,6 @@ self: { ''; description = "a distributed, interactive, smart revision control system"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) curl;}; "darcs-benchmark" = callPackage @@ -65072,8 +65176,6 @@ self: { ]; description = "Utilities for accessing and manipulating fields of records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-accessor-transformers" = callPackage @@ -65228,6 +65330,8 @@ self: { pname = "data-clist"; version = "0.1.2.3"; sha256 = "1mwfhnmvi3vicyjzl33m6pcipi2v887zazyqxygq258ndd010s9m"; + revision = "1"; + editedCabalFile = "13hg7a3d4ky8b765dl03ryxg28lq8iaqj5ky3j51r0i1i4f2a9hy"; libraryHaskellDepends = [ base deepseq QuickCheck ]; description = "Simple functional ring type"; license = stdenv.lib.licenses.bsd3; @@ -65255,8 +65359,6 @@ self: { libraryHaskellDepends = [ base constraints ]; description = "Define Backwards Compatibility Schemes for Arbitrary Data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-concurrent-queue" = callPackage @@ -65579,6 +65681,8 @@ self: { pname = "data-dword"; version = "0.3.1.3"; sha256 = "1l4g8xbsix6xqljadfq49rs39m2lsbrfz4i7l80q0yhafbm4ax8b"; + revision = "1"; + editedCabalFile = "0gz9pqbi47f4dhn2c9v7y9nzgprbkbp9pd2vq5kpzj18hf53bvdm"; libraryHaskellDepends = [ base data-bword ghc-prim hashable template-haskell ]; @@ -66162,8 +66266,6 @@ self: { ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-msgpack-types" = callPackage @@ -66181,8 +66283,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-named" = callPackage @@ -66876,22 +66976,27 @@ self: { }) {}; "datafix" = callPackage - ({ mkDerivation, base, Cabal, cabal-toolkit, containers, criterion - , deepseq, directory, doctest, filepath, ghc, ghc-paths, Glob - , lattices, pomaps, primitive, QuickCheck, tasty, tasty-hunit - , tasty-smallcheck, text, transformers, turtle, vector + ({ mkDerivation, base, Cabal, cabal-doctest, cabal-toolkit + , containers, criterion, deepseq, directory, doctest, filepath, ghc + , ghc-paths, lattices, pomaps, primitive, QuickCheck, tasty + , tasty-hunit, tasty-smallcheck, text, transformers, turtle, vector }: mkDerivation { pname = "datafix"; - version = "0.0.0.2"; - sha256 = "0z13m81cl3dnkzrl9fym9mf269lhyw4039fkqpijs024pwbvp0ni"; - setupHaskellDepends = [ base Cabal cabal-toolkit ]; + version = "0.0.1.0"; + sha256 = "1rp3lwrqd8ghmjbqk22sb4mfhl13swm3vij28l5ygj2f3sb8x2zi"; + revision = "1"; + editedCabalFile = "0gx0knrmljam25wz2b0zpn33bw2bxfmcwq8ilxr9j8ndqxy36n6n"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest cabal-toolkit ]; libraryHaskellDepends = [ base containers lattices pomaps primitive transformers vector ]; + executableHaskellDepends = [ base containers ]; testHaskellDepends = [ base Cabal cabal-toolkit containers directory doctest filepath ghc - ghc-paths Glob lattices primitive QuickCheck tasty tasty-hunit + ghc-paths lattices primitive QuickCheck tasty tasty-hunit tasty-smallcheck text transformers turtle ]; benchmarkHaskellDepends = [ @@ -67382,8 +67487,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.12"; - sha256 = "19gc1cmz8g5fmqks5rj5fwg9ihd5ras180jdv2wfgilrlrjxvx84"; + version = "1.2.13"; + sha256 = "0v5f2n00v1lsfkjz2isgdx4sfyg2cf9ik0nda3j13xh749bgqh38"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -68172,8 +68277,8 @@ self: { pname = "dec"; version = "0.0.3"; sha256 = "1y8bvlm2371dq2v0jv1srki98nbhbz091wh0g2x58wz78h971f6r"; - revision = "1"; - editedCabalFile = "09dkybwqmayf2a1sn94vmmma2xfvf07bw7grhcyjm7lq9jpxv8y0"; + revision = "2"; + editedCabalFile = "1v5f5yby0cld1ziqqgkcx8b50qkpviplspm82a6wl7lw28cjm0hs"; libraryHaskellDepends = [ base ]; description = "Decidable propositions"; license = stdenv.lib.licenses.bsd3; @@ -68982,8 +69087,8 @@ self: { }: mkDerivation { pname = "dependent-map"; - version = "0.3"; - sha256 = "1azy6yrnd0adga4z2mlp9knbp55xhlj4v9c3rb2lr1sd2l8cgf80"; + version = "0.4.0.0"; + sha256 = "0b0zhyl3wkl4kkrxvq7vwjz3gn0ndxjjgyw9cky8a6xyv190pkjk"; libraryHaskellDepends = [ base constraints-extras containers dependent-sum ]; @@ -69024,12 +69129,12 @@ self: { }) {}; "dependent-sum" = callPackage - ({ mkDerivation, base, constraints-extras }: + ({ mkDerivation, base, constraints-extras, some }: mkDerivation { pname = "dependent-sum"; - version = "0.6.2.0"; - sha256 = "17xj5mfrqbhf614z25l2km5grhrxh1rfhb8h8g677sv2xgxrv82d"; - libraryHaskellDepends = [ base constraints-extras ]; + version = "0.7.1.0"; + sha256 = "0aj63gvak0y4mgxndykqfg5w958hf7lp5blml2z647rjgy85bjw1"; + libraryHaskellDepends = [ base constraints-extras some ]; description = "Dependent sum type"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -69058,16 +69163,14 @@ self: { }: mkDerivation { pname = "dependent-sum-template"; - version = "0.1.0.0"; - sha256 = "07z95f27jpdb8y01f904z0fi6kjllsbcm2zg0k1v9y8c6rwavw0f"; + version = "0.1.0.3"; + sha256 = "1px4dj0czdsg4lx4c09v1pil4zifrvpsndhq0hp1hrlrzb9igsy8"; libraryHaskellDepends = [ base dependent-sum template-haskell th-extras ]; testHaskellDepends = [ base constraints-extras dependent-sum ]; description = "Template Haskell code to generate instances of classes in dependent-sum package"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "depends" = callPackage @@ -69323,23 +69426,21 @@ self: { "derive-storable-plugin" = callPackage ({ mkDerivation, base, criterion, deepseq, derive-storable, ghc - , ghc-paths, ghci, hspec, QuickCheck + , ghci, hspec, QuickCheck }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.2.0"; - sha256 = "0rpwiwwz24j9bq07d89ndp61f95hjy7am2q72jxb0by7pzpy9xw0"; + version = "0.2.3.0"; + sha256 = "0yr9s33drw5l4ckqipqpmgrsrnm18yr4742mmyjqm3x7wai7d99q"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ - base derive-storable ghc ghc-paths ghci hspec QuickCheck + base derive-storable ghc ghci hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq derive-storable ]; description = "GHC core plugin supporting the derive-storable package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "derive-topdown" = callPackage @@ -69575,8 +69676,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "a simple build tool for OCaml projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "despair" = callPackage @@ -69935,6 +70034,58 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall_1_31_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, hashable, haskeline, http-client, http-client-tls + , http-types, lens-family-core, megaparsec, memory, mockery, mtl + , network-uri, optparse-applicative, parser-combinators, parsers + , pretty-simple, prettyprinter, prettyprinter-ansi-terminal + , profunctors, QuickCheck, quickcheck-instances, repline + , scientific, semigroups, serialise, special-values, spoon, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , template-haskell, text, text-manipulate, th-lift-instances + , transformers, transformers-compat, turtle, unordered-containers + , uri-encode, vector + }: + mkDerivation { + pname = "dhall"; + version = "1.31.1"; + sha256 = "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath hashable haskeline http-client http-client-tls http-types + lens-family-core megaparsec memory mtl network-uri + optparse-applicative parser-combinators parsers pretty-simple + prettyprinter prettyprinter-ansi-terminal profunctors repline + scientific serialise template-haskell text text-manipulate + th-lift-instances transformers transformers-compat + unordered-containers uri-encode vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random lens-family-core megaparsec + mockery prettyprinter QuickCheck quickcheck-instances scientific + semigroups serialise special-values spoon tasty + tasty-expected-failure tasty-hunit tasty-quickcheck + template-haskell text transformers turtle unordered-containers + vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge serialise text + ]; + description = "A configuration language guaranteed to terminate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-bash" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text @@ -69956,6 +70107,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-bash_1_0_29" = callPackage + ({ mkDerivation, base, bytestring, containers, dhall + , neat-interpolation, optparse-generic, shell-escape, text + }: + mkDerivation { + pname = "dhall-bash"; + version = "1.0.29"; + sha256 = "0hmhk2lmqr1szrjx1kqa3zlylcblwigi6lqmkqnh0z1dh3kc1a1w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dhall neat-interpolation shell-escape + text + ]; + executableHaskellDepends = [ + base bytestring dhall optparse-generic text + ]; + description = "Compile Dhall to Bash"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-check" = callPackage ({ mkDerivation, base, containers, dhall, directory, filepath , fsnotify, text, trifecta @@ -70040,6 +70213,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-json_1_6_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal + , base, bytestring, containers, dhall, exceptions, filepath + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , scientific, tasty, tasty-hunit, text, unordered-containers + , vector + }: + mkDerivation { + pname = "dhall-json"; + version = "1.6.3"; + sha256 = "1dm6lrn8nd29c8d1sp1l3jnxfxkhhqpvinrgn1hm0lcp3jgzchbb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty aeson-yaml base bytestring containers dhall + exceptions filepath optparse-applicative prettyprinter scientific + text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bytestring dhall exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + aeson base bytestring dhall tasty tasty-hunit text + ]; + description = "Convert between Dhall and JSON or YAML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-lex" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq , hspec, hspec-dirstream, scientific @@ -70069,8 +70272,8 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.5"; - sha256 = "1lrx0grpgzi8iv9pskn3dk0ill3x542afmz9v1h96fvb20nmknp8"; + version = "1.0.6"; + sha256 = "1pbxzs9axnbwqfgdz44cbaabq9v10jsk752ix8i0cz1vmwyrcnlv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70096,8 +70299,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.12"; - sha256 = "1hpy3nwn1as92v6r1qh4dp6gn9x404a8ynz1gkldcp6izyiri82h"; + version = "1.1.13"; + sha256 = "0sdnrhr9f29ds4zdj2qs123k44vg15r8kn8w2zwkmdabilzlgg9k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70191,6 +70394,36 @@ self: { broken = true; }) {}; + "dhall-yaml_1_0_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall + , dhall-json, exceptions, HsYAML, HsYAML-aeson + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , tasty, tasty-expected-failure, tasty-hunit, text, vector + }: + mkDerivation { + pname = "dhall-yaml"; + version = "1.0.3"; + sha256 = "1lnxp2wqbgzg5f2kadhnbd8i5zgwy3g1nz17mmbdqwlx30p4scdn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson + optparse-applicative text vector + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring dhall dhall-json exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + base bytestring dhall dhall-json tasty tasty-expected-failure + tasty-hunit text + ]; + description = "Convert between Dhall and YAML"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -70970,8 +71203,6 @@ self: { libraryHaskellDepends = [ base parsec random-fu transformers ]; description = "Simplistic D&D style dice-rolling system"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dice-entropy-conduit" = callPackage @@ -71587,6 +71818,8 @@ self: { pname = "digraph"; version = "0.1.0.2"; sha256 = "1kkvihqg3rhhsqz25yq7np211813kf3xqqi27lpdf1kdmq8vvf80"; + revision = "1"; + editedCabalFile = "0q9q9xr765ym535mwh3ji94y23mr9fxmrcwij439n6rgr4spwqi5"; libraryHaskellDepends = [ base containers deepseq hashable massiv mwc-random streaming transformers unordered-containers @@ -71975,12 +72208,12 @@ self: { broken = true; }) {}; - "directory_1_3_6_0" = callPackage + "directory_1_3_6_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.6.0"; - sha256 = "1fxgha63sw3zc3hv4qswk595alxkhl4nikip9ab46ni4m83hyvmf"; + version = "1.3.6.1"; + sha256 = "00cr2sshzjmn57rpvjj8wvgr60x2mk8c7w1nd40wxqs8s9xaa1bi"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -72185,8 +72418,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.4.0"; - sha256 = "1011zrn5axjm44zmnj21q3w33pwwkciici2zf2sqz2plvkxn4c1w"; + version = "1.5.0"; + sha256 = "1449ap68c917z1318wg67cv7yk7cmfr61m0ikbf132gzsfyx69kv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72198,8 +72431,6 @@ self: { executableHaskellDepends = [ base text ]; description = "Write bots for Discord in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "discord-hs" = callPackage @@ -73396,28 +73627,6 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "0.7.3"; - sha256 = "095wmsflwm4wqlvk2h7s64nqacha8did10av9n52pj3kcwczqx2i"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring directory filepath http-directory http-types - optparse-applicative regex-posix simple-cmd simple-cmd-args text - time unix xdg-userdirs - ]; - description = "Fedora image download tool"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "dl-fedora_0_7_4" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , http-directory, http-types, optparse-applicative, regex-posix - , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs - }: - mkDerivation { - pname = "dl-fedora"; version = "0.7.4"; sha256 = "092fmla7a0xbnfac6izcj08wsyxbd04n23cjy33c132lqhs5k6w5"; isLibrary = false; @@ -73445,6 +73654,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8_0_8" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: + mkDerivation { + pname = "dlist"; + version = "0.8.0.8"; + sha256 = "0va9xk8g2iag24x042q3w6z77xdqd91112kh0piq8cwd0qccyabi"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { @@ -73465,8 +73687,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "7"; - editedCabalFile = "0cp5v4zfkx7mz8cc8hgjx0v0a37y4fnld3r59i6mb00ilzrh1nhk"; + revision = "8"; + editedCabalFile = "134fcrv7lmbhzmgp07vp3fdjbbjrkkracvjf6ma5k2fwcw0wfkff"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -73735,8 +73957,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.15.1.0"; - sha256 = "1r2zwwcbkm07g1lrypdg3aj4qhyy3g7fds042i4l5abs045aqa2l"; + version = "0.22.1.0"; + sha256 = "1mx1q8z5a950ji8nnmw2jcarqadlkm58qszzyz0hh31rni26p1k5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74069,13 +74291,14 @@ self: { "doctest" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process - , QuickCheck, setenv, silently, stringbuilder, syb, transformers + , filepath, ghc, ghc-paths, hspec, hspec-core, HUnit, mockery + , process, QuickCheck, setenv, silently, stringbuilder, syb + , transformers }: mkDerivation { pname = "doctest"; - version = "0.16.2"; - sha256 = "0lk4cjfzi5bx2snfzw1zi06li0gvgz3ckfh2kwa98l7nxfdl39ag"; + version = "0.16.3"; + sha256 = "1y1l7aa80qkib1z8lsizgg7fpfdmdwhxvi5m255a42jdkjgn5sfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74088,7 +74311,7 @@ self: { ]; testHaskellDepends = [ base base-compat code-page deepseq directory filepath ghc ghc-paths - hspec HUnit mockery process QuickCheck setenv silently + hspec hspec-core HUnit mockery process QuickCheck setenv silently stringbuilder syb transformers ]; description = "Test interactive Haskell examples"; @@ -75198,8 +75421,8 @@ self: { }: mkDerivation { pname = "drone"; - version = "1.0.1"; - sha256 = "1qhgikixnzsqyywxnrgl2099klcxk17djbbz23hxvxmibay1pm8w"; + version = "1.1.0"; + sha256 = "0c0xinvr36mmwk9kl970ya53w4z4v6scpxxa9i3lwjjnkcadp9kp"; libraryHaskellDepends = [ base bytestring containers extensible formatting microlens req text ]; @@ -76742,11 +76965,11 @@ self: { }: mkDerivation { pname = "eccrypto"; - version = "0.2.1"; - sha256 = "181c8avf0k8377n0z8qm3v7dnqg01z1gp5zwhcrk8khb3h4d4rp7"; + version = "0.2.2"; + sha256 = "1avzxzzlhldpjp6k14jirx3ws5818bpsip9p0wj6kl1g3ii7ydjz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring cryptohash-sha512 integer-gmp random + base bytestring cryptohash-sha512 integer-gmp ]; testHaskellDepends = [ base base16-bytestring bytestring Cabal ]; benchmarkHaskellDepends = [ base bytestring criterion random ]; @@ -76758,8 +76981,8 @@ self: { ({ mkDerivation, base, bytestring, eccrypto }: mkDerivation { pname = "eccrypto-ed25519-bindings"; - version = "0.1.1.0"; - sha256 = "1yzalib6a5h7k7bhc9kzr2lqhd928yva3j2mxynx3lmw26jc5r17"; + version = "0.1.2.0"; + sha256 = "1j2h568k2j8kpclvam3hghi13ddyas5d7c8nf469gwr80wmnyqxs"; libraryHaskellDepends = [ base bytestring eccrypto ]; description = "provides \"ed25519\" API using \"eccrypto\""; license = stdenv.lib.licenses.bsd3; @@ -77442,8 +77665,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Parser and pretty printer for Egison pattern expressions to use with TH"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "egison-quote" = callPackage @@ -77583,6 +77804,8 @@ self: { pname = "either"; version = "5.0.1.1"; sha256 = "09yzki8ss56xhy9vggdw1rls86b2kf55hjl5wi0vbv02d8fxahq2"; + revision = "1"; + editedCabalFile = "03bgnq55lc6f1nx4p662gidfsyyfm3xm4fi84h77wnsppxrpa5j1"; libraryHaskellDepends = [ base bifunctors mtl profunctors semigroupoids ]; @@ -77615,8 +77838,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "either-unwrap" = callPackage @@ -77661,8 +77882,6 @@ self: { ]; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-bosun" = callPackage @@ -77717,8 +77936,6 @@ self: { ]; description = "An ekg backend for Amazon Cloudwatch"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-core" = callPackage @@ -77788,8 +78005,6 @@ self: { ]; description = "An EKG backend to send statistics to influxdb"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-json" = callPackage @@ -77806,8 +78021,6 @@ self: { ]; description = "JSON encoding of ekg metrics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-log" = callPackage @@ -77903,8 +78116,6 @@ self: { ]; description = "Push metrics to statsd"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-wai" = callPackage @@ -78050,6 +78261,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eliminators_0_7" = callPackage + ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats + , singletons, template-haskell, th-abstraction, th-desugar + }: + mkDerivation { + pname = "eliminators"; + version = "0.7"; + sha256 = "1h3h0f7s0gjbza7lij8y2pg5hl6zrf8cqslh5f0hpwnfxh3yls6v"; + libraryHaskellDepends = [ + base extra singleton-nats singletons template-haskell + th-abstraction th-desugar + ]; + testHaskellDepends = [ base hspec singleton-nats singletons ]; + testToolDepends = [ hspec-discover ]; + description = "Dependently typed elimination functions using singletons"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elision" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -78579,8 +78809,6 @@ self: { testHaskellDepends = [ base directory filepath tasty tasty-hunit ]; description = "A tiny language for understanding the lambda-calculus"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "elynx-seq" = callPackage @@ -79348,8 +79576,8 @@ self: { }: mkDerivation { pname = "enum-text"; - version = "0.5.1.0"; - sha256 = "0v48hmxbpzjpclg1q0avrc1dp4giglbxy2rkqnbj4f0sprp03kff"; + version = "0.5.2.1"; + sha256 = "16wvizrbf6n2i0s4318065i39qhp94p6jy4vappd05mlmmwiccam"; libraryHaskellDepends = [ array base bytestring fmt hashable possibly text time unordered-containers @@ -79931,8 +80159,8 @@ self: { }: mkDerivation { pname = "equational-reasoning"; - version = "0.6.0.1"; - sha256 = "0al3ms7gxd1ws8bs694h7ka2rg9kn3v36qgwrxm2hq4ys80y7r65"; + version = "0.6.0.2"; + sha256 = "0zahv50jnbaaiwa7gy7w901fyqjk816gcd3fx9km0nacsjrgal4v"; libraryHaskellDepends = [ base containers template-haskell th-desugar th-extras void ]; @@ -80562,8 +80790,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.3.1.1"; - sha256 = "1qi28ma8j5kfygjxnixlazxsyrkdqv8ljz3icwqi5dlscsnj6v3v"; + version = "3.3.3.0"; + sha256 = "19zzqmaciski4ara41djkh1df17nzqw2nfwzc81zv6d3pylaznq1"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -81449,8 +81677,8 @@ self: { }: mkDerivation { pname = "eventlog2html"; - version = "0.6.0"; - sha256 = "06v2g84hxcc7w4idhkfdix3c2yk9qdx91ys83abn7z7jjc24x2hs"; + version = "0.7.0"; + sha256 = "045ihz620xv6qhic3vy257g59l1ly2sld6dcnq28xblsf461krv1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81598,8 +81826,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.4.0"; - sha256 = "0p7xfvdm4bjdp23f1ikfyq1gbylxav6b3wmbxhmscmzai396al12"; + version = "1.4.1"; + sha256 = "1d8lai7ra0r8mlfwnyvf9bhx7n4y9qzvj1sc96x3fh8xf79qd8mj"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan exceptions fast-logger hashable @@ -81902,6 +82130,8 @@ self: { pname = "exceptions"; version = "0.10.4"; sha256 = "1kw4pmx7j7zwbdwm0dyn9rcs6kp4byfxy48861yxdz6gam1zn2sd"; + revision = "1"; + editedCabalFile = "0b5m01nmaqzvvm1d07b3dnmcn47pmy943lydb2m7ibhilqkfya8p"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -82631,8 +82861,8 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.2"; - sha256 = "0i6dh1kpadhh4faanmkszdq1bbsdyl2ngbyrwv7pb8kb3wqc4y6y"; + version = "0.1.3"; + sha256 = "09g7i6x553gv5jkhbn5ffsrxznx8g4b3fcn1gibwyh380pbss8x1"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -82699,8 +82929,8 @@ self: { }: mkDerivation { pname = "expresso"; - version = "0.1.2.2"; - sha256 = "1fa37bqyw8zlva3z6sj10sp4r7sslh4xakrmr7d5diqynyrgdjax"; + version = "0.1.2.3"; + sha256 = "1kbvwd51whmqgis8c4adl5mdbjpcvzm9ya6jb3ka9w8ciiyh80v8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -82796,10 +83026,8 @@ self: { }: mkDerivation { pname = "extended-reals"; - version = "0.2.3.0"; - sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw"; - revision = "4"; - editedCabalFile = "1gzi55w9kpfg51njyi3a28n7nc64chzgnv76m3xyrz7z0gbri93q"; + version = "0.2.4.0"; + sha256 = "19df7zlm8kisihmnpg3ni5qg4p0vkilsny0ngch0b8b0pr56cb0c"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -84040,8 +84268,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.24.0.5"; - sha256 = "05wm3zp41xgx0s9p0wmy9rqk9ii6wcxsr3jrcqqrnlpbp90dwfxx"; + version = "0.24.1.0"; + sha256 = "0cihrggbxmjfz34kbf7nbzn20v2sapfjql6hc5m68rbiiysb8jk3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -84381,8 +84609,8 @@ self: { ({ mkDerivation, base, doctest, first-class-families, Glob }: mkDerivation { pname = "fcf-containers"; - version = "0.4.0"; - sha256 = "1qdcp2mympq8w49j9dfrl5sdkyhiyg3p8nr8568x12ham0jpar9l"; + version = "0.5.0"; + sha256 = "0j4ij4iw5axjp56zhxb3kn6ls1l8m2ckqx6620y1yjhz3ja608f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base first-class-families ]; @@ -84692,8 +84920,8 @@ self: { }: mkDerivation { pname = "feed"; - version = "1.3.0.0"; - sha256 = "19xqkx8ars0sjana18m34d7qg9l0qbg1i3v14a5rqabdppzcfrp2"; + version = "1.3.0.1"; + sha256 = "0fdylvbrjlshgx398xpxx3y7mnrmpi1l2534mcv299afpm91yqcj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -85335,8 +85563,8 @@ self: { pname = "ffunctor"; version = "1.2.0"; sha256 = "0rq60a7ximvqdxqvijw1isd1d5gwqbjagmws91y0jvxlwmsgzf6w"; - revision = "1"; - editedCabalFile = "0biwzy37ig69s7l4x2cp0p71w3fn1azfd81vsj39fzn4kpcrpgld"; + revision = "2"; + editedCabalFile = "1mwddp63jdgfzhdcyqs77nv5lsbaw4gj63gcihimfmj5qxlx7zpk"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ aeson base exceptions generic-lens http-client mtl servant @@ -85503,8 +85731,6 @@ self: { ]; description = "Abusing monadic syntax JSON objects generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fieldwise" = callPackage @@ -85590,8 +85816,8 @@ self: { pname = "file-embed-lzma"; version = "0"; sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; - revision = "4"; - editedCabalFile = "19z355zylpsqsfihldbda6lwrdj5divfhhnc24ryzvi384dw74lx"; + revision = "5"; + editedCabalFile = "1rkya7m491b3asfhpygwz97gzfh46f9h1bi6b4isbslpj50k2h6l"; libraryHaskellDepends = [ base base-compat bytestring directory filepath lzma template-haskell text th-lift-instances transformers @@ -85658,8 +85884,23 @@ self: { ]; description = "Takes a Haskell source-code file and outputs its modules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + }) {}; + + "file-path-th" = callPackage + ({ mkDerivation, base, directory, file-embed, filepath + , template-haskell + }: + mkDerivation { + pname = "file-path-th"; + version = "0.1.0.0"; + sha256 = "15v2jlif4qrzl3xqkicqd71rx7n9916zip44yk0j7gsnyrwrr7p5"; + revision = "1"; + editedCabalFile = "0v1hfgw2sqscbxlzidqzdljz92mihydk765370sq6hmjiw98a5fk"; + libraryHaskellDepends = [ + base directory file-embed filepath template-haskell + ]; + description = "Template Haskell utilities for filepaths"; + license = stdenv.lib.licenses.mit; }) {}; "file-templates" = callPackage @@ -85898,8 +86139,8 @@ self: { pname = "filesystem-abstractions"; version = "0"; sha256 = "1qrxc8q10fqd7b0ss84nykz8vmyjwwxw5ywxp11xabad966shl18"; - revision = "1"; - editedCabalFile = "0qfkiify5jgclzdz2gyml5d7rn0vinilwxgfvk0h7743lj2vj167"; + revision = "2"; + editedCabalFile = "1mj9ipsycs70jdgi722z04cvw7va09cr7fv78w9995pdf2n33gl0"; libraryHaskellDepends = [ base bytestring list-tries posix-paths semigroups ]; @@ -86025,6 +86266,8 @@ self: { pname = "fin"; version = "0.1.1"; sha256 = "0zwc8x2ilbk1bhsk85brf6g300cx4w2j3602gjh6rv900961gqri"; + revision = "2"; + editedCabalFile = "1x446k44pci81dakzd98vrj6amj10xkb05k7g2qwk0ir1hdj5sfz"; libraryHaskellDepends = [ base dec deepseq hashable QuickCheck ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; @@ -86535,8 +86778,8 @@ self: { }: mkDerivation { pname = "fitspec"; - version = "0.4.7"; - sha256 = "0ski62ndgl5ay9kbgx2v590pvfsn0wn0cx9h70fhvcrlsam01p5q"; + version = "0.4.8"; + sha256 = "01xfchs98xy5436kchzysnvwgm00s2srsn5xyxx3r04pzzb5cbd9"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; @@ -86613,8 +86856,8 @@ self: { }: mkDerivation { pname = "fixed-length"; - version = "0.2.1"; - sha256 = "0jabfv9ga94maw35a7xdw5lwi55d7z92nn2zs2c8z3jk0a4bcld1"; + version = "0.2.2"; + sha256 = "1bx46n11k9dpr5hhfhxiwdd5npaqf9xwvqvjd0nlbylfmsmgd14y"; libraryHaskellDepends = [ base non-empty storable-record tfp utility-ht ]; @@ -90192,6 +90435,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "freetype2_0_2_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "freetype2"; + version = "0.2.0"; + sha256 = "1fdzhm6lcb6bxgza5z41925a75xdi19lwqw6vas1s2y130x3zfam"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base template-haskell ]; + description = "Haskell bindings for FreeType 2 library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "french-cards" = callPackage ({ mkDerivation, base, hspec, HUnit }: mkDerivation { @@ -90362,8 +90620,8 @@ self: { ({ mkDerivation, array, base, containers, fail, mtl, semigroups }: mkDerivation { pname = "frisby"; - version = "0.2.3"; - sha256 = "1bcdrjvd6cpq1361m8ipf1z6yp3gqiaixkl8gxgmg6ky1lsiljhn"; + version = "0.2.4"; + sha256 = "02dywihwkyk80viny3lq213qia2ksaylk7gphjiq0jzx9smswgyb"; libraryHaskellDepends = [ array base containers fail mtl semigroups ]; @@ -90404,8 +90662,8 @@ self: { }: mkDerivation { pname = "front"; - version = "0.0.0.5"; - sha256 = "0gn5lrh817r9ky8j4kzrqdlisiy85gr6v7nyd2sj1psa8syrjfzk"; + version = "0.0.0.6"; + sha256 = "0380d9c9mv8jp04igjm4h9njijgc18x34xg13d5pgm7f5yz8aipk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91623,6 +91881,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fused-effects-readline" = callPackage + ({ mkDerivation, base, directory, filepath, fused-effects + , haskeline, prettyprinter, prettyprinter-ansi-terminal + , terminal-size, transformers + }: + mkDerivation { + pname = "fused-effects-readline"; + version = "0.0.0.0"; + sha256 = "089f6b3y48ymhd45x1rxmimrwjygkjk3ykhz6nx7cf235d3cg83l"; + libraryHaskellDepends = [ + base directory filepath fused-effects haskeline prettyprinter + prettyprinter-ansi-terminal terminal-size transformers + ]; + testHaskellDepends = [ base ]; + description = "A readline-like effect and carrier for fused-effects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fused-effects-resumable" = callPackage ({ mkDerivation, base, deepseq, fused-effects, transformers }: mkDerivation { @@ -91709,8 +91985,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.15.1"; - sha256 = "181kgqbdqxcim16ld68wx09lr4gh0j9440lnn2lyzrzmn8a9567w"; + version = "0.15.3"; + sha256 = "067hzxvvkkz0d9sg67pswi6k061ri314vw4j979skhjibfb7g0hx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92581,6 +92857,20 @@ self: { broken = true; }) {}; + "gdelt" = callPackage + ({ mkDerivation, base, bytestring, hspec, megaparsec, QuickCheck + , text, time + }: + mkDerivation { + pname = "gdelt"; + version = "0.1.0.0"; + sha256 = "0p19363bqqyqw2lmxym1jwr6l6gr1q4ck1xp776b4xmx6drm5h09"; + libraryHaskellDepends = [ base bytestring megaparsec text time ]; + testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; + description = "GDELT V2 (Global Database of Events, Language, and Tone)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gdiff" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -93162,21 +93452,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generic-data_0_8_1_0" = callPackage + "generic-data_0_8_2_0" = callPackage ({ mkDerivation, base, base-orphans, contravariant, criterion - , deepseq, doctest, generic-lens, Glob, one-liner, QuickCheck - , show-combinators, tasty, tasty-hunit + , deepseq, doctest, generic-lens, ghc-boot-th, Glob, one-liner + , QuickCheck, show-combinators, tasty, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "0.8.1.0"; - sha256 = "0hrrqxvax365yg3y7pv6k6v9x86a7hj3b85kmzky2q6f7vvqfkfb"; + version = "0.8.2.0"; + sha256 = "03ix1zc47baqjvwi3xqsbhbb9wrfiamlbjmahcakp2jbzmx2vy6l"; libraryHaskellDepends = [ - base base-orphans contravariant show-combinators + base base-orphans contravariant ghc-boot-th show-combinators ]; testHaskellDepends = [ - base doctest generic-lens Glob one-liner QuickCheck tasty - tasty-hunit + base doctest generic-lens Glob one-liner QuickCheck + show-combinators tasty tasty-hunit ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; @@ -93335,6 +93625,8 @@ self: { pname = "generic-lens-lite"; version = "0.1"; sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6"; + revision = "1"; + editedCabalFile = "1gbl0kmc77yjvn63cgdsifhzyd54g1v1qq1pjsrhhn0hb4c8jszz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; @@ -93420,6 +93712,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-override" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-override"; + version = "0.0.0.0"; + sha256 = "13v5zrhhzjzm4fib5zjsp4sf1hhgx9450mmy4v12h7bgljz8xfd5"; + libraryHaskellDepends = [ base ]; + description = "Provides functionality for overriding instances for generic derivation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "generic-override-aeson" = callPackage + ({ mkDerivation, aeson, base, generic-override, hspec, text }: + mkDerivation { + pname = "generic-override-aeson"; + version = "0.0.0.0"; + sha256 = "02xwssk7158k7hhh170knxn7f2s7slcp4sy7a4b3w4cn1r016bhz"; + libraryHaskellDepends = [ aeson base generic-override ]; + testHaskellDepends = [ aeson base generic-override hspec text ]; + description = "Provides orphan instances necessary for integrating generic-override and aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generic-pretty" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , tasty, tasty-hunit, text, vector @@ -93441,14 +93756,16 @@ self: { }) {}; "generic-random" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck }: + ({ mkDerivation, base, deepseq, inspection-testing, QuickCheck }: mkDerivation { pname = "generic-random"; - version = "1.3.0.0"; - sha256 = "1z62lvb0zjdy5ass2cvj442w0cbk0zi4cx6n4qm2ai4sbmgh5hzk"; + version = "1.3.0.1"; + sha256 = "0d9w7xcmsb31b95fr9d5jwbsajcl1yi4347dlbw4bybil2vjwd7k"; libraryHaskellDepends = [ base QuickCheck ]; - testHaskellDepends = [ base deepseq QuickCheck ]; - description = "Generic random generators"; + testHaskellDepends = [ + base deepseq inspection-testing QuickCheck + ]; + description = "Generic random generators for QuickCheck"; license = stdenv.lib.licenses.mit; }) {}; @@ -93597,16 +93914,14 @@ self: { "generics-sop" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core - , template-haskell + , template-haskell, th-abstraction }: mkDerivation { pname = "generics-sop"; - version = "0.5.0.0"; - sha256 = "18dkdain2g46b1637f3pbv0fkzg4b1a8frm16hfqvhpfk46i7rzc"; - revision = "1"; - editedCabalFile = "10zfjhcipm77zfx32ls7bc8vk3affa5v7cyphwpw93d6sfqc9wym"; + version = "0.5.1.0"; + sha256 = "0g0z0k5bnw3whfj3qswzhadrhg85jfn491s30cgai0ijfjm5gipa"; libraryHaskellDepends = [ - base ghc-prim sop-core template-haskell + base ghc-prim sop-core template-haskell th-abstraction ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ @@ -93620,10 +93935,8 @@ self: { ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; - version = "0.2"; - sha256 = "0cm3xnz5h1pxhvbgl8mm16fg8y339m6wvm6nlqmsm0jh37gvqc2a"; - revision = "1"; - editedCabalFile = "1ghgh91wd764firxc2s083jzr38w51fg0ry2b7s1wn71mnvzb893"; + version = "0.2.0.1"; + sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -93812,10 +94125,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.6"; - sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb"; - revision = "2"; - editedCabalFile = "03fg4vfm1wgq4mylggawdx0bfvbbjmdn700sqx7v3hk1bx0kjfzh"; + version = "0.7.7"; + sha256 = "08w4rslxzv6z85qzam1yazjb6vrzcr55vsjjyjgsi86pb1a8hr3b"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; @@ -93877,27 +94188,12 @@ self: { }: mkDerivation { pname = "genvalidity"; - version = "0.10.0.1"; - sha256 = "0zyg3a0gqcdhdqy8w8ydqpcq7k6vbsb77v2dw31j2yfss1av4q2x"; - libraryHaskellDepends = [ base QuickCheck random validity ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck ]; - description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity_0_10_0_2" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random - , validity - }: - mkDerivation { - pname = "genvalidity"; version = "0.10.0.2"; sha256 = "1k6pba9zal7385838b9w9ybhk5742jwfy8bqa921zi08mv7vgqlp"; libraryHaskellDepends = [ base QuickCheck random validity ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage @@ -94512,6 +94808,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "geojson_4_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , hlint, lens, scientific, semigroups, tasty, tasty-hspec + , tasty-quickcheck, text, transformers, validation, vector + }: + mkDerivation { + pname = "geojson"; + version = "4.0.2"; + sha256 = "0csbg4pdh686bxk689968bi94njx78iv1sm5g6lp915pg6cfnd66"; + libraryHaskellDepends = [ + aeson base containers deepseq lens scientific semigroups text + transformers validation vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hlint tasty tasty-hspec + tasty-quickcheck text validation + ]; + description = "A thin GeoJSON Layer above the aeson library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "geojson-types" = callPackage ({ mkDerivation, aeson, base, bson, bytestring, lens, text }: mkDerivation { @@ -94810,12 +95128,12 @@ self: { }: mkDerivation { pname = "ghc-check"; - version = "0.1.0.2"; - sha256 = "0xxx1n3xwzfkpbhn2k6s63h8idqy8s15fvy4hbnfkk5fz6mwgvdz"; + version = "0.1.0.3"; + sha256 = "1zrlnk3gzdb96592is2krk8qpk386bib0bpgw47yqj8qfcxqf76v"; libraryHaskellDepends = [ base ghc ghc-paths template-haskell transformers ]; - description = "detect mismatches between compile-time and run-time versions of the ghc api"; + description = "Detect mismatches between compile-time and run-time versions of the ghc api"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95066,6 +95384,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-exactprint_0_6_3" = callPackage + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "0.6.3"; + sha256 = "0da4gkirill2rpxr9gl4cbcwpp4a16z9bdgyv5nkdps3msh93214"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath free ghc ghc-boot + ghc-paths mtl syb + ]; + testHaskellDepends = [ + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb + ]; + description = "ExactPrint for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -95215,6 +95557,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib_8_10_1_20200324" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy + , hpc, pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "8.10.1.20200324"; + sha256 = "09d0254ic650n9h6j863xl3cvd506ww84369qdszxwkizlzk7gr3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-lib-parser ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-lib-parser" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty @@ -95234,6 +95596,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib-parser_8_10_1_20200324" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty + , process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "8.10.1.20200324"; + sha256 = "0i3ab7a2xq8pjd94kfyrlnp9wnjfkl0qi74zb1m23l6k5zm4g9y8"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-lib-parser-ex" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit @@ -95241,8 +95623,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.8.5.6"; - sha256 = "0jwndkf7idpf09zrj4i4x1vsyfpm0vf85vlh00qp0z3avqcxsf2m"; + version = "8.8.5.8"; + sha256 = "1mw1ym5bn39z7lqmxnhhkfqb0kbxddabkafw025wgs54knsghvmk"; libraryHaskellDepends = [ base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate ]; @@ -95253,20 +95635,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_8_8_5_8" = callPackage + "ghc-lib-parser-ex_8_10_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra - , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit - , uniplate + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.8.5.8"; - sha256 = "1mw1ym5bn39z7lqmxnhhkfqb0kbxddabkafw025wgs54knsghvmk"; + version = "8.10.0.2"; + sha256 = "17khl1ma4q1k16wya96nq8i805b8jkg8spjlrac5273icc550qn2"; libraryHaskellDepends = [ - base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate + base bytestring containers ghc-lib-parser uniplate ]; testHaskellDepends = [ - base directory extra filepath ghc ghc-boot-th tasty tasty-hunit + base directory extra filepath ghc-lib-parser tasty tasty-hunit ]; description = "Algorithms on GHC parse trees"; license = stdenv.lib.licenses.bsd3; @@ -95691,29 +96072,69 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-tags-plugin" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, directory, filelock - , filepath, ghc, lattices, QuickCheck, quickcheck-instances, tasty - , tasty-golden, tasty-quickcheck, text + "ghc-tags-core" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq + , directory, filepath, ghc, lattices, mtl, pipes, pipes-attoparsec + , pipes-bytestring, pipes-text, QuickCheck, quickcheck-instances + , tasty, tasty-golden, tasty-quickcheck, text, transformers }: mkDerivation { - pname = "ghc-tags-plugin"; - version = "0.1.5.0"; - sha256 = "065i5xdf5i0xxj8q2aah2p9n30n65w0r60rfd49bih1iisfk0ljn"; + pname = "ghc-tags-core"; + version = "0.1.0.0"; + sha256 = "0agn5601fwq4nr2k6xya0lmwm4hw63rvmpi4rk0jr362vn7d219n"; libraryHaskellDepends = [ - attoparsec base bytestring directory filelock filepath ghc text + attoparsec base bytestring directory filepath ghc mtl pipes + pipes-attoparsec pipes-bytestring pipes-text text transformers ]; testHaskellDepends = [ - attoparsec base bytestring lattices QuickCheck quickcheck-instances - tasty tasty-golden tasty-quickcheck text + attoparsec base bytestring directory filepath lattices mtl pipes + QuickCheck quickcheck-instances tasty tasty-golden tasty-quickcheck + text ]; - doHaddock = false; - description = "A compiler plugin which generates tags file from GHC syntax tree"; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq mtl pipes pipes-attoparsec + pipes-bytestring pipes-text text + ]; + description = "a library to work with tags created from Haskell parsed tree"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "ghc-tags-plugin" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, ghc + , ghc-tags-core, mtl, optparse-applicative, pipes, pipes-attoparsec + , pipes-bytestring, pipes-safe, pipes-text, text + }: + mkDerivation { + pname = "ghc-tags-plugin"; + version = "0.1.6.0"; + sha256 = "148whav3lpkglgfk51az3f3cfnp50psnznrw0a7mdbqxmkhfb41i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory filepath ghc ghc-tags-core mtl + optparse-applicative pipes pipes-attoparsec pipes-bytestring + pipes-safe pipes-text text + ]; + description = "A compiler plugin which generates tags file from GHC parsed syntax tree"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "ghc-tcplugins-extra_0_3_2" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-tcplugins-extra"; + version = "0.3.2"; + sha256 = "13qhwjbhyi3nrjdvc0fdgxf4kz55my541mz2j3sndpxsmbymqs3m"; + libraryHaskellDepends = [ base ghc ]; + description = "Utilities for writing GHC type-checker plugins"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-tcplugins-extra" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -95914,8 +96335,8 @@ self: { ({ mkDerivation, base, directory, ghc, time }: mkDerivation { pname = "ghcflags"; - version = "1.0.2"; - sha256 = "17j7bkx7ki5vqr0a3vl0f0v4l9cz2q7lm9xpkj3144y9sqmiqzy3"; + version = "1.0.3"; + sha256 = "1xsfznfypgmv67qdxm8zvl8n84hj47akjn9fsdi66b8flbx8c0gm"; libraryHaskellDepends = [ base directory ghc time ]; description = "Dump the ghc flags during compilation"; license = stdenv.lib.licenses.bsd2; @@ -96095,32 +96516,6 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.8.3"; - sha256 = "1b8a8mx6z2ridw79gijjv90b2jgk0qrncvg0sjbmvyyyajx1h5f7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs directory extra filepath process time - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_8_5" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; version = "0.8.5"; sha256 = "15zj78wasix4yz8mxx5hl6x1gj364vsbwn5arp7sbq13rywhs2qy"; isLibrary = true; @@ -96138,7 +96533,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcide" = callPackage @@ -97837,8 +98231,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20200309"; - sha256 = "1yjb01jh5rccqg44nqh4iyxmbpkcpm6m82lnw7s0s2vizj8891p5"; + version = "8.20200330"; + sha256 = "0xy0ld7kr4cfdl4g4yzvrzl5r60dcj33cxm28a4qz6nqm2yhd4sv"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -98337,6 +98731,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "githash_0_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary, unliftio + }: + mkDerivation { + pname = "githash"; + version = "0.1.4.0"; + sha256 = "0rsz230srhszwybg5a40vhzzp9z0r4yvdz4xg2hwwwphmbi8pfy3"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary unliftio + ]; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 @@ -98994,8 +99408,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "gjk"; - version = "0.0.0.1"; - sha256 = "0kqhvich6slcihxg64nwrg1zk9nnpymi7nqrnlmn71flzw6w27ca"; + version = "0.0.0.2"; + sha256 = "11ncqhq0q5bl38a0j813y3hjhijz14r0h6npzy441frk8wg1s8lh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm"; @@ -99383,8 +99797,7 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "gll" = callPackage @@ -99816,8 +100229,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-core" = callPackage @@ -99842,8 +100253,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-ekg" = callPackage @@ -99868,8 +100277,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-example" = callPackage @@ -99890,8 +100297,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gluturtle" = callPackage @@ -102936,6 +103341,31 @@ self: { broken = true; }) {}; + "gopro-plus" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , filepath, generic-deriving, HUnit, lens, lens-aeson, mtl, random + , retry, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unix, unliftio, unordered-containers, vector, wreq + }: + mkDerivation { + pname = "gopro-plus"; + version = "0.3.0.0"; + sha256 = "16fk23q5qz6c4bjhbm8xcnkdckyk5ziz4gky9x1vndk5wxm2srr1"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions filepath + generic-deriving lens lens-aeson mtl random retry text time + transformers unix unliftio unordered-containers vector wreq + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions filepath + generic-deriving HUnit lens lens-aeson mtl random retry tasty + tasty-hunit tasty-quickcheck text time transformers unix unliftio + unordered-containers vector wreq + ]; + description = "GoPro Plus Client API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gore-and-ash" = callPackage ({ mkDerivation, base, containers, deepseq, exceptions, hashable , linear, mtl, parallel, profunctors, random, semigroups, time @@ -103326,8 +103756,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Applicative non-linear consumption"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "grab-form" = callPackage @@ -103340,8 +103768,6 @@ self: { testHaskellDepends = [ base containers hedgehog text ]; description = "Applicative parsers for form parameter lists"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "graceful" = callPackage @@ -104464,8 +104890,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.3.1"; - sha256 = "0jp6xzr601y6ngngbra0z2v99jxgp6y88dq4kb8fh25phyajzlmw"; + version = "0.1.3.2"; + sha256 = "149xqjhjjbwmsikdacpbhcd188c1rg0vj1szwwwrsadcagc793ky"; libraryHaskellDepends = [ aeson base containers hashable scientific semigroups text unordered-containers uuid vector @@ -105308,8 +105734,6 @@ self: { ]; description = "Console and GUI interface for Google Translate service"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gtfs" = callPackage @@ -105387,8 +105811,6 @@ self: { libraryHaskellDepends = [ base gtk json transformers ]; description = "A simple custom form widget for gtk which allows inputing of JSON values"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gtk-largeTreeStore" = callPackage @@ -106441,8 +106863,6 @@ self: { ]; description = "Interface to Amazon's Simple Storage Service (S3)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hScraper" = callPackage @@ -107227,33 +107647,6 @@ self: { }) {}; "hackage-security" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec - , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, time, transformers, zlib - }: - mkDerivation { - pname = "hackage-security"; - version = "0.5.3.0"; - sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "6"; - editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring Cabal - containers cryptohash-sha256 directory ed25519 filepath ghc-prim - mtl network network-uri parsec pretty tar template-haskell time - transformers zlib - ]; - testHaskellDepends = [ - base bytestring Cabal containers network-uri QuickCheck tar tasty - tasty-hunit tasty-quickcheck temporary time zlib - ]; - description = "Hackage security library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hackage-security_0_6_0_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, Cabal, containers, cryptohash-sha256, directory , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri @@ -107280,7 +107673,6 @@ self: { ]; description = "Hackage security library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-security-HTTP" = callPackage @@ -107579,8 +107971,8 @@ self: { ({ mkDerivation, base, filepath, haddock-api }: mkDerivation { pname = "haddock"; - version = "2.23.0"; - sha256 = "1f7n4l1kkq1msl8csnvzg2xh3i5a056dzmcf40gib0im91wcwl0x"; + version = "2.23.1"; + sha256 = "129lwai4609f910h7yhmmm1rbqzjla9rcg5dpzqihydsjyw5ii1s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -107624,8 +108016,8 @@ self: { }: mkDerivation { pname = "haddock-api"; - version = "2.23.0"; - sha256 = "0fbk458qr7iw1j8vh6455n2819c0pfdw1m3gy1y3fs6fdpj9qbjj"; + version = "2.23.1"; + sha256 = "14dl17ajlr8354rmc49w4fsqxmrn0dl7wps3r4iipms5nhj5bm3d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath ghc @@ -107830,6 +108222,20 @@ self: { broken = true; }) {}; + "hadoop-streaming" = callPackage + ({ mkDerivation, base, conduit, extra, hspec, hspec-discover, text + }: + mkDerivation { + pname = "hadoop-streaming"; + version = "0.1.0.0"; + sha256 = "0nbmq0lb2dydc47x4i3gvbwyy216dzwcvirpsra06dcz2yi3vkmm"; + libraryHaskellDepends = [ base conduit extra text ]; + testHaskellDepends = [ base conduit extra hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "A simple Hadoop streaming library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hadoop-tools" = callPackage ({ mkDerivation, attoparsec, base, boxes, bytestring, clock , configurator, exceptions, filepath, hadoop-rpc, old-locale @@ -108643,8 +109049,6 @@ self: { testHaskellDepends = [ base hspec mtl pandoc text ]; description = "Use shortcut-links in markdown file for Hakyll"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hakyll-typescript" = callPackage @@ -109097,8 +109501,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.7.1.1"; - sha256 = "1agh5sq0hj9r55w3k529jcar66p4vih54j5w3h28chm34n9k6qa2"; + version = "0.7.2.0"; + sha256 = "0w54ybsd7hkykifw0nsgr3mdss7945y76rbjmlk7zl9lqi780ia7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -109357,14 +109761,14 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.10.0"; - sha256 = "0kw98zcqp6b4j0i2nbd487i2icq12r3sqi8w9gjjqj5fhzsa7sja"; + version = "0.4.0.1"; + sha256 = "08zjj506rs9124xvc78y4jm4baxmnyh005sbk6k4gpnnc0qagxz4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base filepath formatting gitrev mtl path - process stm time transformers typed-process + process stm time transformers typed-process yaml ]; executableHaskellDepends = [ aeson async base formatting gitrev optparse-applicative path @@ -109372,7 +109776,7 @@ self: { ]; testHaskellDepends = [ base directory filepath hspec mtl path path-io process QuickCheck - silently temporary + silently temporary yaml ]; testToolDepends = [ hspec-discover ]; description = "A deployment library for Haskell applications"; @@ -110580,8 +110984,6 @@ self: { ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasbolt-extras" = callPackage @@ -110607,8 +111009,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Extras for hasbolt library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hascal" = callPackage @@ -110816,6 +111216,8 @@ self: { pname = "hashable"; version = "1.3.0.0"; sha256 = "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2"; + revision = "1"; + editedCabalFile = "1c8z7vxlh4whpm1ag4xp6wknnaal28cl4dqdan9rw1c1g10g2w2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110894,8 +111296,8 @@ self: { pname = "hashable-time"; version = "0.2.0.2"; sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs"; - revision = "2"; - editedCabalFile = "006phc5y9rrvsshdcmjmhxzxh8dpgs685mpqbkjm9c40xb1ydjbz"; + revision = "3"; + editedCabalFile = "1dr7ak803ngrhpv43dy25jm18gfzn02gzd3hm31dzcjv3mxsmbrk"; libraryHaskellDepends = [ base hashable time ]; description = "Hashable instances for Data.Time"; license = stdenv.lib.licenses.bsd3; @@ -111287,8 +111689,6 @@ self: { ]; description = "Generate tags file for Haskell project and its nearest deps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskeem" = callPackage @@ -112111,6 +112511,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp_0_21_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.21.0.0"; + sha256 = "0ic9gn5ww8vxmvidj28msark0nybj7fj1j5xsykiac5cgiy5ysnv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , haskell-lsp, lens, process, text, unix @@ -112150,6 +112580,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp-types_0_21_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, data-default + , deepseq, filepath, hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.21.0.0"; + sha256 = "0x5xhn9vy09r0r76wvmzp6nh23y4p2kgm35p8qqqgvnx6w5cvi92"; + libraryHaskellDepends = [ + aeson base binary bytestring data-default deepseq filepath hashable + lens network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-menu" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -112234,8 +112682,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.7"; - sha256 = "1ad0kdp4a9gq10g9flmmjn0ibfaipq2qnrz5a13r1mgyb6skzc5j"; + version = "0.9.8"; + sha256 = "1s4pyqrjhq9x4zxq0vh02qr86kw5fk854wfwkryqyzkylr83dv4r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath @@ -112736,8 +113184,6 @@ self: { libraryHaskellDepends = [ base haskell-src-exts ]; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-src-exts-util" = callPackage @@ -112847,8 +113293,6 @@ self: { ]; description = "Generate Elm types and JSON encoders and decoders from Haskell types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-token-utils" = callPackage @@ -115141,8 +115585,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.4.1"; - sha256 = "0qypisbyyk9xq3g0av4vphi4k9r0jm8c16crc5wbqvalxaxrj2wc"; + version = "1.4.2"; + sha256 = "0n617bh0achqwybngppz6inj7y5fv42zi0dxlyal3d9zbrgsljfw"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder contravariant contravariant-extras dlist hashable hashtables @@ -115460,8 +115904,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.5"; - sha256 = "1gc11n2g07cqipcvm779wwm36mfjjbnwg9n1ch7cldlg1wsr6m6n"; + version = "0.4.0.6"; + sha256 = "0s9c2aa0mpxiqsvpaf3l5k2gqchrjv4x9jpjmw7v3ywnv9pcxpkf"; libraryHaskellDepends = [ base bytestring case-insensitive containers contravariant fast-builder foldl hashable hasql headed-megaparsec megaparsec @@ -117235,8 +117679,8 @@ self: { }: mkDerivation { pname = "headroom"; - version = "0.1.2.0"; - sha256 = "0xf657k22bpyx45x0bxljv19adb2qwfv2a5724dsnmvndyvn9kxy"; + version = "0.1.3.0"; + sha256 = "0c680vr2kjlx9l9zh6v22jjfgxrwxh9icg1psjxrjfl9zi9kqfb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117250,8 +117694,6 @@ self: { ]; description = "License Header Manager"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "heap" = callPackage @@ -117801,18 +118243,19 @@ self: { "hedis" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri - , resource-pool, scanner, stm, test-framework, test-framework-hunit - , text, time, tls, unordered-containers, vector + , deepseq, doctest, errors, exceptions, HTTP, HUnit, mtl, network + , network-uri, resource-pool, scanner, stm, test-framework + , test-framework-hunit, text, time, tls, unordered-containers + , vector }: mkDerivation { pname = "hedis"; - version = "0.12.11"; - sha256 = "1n83zwg011n9w2v1zz4mwpms9jh3c8mk700zya4as1jg83748xww"; + version = "0.12.13"; + sha256 = "1axsv81r1q393m178x89km49pi7w7dci0l48cnjdskdz99jwvywq"; libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq errors HTTP mtl - network network-uri resource-pool scanner stm text time tls - unordered-containers vector + async base bytestring bytestring-lexing deepseq errors exceptions + HTTP mtl network network-uri resource-pool scanner stm text time + tls unordered-containers vector ]; testHaskellDepends = [ async base bytestring doctest HUnit mtl stm test-framework @@ -117943,10 +118386,8 @@ self: { }: mkDerivation { pname = "hedn"; - version = "0.3.0.0"; - sha256 = "1gx8bw2l1qpb4jgh5d1zzgfm2rnwavg5shmp4wq2mqrih11r3f3y"; - revision = "1"; - editedCabalFile = "1bpd4dd8afccj2bakqqbimmd3ja9i21q9k98vmzw37ishbd3xync"; + version = "0.3.0.1"; + sha256 = "02pwwxdgw3kkqwckap9mf015bbd27mgblfz7k4y63v0gppw6fqm7"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -117957,8 +118398,6 @@ self: { ]; description = "EDN parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hedn-functor" = callPackage @@ -122380,8 +122819,8 @@ self: { ({ mkDerivation, base, Cabal, directory, hspec, libsass }: mkDerivation { pname = "hlibsass"; - version = "0.1.8.1"; - sha256 = "050z6i29v410shjsskr26sna491ldg23if1nr0808xp94xgfif16"; + version = "0.1.9.0"; + sha256 = "14rcg48hlbpz4vjk7ydhf58wgnbgsa61q6s7h0n80ak8ih63jdcx"; configureFlags = [ "-fexternallibsass" ]; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; @@ -123370,8 +123809,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hnix-store-remote" = callPackage @@ -123775,8 +124212,8 @@ self: { }: mkDerivation { pname = "hoggl"; - version = "0.2.0.0"; - sha256 = "0kblkirivnw3ylaifdpa8acy2armxxkl9hbqymg2qfiiwnbgg2wh"; + version = "0.2.0.1"; + sha256 = "1l42s17kq78lba60l2gv1ig2sxb8mfywxm0md27jp5v6s4bqc7jy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123785,8 +124222,8 @@ self: { unordered-containers ]; executableHaskellDepends = [ - base either http-client http-client-tls optparse-applicative - servant-client text time transformers + base either formatting http-client http-client-tls + optparse-applicative servant-client text time transformers ]; description = "Bindings to the Toggl.com REST API"; license = stdenv.lib.licenses.bsd3; @@ -124491,13 +124928,13 @@ self: { pname = "hookup"; version = "0.3.1.0"; sha256 = "0dyx0zgxis4viqgdkky25q93vh3z551m7nssjfr15rqj25w8zb5y"; + revision = "1"; + editedCabalFile = "0r92s1dz7bzm2p5wpdqfkmpgzfh3xgyan82b4rkpmq8m888z74w9"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; description = "Abstraction over creating network connections with SOCKS5 and TLS"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hoopl" = callPackage @@ -124726,8 +125163,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.7.0"; - sha256 = "0v21a3nwk94ggrk8fyjmlb93rnrsh7s3xbqnk1p236h0gycsh1q3"; + version = "0.7.1"; + sha256 = "1fhqlckfznmd5dhzsxgm40lynm790j8g4srf6y3g632dv7lccjwn"; libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src mtl process temporary text @@ -124755,8 +125192,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.7.0"; - sha256 = "0yr73dalwljp23ls9za07cnabs65aypgbrjjv76zhxbsqqcc82a3"; + version = "0.7.1"; + sha256 = "1y7xi347xq60p66avxgjyzxn9q7amjg1s43b9fln4v8f9ca0pwn7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -125794,8 +126231,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.8.0.1"; - sha256 = "1zn6qzpxvpdiim12lma7viq96j3jadvlcw188iknjqyn15kri9my"; + version = "1.9.0.0"; + sha256 = "17w916p4gfzflgvd35d5nxzfch82bwyranvlv28j2qz3dvk15ymn"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base @@ -127009,8 +127446,6 @@ self: { testHaskellDepends = [ base HUnit network temporary unix ]; description = "Write a server supporting Server::Starter's protocol in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hs-snowtify" = callPackage @@ -127032,15 +127467,17 @@ self: { }) {}; "hs-speedscope" = callPackage - ({ mkDerivation, aeson, base, extra, ghc-events, text, vector }: + ({ mkDerivation, aeson, base, extra, ghc-events + , optparse-applicative, text, vector + }: mkDerivation { pname = "hs-speedscope"; - version = "0.1.1.0"; - sha256 = "0dldhndlags3ig991yvddfaw472cjwfy9dz3i12hq5ny6s9qz8qa"; + version = "0.2"; + sha256 = "119s4da40zjf42s7fyjm4b78vciiv5r2f67l8ki9gqr933ir6mpb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base extra ghc-events text vector + aeson base extra ghc-events optparse-applicative text vector ]; executableHaskellDepends = [ base ]; description = "Convert an eventlog into the speedscope json format"; @@ -127376,6 +127813,8 @@ self: { pname = "hsass"; version = "0.8.0"; sha256 = "1bnjvj6dpmcbpkbi4g5m5hvr0w5rmd7y5zkiwbqc8n9y4l2dkd5g"; + revision = "1"; + editedCabalFile = "0d085g21zvawl2jv6ap5fyk70c9igbjiwknvk1mgdydxbm1kvyq5"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers @@ -127532,8 +127971,8 @@ self: { }: mkDerivation { pname = "hsc2hs"; - version = "0.68.6"; - sha256 = "1clj6bgs9vmiv3mjzp82lvyyik5zr5411nxab7hydbrgq94pbk70"; + version = "0.68.7"; + sha256 = "0jl94cr2jhjmvz7l9idpr352vwxlsanyiq7ya1vvrlry3vj1aygx"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -128209,8 +128648,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.3.6"; - sha256 = "0j2qi1gw7rpb23bkj4557kg2d47b8kgrd8vr2qnld90h9p8jnzqm"; + version = "0.3.3.8"; + sha256 = "01dagwpg70h9af5kzr2f19qsvy4h5cx5rjdrcq0r36fbmdkbza2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128408,10 +128847,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.1.6"; - sha256 = "0pdm0v3xz308yzdhc646bbkwj156llf9g17c2y74x339xk6i8zhg"; - revision = "1"; - editedCabalFile = "1dgcgsmx0k5p3ibfv3n5k0c5p1is2m5zfsd2s6nc6d0pz34d4wl9"; + version = "0.6.1.8"; + sha256 = "1c44j9qnld5lg8zcw3pyh56fk0r62g76qmma790mcvy4sbrcz102"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -128655,8 +129092,8 @@ self: { }: mkDerivation { pname = "hsinspect"; - version = "0.0.11"; - sha256 = "03537zzxaxrcw6lv9vr5b0j1k6w97xxfavj8n3vv0rxjy3xsj54j"; + version = "0.0.12"; + sha256 = "12s6f5f26wzp5adwdpy15235v1nclw12ypp9ginxrm68a65qy4lk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128865,6 +129302,30 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, lua5_3, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "1.1.0"; + sha256 = "04xf5xp5iyf6y0das661pbzw6z2zx63phidg9mqhwbn79wk2mwwh"; + configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers exceptions mtl QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "Bindings to Lua, an embeddable scripting language"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific @@ -129581,8 +130042,6 @@ self: { testHaskellDepends = [ base hedgehog hspec ]; description = "Integrate Hedgehog and Hspec!"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hspec-jenkins" = callPackage @@ -129615,8 +130074,8 @@ self: { ({ mkDerivation, base, hspec, hspec-core, HUnit, leancheck }: mkDerivation { pname = "hspec-leancheck"; - version = "0.0.3"; - sha256 = "0lnqk4dkzqlzrq2hb72yv8xbbnps4bmjqz1qy9q47r8nrac8xpiq"; + version = "0.0.4"; + sha256 = "06amq8467wv2jkx9f4pif0z5rgvj35hdp1yffqkxyxh65148prcb"; libraryHaskellDepends = [ base hspec hspec-core HUnit leancheck ]; testHaskellDepends = [ base hspec leancheck ]; description = "LeanCheck support for the Hspec test framework"; @@ -129860,8 +130319,6 @@ self: { ]; description = "A library for testing with Hspec and the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hspec-stack-rerun" = callPackage @@ -130478,6 +130935,27 @@ self: { broken = true; }) {}; + "hstar" = callPackage + ({ mkDerivation, archive-libarchive, archive-sig, base, bytestring + , bz2, cpphs, lz4-hs, lzlib, lzma, optparse-applicative, zlib, zstd + }: + mkDerivation { + pname = "hstar"; + version = "0.1.0.0"; + sha256 = "0li4bvh92ijw5prwyrhcmrvi989w3b343yfbxjdhzqkwvpbp98ag"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + archive-libarchive archive-sig base bytestring bz2 lz4-hs lzlib + lzma optparse-applicative zlib zstd + ]; + executableToolDepends = [ cpphs ]; + description = "Haskell version of tar CLI utility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hstatistics" = callPackage ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random , vector @@ -130893,8 +131371,6 @@ self: { testHaskellDepends = [ base hspec time ]; description = "Log to syslog over a network via UDP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hszephyr" = callPackage @@ -131578,6 +132054,8 @@ self: { pname = "http-api-data"; version = "0.4.1.1"; sha256 = "1s93m2vh4c1p073xasvknnj3czbf8xsyg48kyznr4jwfhzi17anh"; + revision = "1"; + editedCabalFile = "1dshqb1140nj4h8d750s97gmzb2rk0ppr1rakvqxy1r79mg3m2wr"; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring containers cookie hashable http-types tagged text time-compat @@ -132573,8 +133051,6 @@ self: { executableHaskellDepends = [ base ]; description = "Tracking http redirects"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "http-types" = callPackage @@ -132639,6 +133115,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http2_2_0_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base16-bytestring, bytestring, case-insensitive, containers + , directory, doctest, filepath, gauge, Glob, heaps, hspec + , http-types, mwc-random, network, network-byte-order, psqueues + , stm, text, time-manager, unordered-containers, vector + }: + mkDerivation { + pname = "http2"; + version = "2.0.4"; + sha256 = "0rqfx6vvcrlic4sw5xlqzk3xvdsbw13d0ymppx8yjhkkzign6227"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager + ]; + testHaskellDepends = [ + aeson aeson-pretty array base base16-bytestring bytestring + case-insensitive containers directory doctest filepath Glob hspec + http-types network network-byte-order psqueues stm text + time-manager unordered-containers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -133374,17 +133882,18 @@ self: { }) {}; "hurl" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, directory - , filepath, http-client, http-client-tls, http-types, network-uri - , process, text + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , directory, filepath, http-client, http-client-tls, http-types + , network-uri, process, text, xml-conduit, zlib }: mkDerivation { pname = "hurl"; - version = "1.2.0.0"; - sha256 = "07abw78ds4fb4y8c7x94fpwcab58b2k613b3dk8hh9qqplhgl8ms"; + version = "1.3.0.0"; + sha256 = "1fb70wsqpy5jq5w8vrd0qszrpg670mfh25kw4ldapiw652az7w69"; libraryHaskellDepends = [ - base base64-bytestring bytestring directory filepath http-client - http-client-tls http-types network-uri process text + base base64-bytestring bytestring containers directory filepath + http-client http-client-tls http-types network-uri process text + xml-conduit zlib ]; description = "Haskell URL resolver"; license = stdenv.lib.licenses.gpl3; @@ -133555,14 +134064,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_7_0_0" = callPackage + "hvega_0_7_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers }: mkDerivation { pname = "hvega"; - version = "0.7.0.0"; - sha256 = "0kj40mm5d809adblk74h0k57qqpk8jxl5bhildasjzjfmmr4spax"; + version = "0.7.0.1"; + sha256 = "16s58m7kk72hr52k9gci17ac5k38r1zy08wll2frzjxissgza4cj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; @@ -133869,6 +134378,8 @@ self: { pname = "hw-excess"; version = "0.2.2.3"; sha256 = "1rlw53nbhjdvjqb1f0kacnmiiwhx04az6p4mf0iv5fwxcjh94q2r"; + revision = "1"; + editedCabalFile = "1bll4amizah25w4c6xplndig77hd6jh65q6zjyr5x4vr11vg6xbx"; libraryHaskellDepends = [ base hw-bits hw-prim hw-rankselect-base safe vector ]; @@ -133910,6 +134421,8 @@ self: { pname = "hw-fingertree-strict"; version = "0.1.1.3"; sha256 = "1fy492nl10a7p9a0b0jrqj1yiar8wir2g3qms2mmd814brbfkm80"; + revision = "1"; + editedCabalFile = "1s7fcimgyf0vskkkms371icazjkkmscv9bkz2ysdhx708bza96v5"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck @@ -133976,6 +134489,8 @@ self: { pname = "hw-ip"; version = "2.4.1.0"; sha256 = "1zjl078xzing927fwwpck36ib8z5aggpi7g0z5gnhxd8isgqs6zh"; + revision = "1"; + editedCabalFile = "1dg3aa6wavdr3vh7va3yx3j272pb4zw48rm7r5a6xv6xrrd01a33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134160,8 +134675,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "4.0.1"; - sha256 = "1x0mq3sn05iwrn444kzyl66056xm8203hq0ajx9f8r85faq3v1ir"; + version = "5.0.0"; + sha256 = "1j2al3xmymjzqc6009wm83b3bpddgshsmrlgp5129801bssc8s5w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134305,6 +134820,8 @@ self: { pname = "hw-prim"; version = "0.6.2.40"; sha256 = "0vm5mcnlb5yas2z7rvzd1kzv39d3qw4bkrkfmv0i7vsdg33yb3fd"; + revision = "1"; + editedCabalFile = "04pzny5b3hk8jjzh89bgz01hdc5z3ygn6a8pw81xky4m1gw7jc6b"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim mmap semigroups transformers unliftio-core vector @@ -134354,6 +134871,8 @@ self: { pname = "hw-rankselect"; version = "0.13.3.2"; sha256 = "1p4b5nm8mgxlc7p5gcwh6dy85xgydpbw999zv27755dbfcv9nk4v"; + revision = "1"; + editedCabalFile = "1byrp7zda5pxcd22jwsb16gr6kw1w7j1d7xyyn67c14fm3vym1mr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134388,6 +134907,8 @@ self: { pname = "hw-rankselect-base"; version = "0.3.3.0"; sha256 = "17h4kmi9zcgm4sdpbmqh6rzygz7w0v95lfc6rmhc9a8bmmg30i5b"; + revision = "1"; + editedCabalFile = "03svpzjia8mbgy33lhmjhwpd6yq0n97l3fkmfnpyi3blc3yb3bd0"; libraryHaskellDepends = [ base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse vector @@ -134444,6 +134965,8 @@ self: { pname = "hw-streams"; version = "0.0.0.12"; sha256 = "087sn4gxhf29vg9ydx8sfq33q16cz6cmda5r63k9xdki4ba761m4"; + revision = "1"; + editedCabalFile = "1y5sw9mgkxwvgf91hl22p3q5kxy99phwfmx2lh87339w7d5bjdbw"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups transformers vector @@ -136485,8 +137008,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "A project manage tool for Idris"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "idris" = callPackage @@ -137435,20 +137956,17 @@ self: { ({ mkDerivation, aeson, async, atom-conduit, base-noprelude, binary , blaze-html, blaze-markup, bytestring, case-insensitive, conduit , connection, containers, dhall, directory, fast-logger, filepath - , hashable, HaskellNet, HaskellNet-SSL, http-client - , http-client-tls, http-types, microlens, mime-mail, monad-time - , msgpack, network, opml-conduit, optparse-applicative - , prettyprinter, prettyprinter-ansi-terminal, refined, relude - , rss-conduit, safe-exceptions, stm, stm-chans + , hashable, http-client, http-client-tls, http-types, microlens + , mime-mail, monad-time, msgpack, opml-conduit + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , refined, relude, rss-conduit, safe-exceptions, stm, stm-chans , streaming-bytestring, streaming-with, text, time, timerep, tls , typed-process, uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "imm"; - version = "1.7.0.0"; - sha256 = "0slgfg4ay8j1kcvskl60gd2xbwllxcip6104wg36hcmb1symgdf1"; - revision = "1"; - editedCabalFile = "0hy3lbpn839yjplmn8w4ihlgyyirzi4j8qzwih5k5h98bd4d5nzf"; + version = "1.8.0.0"; + sha256 = "09948024zkjhdza100bi441xl2h8sd5b9gzki0l51dsm27phfk23"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137462,12 +137980,11 @@ self: { executableHaskellDepends = [ aeson async atom-conduit base-noprelude blaze-html blaze-markup bytestring case-insensitive conduit connection containers dhall - directory fast-logger filepath HaskellNet HaskellNet-SSL - http-client http-client-tls mime-mail msgpack network opml-conduit - optparse-applicative prettyprinter prettyprinter-ansi-terminal - refined relude rss-conduit safe-exceptions stm stm-chans - streaming-bytestring streaming-with text time typed-process - uri-bytestring xml-conduit xml-types + directory fast-logger filepath http-client http-client-tls + mime-mail msgpack opml-conduit optparse-applicative prettyprinter + prettyprinter-ansi-terminal refined relude rss-conduit + safe-exceptions stm stm-chans streaming-bytestring streaming-with + text time typed-process uri-bytestring xml-conduit xml-types ]; description = "Execute arbitrary callbacks for each element of RSS/Atom feeds"; license = stdenv.lib.licenses.cc0; @@ -138471,6 +138988,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_7_1_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, raw-strings-qq + , scientific, tagged, tasty, tasty-hunit, template-haskell, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.7.1.3"; + sha256 = "079f8xwhnzbdzjy0kbhsaklplp0d0nb9gxc193g9nl6v299zb8gv"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ + base containers doctest raw-strings-qq tasty tasty-hunit + template-haskell time + ]; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -139180,6 +139725,8 @@ self: { pname = "intcode"; version = "0.3.0.0"; sha256 = "0qcws15hn03wnsv1rg93sw9zhwsyvwpiafrmwnyv9v990qap1x8y"; + revision = "1"; + editedCabalFile = "1ad9fm65l8rnkm7236ak7v9j7hvj1jswwdcaw0xcsn9znn4xawl0"; libraryHaskellDepends = [ base containers primitive ]; testHaskellDepends = [ base containers doctest primitive ]; description = "Advent of Code 2019 intcode interpreter"; @@ -139508,8 +140055,6 @@ self: { ]; description = "Tracery-like randomized text interpolation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "interpol" = callPackage @@ -140543,25 +141088,6 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.8"; - sha256 = "0k2qzdw36qp9qs2j0bxsn95ymk3wpjvw6s5c1535aw677gw19bad"; - libraryHaskellDepends = [ - appar base byteorder containers network - ]; - testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe - ]; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_9" = callPackage ({ mkDerivation, appar, base, byteorder, bytestring, containers , doctest, hspec, network, QuickCheck, safe }: @@ -140578,7 +141104,6 @@ self: { ]; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -140757,6 +141282,8 @@ self: { pname = "irc-core"; version = "2.7.2"; sha256 = "1gpd28lxhqj2xj75nyyififn9434imvm0vqvx7zdw44fvg75lqyq"; + revision = "1"; + editedCabalFile = "1xkvy5igrx4ri8gmmwzxs2mq7ih57gps8a592ya6bv1crrm45cy2"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -141966,8 +142493,6 @@ self: { ]; description = "Efficient relational queries on Haskell sets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ixshader" = callPackage @@ -142688,12 +143213,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "jira-wiki-markup_1_1_3" = callPackage + "jira-wiki-markup_1_2_0" = callPackage ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.1.3"; - sha256 = "1hr67awpl1zpwp53x9b6ix4gdfq8r77r9wnm44qc9q91q8i872wv"; + version = "1.2.0"; + sha256 = "10ywmldxwwcl9n5xm5745xc979fbrz6b7vxq08n4vi2yrkkh04nb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -143373,15 +143898,15 @@ self: { "json-api-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , data-default, hspec, hspec-discover, lens, lens-aeson, text - , unordered-containers, uri-encode + , data-default, deepseq, hspec, hspec-discover, lens, lens-aeson + , text, unordered-containers, uri-encode }: mkDerivation { pname = "json-api-lib"; - version = "0.1.2.0"; - sha256 = "0qq34fw7b6kv4ywv7bzpsahn7b8mdn42cwwkhgqazsdf7wx72qqy"; + version = "0.2.0.0"; + sha256 = "0cay3yrzfbd0vnfq1a2f74nnqwbiwribhnfy90nhvbi6dxxp14a1"; libraryHaskellDepends = [ - aeson base containers data-default lens lens-aeson text + aeson base containers data-default deepseq lens lens-aeson text unordered-containers uri-encode ]; testHaskellDepends = [ @@ -143461,22 +143986,23 @@ self: { }) {}; "json-autotype" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, GenericPretty, hashable, json-alt, lens, mtl - , optparse-applicative, pretty, process, QuickCheck, scientific - , smallcheck, template-haskell, text, uniplate - , unordered-containers, vector, yaml + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, GenericPretty, hashable, json-alt, lens, mtl + , optparse-applicative, pretty, process, QuickCheck + , run-haskell-module, scientific, smallcheck, template-haskell + , text, uniplate, unordered-containers, vector, yaml }: mkDerivation { pname = "json-autotype"; - version = "3.0.1"; - sha256 = "0nir4nx4wchl10zs753a3ayg9lgixg2ap3liwz9xpz191c8rkbka"; + version = "3.0.5"; + sha256 = "0kvbx4iyhh2r0abnswbvf862xfj08jlgvdd21xiz4zpnp2d1fx0h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers filepath GenericPretty hashable json-alt lens - mtl pretty process QuickCheck scientific smallcheck - template-haskell text uniplate unordered-containers vector + aeson base containers data-default filepath GenericPretty hashable + json-alt lens mtl pretty process QuickCheck run-haskell-module + scientific smallcheck template-haskell text uniplate + unordered-containers vector ]; executableHaskellDepends = [ aeson base bytestring containers filepath GenericPretty hashable @@ -143491,8 +144017,6 @@ self: { ]; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "json-b" = callPackage @@ -145287,6 +145811,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "katip_0_8_4_0" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , filepath, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , safe-exceptions, scientific, semigroups, stm, string-conv, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, time-locale-compat, transformers, transformers-base + , transformers-compat, unix, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "katip"; + version = "0.8.4.0"; + sha256 = "0hkhvkdyk4m5pdr0yj1lbdwqvrfr7sq49jw683mk0lxjlyc39xm6"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either hostname + microlens microlens-th monad-control mtl old-locale resourcet + safe-exceptions scientific semigroups stm string-conv + template-haskell text time transformers transformers-base + transformers-compat unix unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory microlens + quickcheck-instances regex-tdfa safe-exceptions stm tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq directory filepath + safe-exceptions text time transformers unix + ]; + description = "A structured logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-datadog" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , conduit, conduit-extra, connection, containers, katip, network @@ -146577,8 +147137,8 @@ self: { pname = "kleene"; version = "0.1"; sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; - revision = "2"; - editedCabalFile = "1kiaxmxhlv1pczw8bg5vhcbyxgl87qs5bgcdaipd29ml0z7sncsd"; + revision = "3"; + editedCabalFile = "1bx73d86qhki4bvqckhv7nrvn06rha6x231fqjms2a7a9zpv47bm"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers lattices MemoTrie QuickCheck range-set-list regex-applicative semigroupoids @@ -146655,19 +147215,22 @@ self: { }) {}; "knead" = callPackage - ({ mkDerivation, base, bool8, comfort-array, llvm-extra, llvm-tf - , prelude-compat, storable-enum, storable-record, storable-tuple - , tagged, tfp, transformers, utility-ht + ({ mkDerivation, base, bool8, comfort-array, fixed-length, llvm-dsl + , llvm-extra, llvm-tf, prelude-compat, QuickCheck, storable-enum + , storable-record, tagged, tfp, transformers, utility-ht }: mkDerivation { pname = "knead"; - version = "0.4.2"; - sha256 = "03chikfkzlvabz2vmjpmd5mmk0a7gdnkzbgv635w3gdrpdpm8n31"; + version = "0.5"; + sha256 = "07j0sw10qs0zpz5hgxmrhs3rrwhnxf6441jasyagl96724svxq21"; libraryHaskellDepends = [ - base bool8 comfort-array llvm-extra llvm-tf prelude-compat - storable-enum storable-record storable-tuple tagged tfp + base bool8 comfort-array fixed-length llvm-dsl llvm-extra llvm-tf + prelude-compat storable-enum storable-record tagged tfp transformers utility-ht ]; + testHaskellDepends = [ + base comfort-array llvm-extra llvm-tf QuickCheck tfp utility-ht + ]; description = "Repa-like array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -147674,8 +148237,8 @@ self: { pname = "lambdabot-core"; version = "5.2"; sha256 = "1wh87wwb8hk3hn2lmdqi1hv77qbdmwqcwjslichygmvac8fjhjss"; - revision = "2"; - editedCabalFile = "1khn1j3z7mkzggp7s35p0dixsj81yljfrf5r9d289dvy1dip8akf"; + revision = "3"; + editedCabalFile = "182bhiwvbpadwwf3h9fpfsjwcsb0fkfzr57fvpl0k6w7msqn32rp"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -148324,8 +148887,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.10.0"; - sha256 = "1xixsf3n8ld1fjd96qvvvrmrmypd7idyb7syih09f8gq80jkaw5g"; + version = "1.7.10.1"; + sha256 = "19m9qalh9xiaw6n60zbhs8yqhd0acq08bkx42i44vfmm0917jys3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -148358,6 +148921,25 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "language-avro_0_1_3_1" = callPackage + ({ mkDerivation, avro, base, containers, directory, filepath, hspec + , hspec-megaparsec, megaparsec, text, vector + }: + mkDerivation { + pname = "language-avro"; + version = "0.1.3.1"; + sha256 = "0b54041z1sfrd7fck975i8d69agxij6jml6mxlcr41y7ywvizq0l"; + libraryHaskellDepends = [ + avro base containers directory filepath megaparsec text vector + ]; + testHaskellDepends = [ + avro base hspec hspec-megaparsec megaparsec text vector + ]; + description = "Language definition and parser for AVRO files"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-bash" = callPackage ({ mkDerivation, base, directory, filepath, parsec, prettyprinter , process, QuickCheck, tasty, tasty-expected-failure, tasty-golden @@ -148611,8 +149193,6 @@ self: { ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "language-dockerfile" = callPackage @@ -148669,8 +149249,8 @@ self: { }: mkDerivation { pname = "language-ecmascript"; - version = "0.19.0.1"; - sha256 = "1jh5ksx5hh2q9b134rfmcpz4i1j6fsfyqzk4yh8yn635kwa86jhr"; + version = "0.19.1.0"; + sha256 = "0kk5zk9lr6kvpkz4ihw8ww4j03m899i0af6yhf4q3r7r4d1yq22s"; libraryHaskellDepends = [ ansi-wl-pprint base charset containers data-default-class Diff mtl parsec QuickCheck template-haskell uniplate @@ -148821,6 +149401,8 @@ self: { pname = "language-haskell-extract"; version = "0.2.4"; sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl"; + revision = "1"; + editedCabalFile = "1chx4g8ngb1hpyh3r9rbl8rkjkm67klms4wmw3p1g2llg47vvqip"; libraryHaskellDepends = [ base regex-posix template-haskell ]; description = "Module to automatically extract functions from the local code"; license = stdenv.lib.licenses.bsd3; @@ -148897,8 +149479,8 @@ self: { }: mkDerivation { pname = "language-javascript"; - version = "0.7.0.0"; - sha256 = "15bpqpkjf2y3fk8wff9zlnkpsjc63bnbvhlkxrs9alj0bikq17nk"; + version = "0.7.1.0"; + sha256 = "0s6igb54cxm2jywgc3sq53f52gcsc39wd3g78yisfzvl9jm3d86i"; libraryHaskellDepends = [ array base blaze-builder bytestring containers mtl text utf8-string ]; @@ -149841,8 +150423,6 @@ self: { ]; description = "Automatically inline Haskell snippets into LaTeX documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "latex-svg-hakyll" = callPackage @@ -149906,6 +150486,8 @@ self: { pname = "lattices"; version = "2.0.2"; sha256 = "108rhpax72j6xdl0yqdmg7n32l1j805861f3q9wd3jh8nc67avix"; + revision = "2"; + editedCabalFile = "122mrj3b15jv1bjmzc8k37dkc2gy05hg550gia09n7j7n76v0h7i"; libraryHaskellDepends = [ base base-compat containers deepseq hashable integer-logarithms QuickCheck semigroupoids tagged transformers universe-base @@ -149930,8 +150512,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "1.0.2"; - sha256 = "1psm449p7fsh4b5mf7y7dlgh44za1fhf0cbn0qya1j4imy3x673b"; + version = "1.0.3"; + sha256 = "1xiy76ahwl83fmpj522nzrp9i7rvvn9xjjj6wzrl3vhbjdbmq4m5"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -150561,8 +151143,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.9.1"; - sha256 = "03n9apqkfs8vjm0s1ajfpg02zsvdm091di0860gyqa58cd3qbkdb"; + version = "0.9.3"; + sha256 = "14wi7h07pipd56grhaqmhb8wmr52llgd3xb7fm8hi9fb1sfzmvg0"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; @@ -150733,8 +151315,6 @@ self: { ]; description = "Yet another library for hidden Markov models"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "leetify" = callPackage @@ -151342,8 +151922,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "3"; - editedCabalFile = "1ll8j0zymxnr2xxp2h1aaqfcwd6ihjdllk5b7q02r5kw2b8a266b"; + revision = "4"; + editedCabalFile = "1ky3xzh3cgam5ncx7n25xbll7vqw3x7vyhprfmxm34pshkxbrjh7"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; @@ -151436,6 +152016,17 @@ self: { broken = true; }) {}; + "lens-th-rewrite" = callPackage + ({ mkDerivation, base, ghc, lens }: + mkDerivation { + pname = "lens-th-rewrite"; + version = "0.1.0.0"; + sha256 = "08nk7fglx1751zak82h8w0ld3lplzaghxraqwqrkvj39gwm4mqgx"; + libraryHaskellDepends = [ base ghc lens ]; + description = "Rewrites Template Haskell splices using the API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-time" = callPackage ({ mkDerivation, base, lens, time }: mkDerivation { @@ -151960,8 +152551,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "2.2.4.0"; - sha256 = "05d16ckk6iaj75zarqq6hjjmmb2xdd62hcyidfya3jfkw74zh1rp"; + version = "2.2.5.0"; + sha256 = "0vsrjkg4ijk63rgsl7cqdi1inpnv7ballrg5c5pgrrapwxfb5v4x"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -151979,8 +152570,6 @@ self: { ]; description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libarchive;}; "libarchive-conduit" = callPackage @@ -152923,32 +153512,29 @@ self: { }) {}; "life-sync" = callPackage - ({ mkDerivation, ansi-terminal, base-noprelude, bytestring - , containers, exceptions, filepath, fmt, hedgehog - , microlens-platform, optparse-applicative, path, path-io, process - , relude, tasty, tasty-discover, tasty-hedgehog, text, tomland + ({ mkDerivation, base, bytestring, colourista, containers + , exceptions, filepath, hedgehog, hspec, hspec-hedgehog + , optparse-applicative, path, path-io, process, relude, shellmet + , text, tomland, validation-selective }: mkDerivation { pname = "life-sync"; - version = "1.0.1"; - sha256 = "1p7vnbk6xsa2963wc77cjjc5bbnrswzh27nw1zra09405yd21yf0"; + version = "1.1.0.0"; + sha256 = "0l56n4dhg6p4lw7i7jjq747qv7r6fr0k2gdabwkbbb2qhsviw162"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base-noprelude bytestring containers exceptions fmt - microlens-platform path path-io process relude text tomland - ]; - executableHaskellDepends = [ - base-noprelude containers optparse-applicative path + base bytestring colourista containers exceptions + optparse-applicative path path-io process relude shellmet text + tomland validation-selective ]; + executableHaskellDepends = [ base relude ]; testHaskellDepends = [ - base-noprelude containers filepath hedgehog path tasty - tasty-hedgehog + base containers filepath hedgehog hspec hspec-hedgehog path relude + text ]; - testToolDepends = [ tasty-discover ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + description = "Synchronize personal configs across multiple machines"; + license = stdenv.lib.licenses.mpl20; }) {}; "lift-generics" = callPackage @@ -153002,6 +153588,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_10_0_6" = callPackage + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty + , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.0.6"; + sha256 = "1nnhb9sdn5ilwzdrzk9hfchcgvk3kb28fciriqhhxzi2qqzmdxbj"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -153694,8 +154302,8 @@ self: { }: mkDerivation { pname = "linear-tests"; - version = "0.1.1.0"; - sha256 = "0qndn8svhynvis1a69p7sircp8sd56hmk9gd4crcadiy8nf99227"; + version = "0.1.2.0"; + sha256 = "1l87lwbbmzq3qpf20zxq10ss1zdym87gq8kpim3ym0259ak4w89r"; libraryHaskellDepends = [ base lens linear QuickCheck ]; testHaskellDepends = [ base hspec hspec-core lens linear QuickCheck @@ -155169,6 +155777,25 @@ self: { broken = true; }) {}; + "llvm-dsl" = callPackage + ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, numeric-prelude + , prelude-compat, storable-enum, storable-record, tfp, transformers + , utility-ht + }: + mkDerivation { + pname = "llvm-dsl"; + version = "0.0"; + sha256 = "0ij2y3q8c46z731b1hlqcjgrkmzsj066mnb0rpnwkn70caai3vz8"; + libraryHaskellDepends = [ + base bool8 llvm-extra llvm-tf numeric-prelude prelude-compat + storable-enum storable-record tfp transformers utility-ht + ]; + description = "Support for writing an EDSL with LLVM-JIT as target"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "llvm-extension" = callPackage ({ mkDerivation, base, containers, cpuid, llvm-extra, llvm-tf , non-empty, prelude-compat, tfp, transformers, unsafe, utility-ht @@ -155190,21 +155817,25 @@ self: { }) {}; "llvm-extra" = callPackage - ({ mkDerivation, base, bool8, containers, enumset, llvm-tf - , non-empty, prelude-compat, QuickCheck, storable-enum, tagged, tfp - , transformers, utility-ht + ({ mkDerivation, base, base-orphans, bool8, containers, enumset + , fixed-length, llvm-tf, non-empty, prelude-compat, QuickCheck + , storable-enum, storable-record, tagged, tfp, transformers + , utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.9.1"; - sha256 = "0wxs8ki3l5fyijdv7z0xyrikx4whazyxv69ly0x98ag25l5fxwyi"; + version = "0.10"; + sha256 = "0g2872wl1gmdlw3gdimcb1wcdsckjwjlk1ciwz8sy0rx9v3kif1m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bool8 containers enumset llvm-tf non-empty prelude-compat - storable-enum tagged tfp transformers utility-ht + base base-orphans bool8 containers enumset fixed-length llvm-tf + non-empty prelude-compat storable-enum storable-record tagged tfp + transformers utility-ht + ]; + testHaskellDepends = [ + base llvm-tf QuickCheck storable-record tfp utility-ht ]; - testHaskellDepends = [ base llvm-tf QuickCheck tfp utility-ht ]; doHaddock = false; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -155216,8 +155847,8 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "9.1.0"; - sha256 = "1nfgh56wrlw13w0an9vyp78ahz2lp0yy0v7yqh1zr22a0mnwnq3s"; + version = "9.1.0.1"; + sha256 = "19bj8gkzmzg3khnj1pnksc789p1hls0ji48kvwp72zbhhzgpr75d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -155477,14 +156108,16 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "9.1.1"; - sha256 = "089pq0n3qj3df74g25jkn64byfb4g9f3di1h2fmps8n0yhr8qz3j"; + version = "9.2"; + sha256 = "1p4r9m1svp6k235r0azx6dkpdarakgy3420z3kk06bdiy1m2jk1s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers enumset fixed-length llvm-ffi non-empty QuickCheck semigroups storable-record tfp transformers utility-ht ]; + testHaskellDepends = [ base QuickCheck tfp utility-ht ]; + doHaddock = false; description = "Bindings to the LLVM compiler toolkit using type families"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155681,8 +156314,6 @@ self: { testHaskellDepends = [ base containers doctest hedgehog ]; description = "Types representing line and column positions and ranges in text files"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "loc-test" = callPackage @@ -155694,8 +156325,6 @@ self: { libraryHaskellDepends = [ base containers hedgehog loc ]; description = "Test-related utilities related to the /loc/ package"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "local-address" = callPackage @@ -155954,6 +156583,8 @@ self: { pname = "log-base"; version = "0.8.0.0"; sha256 = "15539v6y6s46kgb86ns13rh17c1qnidwdajk26yaxyqky58yx2m6"; + revision = "1"; + editedCabalFile = "0kdkvyw39ywly1qv1l0sq5qzr1akigl8410vr647hy2cn46anva0"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -156125,8 +156756,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "log2json" = callPackage @@ -157197,8 +157826,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "9"; - editedCabalFile = "0rzrj9ziwly33lhkamf9rkrc3jqhid3adl0dv9621n4zzd6dnkb6"; + revision = "10"; + editedCabalFile = "1yzmwvwzby4dx896jlgznlpigqlsl475a57l1npjz0rimlqr71w6"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -157257,8 +157886,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.10.1.0"; - sha256 = "1f1ab7gn5bgdlhlayrrrhk6d8iyf971pia6hb23jjyqz9j0vl7ac"; + version = "0.10.2.0"; + sha256 = "1khqdgc90k9ya58nxsb6dggyyjdp5q9m4bgxmkg15l6qh6mw9zqp"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -157656,8 +158285,8 @@ self: { }: mkDerivation { pname = "lukko"; - version = "0.1.1.1"; - sha256 = "13wf2vgi3bq48h757qs0zi1sxa6ip9pk8fxfiq7qrrb9p5silcpj"; + version = "0.1.1.2"; + sha256 = "1lh7cv0fqbrn8sf54xz74wq991bl8p67jcyq4ing3khcvh9x2yca"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base bytestring filepath singleton-bool tasty @@ -157934,8 +158563,6 @@ self: { ]; description = "Bindings to LZ4"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lz4-conduit" = callPackage @@ -157969,8 +158596,8 @@ self: { }: mkDerivation { pname = "lz4-hs"; - version = "0.1.3.0"; - sha256 = "0yx1njh0zwk2qk99ip1f2wlcy3ql35piqbvd6dppr2hwnm5bh1mk"; + version = "0.1.4.0"; + sha256 = "1biwiqc43wd2njfinrpfzg7pglsrcb2xjhvrm62ida04djrh8s4y"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; @@ -158020,8 +158647,8 @@ self: { pname = "lzma"; version = "0.0.0.3"; sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg"; - revision = "4"; - editedCabalFile = "0f3zrjq4zxwacmlc934y873pvlqpmmcmhzhp34d8pvhi5c7dg47j"; + revision = "5"; + editedCabalFile = "1m1a3w8cjqz8h4iibkgykzgmrmkxxgz9sm0zn52dbvczdiqbs5y5"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ lzma ]; testHaskellDepends = [ @@ -158806,8 +159433,6 @@ self: { ]; description = "Count mailboxes in a SQL database"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mailchimp" = callPackage @@ -160126,6 +160751,8 @@ self: { pname = "marshal-contt"; version = "0.2.0.0"; sha256 = "1dv2jl7gm3b3kcchgwz4v6rch5w50ak43gc6fjvpms81xkdjfzmb"; + revision = "1"; + editedCabalFile = "1cfkcb3zpddikzg610zbrwr00vn3y8sakr3m8vis5cw25hxra1c0"; libraryHaskellDepends = [ base bytestring kan-extensions lens mtl ]; @@ -160529,8 +161156,8 @@ self: { }: mkDerivation { pname = "math-grads"; - version = "0.1.6.4"; - sha256 = "018h2pczvdxvmws9sjihmyg396dvgd4a038jmi8z42rp1dgbql1r"; + version = "0.1.6.7"; + sha256 = "15dxw679hxkkqdj3yzv49r32a8jll9xj8s8fqmvnyqwzw4lx50qy"; libraryHaskellDepends = [ aeson array base bimap containers ilist lens linear matrix mtl random vector @@ -160668,8 +161295,6 @@ self: { testHaskellDepends = [ base hspec parsec ]; description = "A small programming language for numerical computing"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mathlink" = callPackage @@ -160822,15 +161447,16 @@ self: { }) {}; "matrix-sized" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, primitive - , singletons, vector + ({ mkDerivation, base, primitive, singletons, tasty + , tasty-quickcheck, vector }: mkDerivation { pname = "matrix-sized"; - version = "0.0.2"; - sha256 = "1sp9d3pfkq80klwryvggjf76hm4y9qqair3cppvgnp06kn99k1z1"; - libraryHaskellDepends = [ - base binary bytestring deepseq primitive singletons vector + version = "0.0.3"; + sha256 = "1c43cgcw43y777l1wfkdagkis5sbb79fdwhckzwx11av6br02x5g"; + libraryHaskellDepends = [ base primitive singletons vector ]; + testHaskellDepends = [ + base primitive singletons tasty tasty-quickcheck vector ]; description = "Haskell matrix library with interface to C++ linear algebra libraries"; license = stdenv.lib.licenses.bsd3; @@ -160901,7 +161527,7 @@ self: { , brick, brick-skylighting, bytestring, cheapskate, checkers , config-ini, connection, containers, data-clist, directory , filepath, gitrev, hashable, Hclip, mattermost-api - , mattermost-api-qc, microlens-platform, mtl, process + , mattermost-api-qc, microlens-platform, mtl, network-uri, process , quickcheck-text, random, semigroups, skylighting-core, stm , stm-delay, strict, string-conversions, tasty, tasty-hunit , tasty-quickcheck, temporary, text, text-zipper, time @@ -160911,8 +161537,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.7.0"; - sha256 = "08ynlxqdb2mr7si0q7747pd1x9v9s7jmq2q75bqhzl44rpjhh4dv"; + version = "50200.8.0"; + sha256 = "05fkhizjj5vvrsz7db8s7ig36ym02n6mndwaay0md8s7fghjwfiw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -160920,10 +161546,11 @@ self: { aeson aspell-pipe async base base-compat brick brick-skylighting bytestring cheapskate config-ini connection containers data-clist directory filepath gitrev hashable Hclip mattermost-api - microlens-platform mtl process random semigroups skylighting-core - stm stm-delay strict temporary text text-zipper time timezone-olson - timezone-series transformers unix unordered-containers utf8-string - uuid vector vty word-wrap xdg-basedir + microlens-platform mtl network-uri process random semigroups + skylighting-core stm stm-delay strict temporary text text-zipper + time timezone-olson timezone-series transformers unix + unordered-containers utf8-string uuid vector vty word-wrap + xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini @@ -160936,28 +161563,28 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "mattermost-api" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, connection , containers, gitrev, hashable, HTTP, http-media, HUnit, memory - , microlens, microlens-th, mtl, network-uri, pretty-show, process - , resource-pool, split, stm, tasty, tasty-hunit, template-haskell - , text, time, unordered-containers, websockets + , microlens, microlens-th, modern-uri, mtl, network-uri + , pretty-show, process, resource-pool, split, stm, tasty + , tasty-hunit, template-haskell, text, time, unordered-containers + , websockets }: mkDerivation { pname = "mattermost-api"; - version = "50200.4.0"; - sha256 = "0nl3xsw90rg08hmipr0d80h7ss68mlyaawagkiv2gj4qjlb2lqcn"; + version = "50200.5.0"; + sha256 = "0hfwc85qhz1klwr4baabcrv6n7imfj3xz809dddy2hdfav0y9qgg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring connection containers gitrev hashable - HTTP http-media memory microlens microlens-th network-uri - pretty-show process resource-pool split stm template-haskell text - time unordered-containers websockets + HTTP http-media memory microlens microlens-th modern-uri + network-uri pretty-show process resource-pool split stm + template-haskell text time unordered-containers websockets ]; testHaskellDepends = [ aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit @@ -160965,8 +161592,7 @@ self: { ]; description = "Client API for Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "mattermost-api-qc" = callPackage @@ -160975,15 +161601,14 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.4.0"; - sha256 = "1lxr3xfvc4qg1n1wxqz1bv4ac12xiwnk79i53w2gx2xks6rdpibj"; + version = "50200.5.0"; + sha256 = "0gzjzfzfipvpk61zilxw9a1xsgm10lrsl26rvr4h4gjw6mws7bg8"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; description = "QuickCheck instances for the Mattermost client API library"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "maude" = callPackage @@ -161207,8 +161832,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Haskell MBTiles client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mbug" = callPackage @@ -161783,6 +162406,8 @@ self: { pname = "megaparsec-tests"; version = "8.0.0"; sha256 = "1l71s16fhl2054myj02fnnjr71pfypjvwxd0hxzf83zwmqnv558f"; + revision = "1"; + editedCabalFile = "1hawpdlx2nwyi5s06vh5lvccyjzsxzns02mhggzy0kb33xb9c818"; libraryHaskellDepends = [ base bytestring containers hspec hspec-expectations hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -162375,6 +163000,8 @@ self: { pname = "merkle-log"; version = "0.1.0.0"; sha256 = "07q0ifgwq8agwm62k1k83sdrln4zbj6ln90nw9p9g3pgxnp3inia"; + revision = "1"; + editedCabalFile = "1vrzsflvmx0mrsdb7i7pbz4d74k6yjccrb7979yw0r91qhmzlcir"; libraryHaskellDepends = [ base bytestring cryptonite deepseq exceptions memory text ]; @@ -162868,8 +163495,8 @@ self: { pname = "microaeson"; version = "0.1.0.0"; sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz"; - revision = "2"; - editedCabalFile = "1n3jhbwic8c2pa6dcz36a6fgna4b854ml5d5n8qzzhjshb0v60ri"; + revision = "3"; + editedCabalFile = "09fbsmxlhcjazd99r05n1cla9akficbnfylszg9jkpic7g0p5pa3"; libraryHaskellDepends = [ array base bytestring containers deepseq text ]; @@ -162884,6 +163511,18 @@ self: { broken = true; }) {}; + "microbase" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microbase"; + version = "4.14.0.0.2"; + sha256 = "11w2nscia78cw9pccf9ibcn0i3yfykwfvhzhn0x0xy5lav69p01q"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + description = "A minimal base to work around GHC bugs"; + license = stdenv.lib.licenses.mit; + }) {}; + "microbench" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -163172,8 +163811,8 @@ self: { pname = "microstache"; version = "1.0.1.1"; sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax"; - revision = "5"; - editedCabalFile = "1dr1yqn42j6im1x333rpsqj57nhmagmhwkdfwx832cdsw9ry2gjz"; + revision = "6"; + editedCabalFile = "054ny1rsqz682k4x36dqj6wqbj6arwxp75xpsss8lc7j145d0qn3"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -163657,8 +164296,6 @@ self: { ]; description = "Double-ended priority queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "minecraft" = callPackage @@ -164186,8 +164823,6 @@ self: { executableHaskellDepends = [ monad-loops regex-base regex-pcre ]; description = "fortune-mod clone"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mismi-core" = callPackage @@ -164314,6 +164949,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "miso_1_5_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-api-data + , http-types, lucid, network-uri, servant, servant-lucid, text + , transformers, vector + }: + mkDerivation { + pname = "miso"; + version = "1.5.0.0"; + sha256 = "08843wyd41hs38vrixcfdnmar9vkvayk11323kav4qq85s3yhsd3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-api-data http-types lucid + network-uri servant servant-lucid text transformers vector + ]; + description = "A tasty Haskell front-end framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "miso-action-logger" = callPackage ({ mkDerivation, aeson, base, ghcjs-base, miso }: mkDerivation { @@ -164331,8 +164986,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.3.0.0"; - sha256 = "1nwiznlhvnr7jcaqp1w0l2wwci9jbs56jrdiz79mpxrqq79h1icg"; + version = "1.5.0.0"; + sha256 = "0k0rf7kb65nqckmz8gc27rssnn3ja0nswmrbslfmm0nz7293jaiw"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -164827,15 +165482,17 @@ self: { }) {}; "mmsyn7l" = callPackage - ({ mkDerivation, base, mmsyn2, mmsyn7ukr, vector }: + ({ mkDerivation, base, directory, mmsyn2, mmsyn7ukr, vector }: mkDerivation { pname = "mmsyn7l"; - version = "0.3.2.0"; - sha256 = "0h3j7y6k9zagw0djj8hrnlhfdqg60hb52h9xb3ni326ijshw2qil"; + version = "0.4.2.0"; + sha256 = "1dpilwaffrkihfgbpq7p1095qpx9qgcpzbs8q3kld948hliihix7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mmsyn2 mmsyn7ukr vector ]; - executableHaskellDepends = [ base mmsyn2 mmsyn7ukr vector ]; + libraryHaskellDepends = [ base directory mmsyn2 mmsyn7ukr vector ]; + executableHaskellDepends = [ + base directory mmsyn2 mmsyn7ukr vector + ]; description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package"; license = stdenv.lib.licenses.mit; }) {}; @@ -165517,15 +166174,15 @@ self: { }) {}; "monad-choice" = callPackage - ({ mkDerivation, base, invariant, MonadRandom, mtl, transformers }: + ({ mkDerivation, base, contravariant, invariant, MonadRandom, mtl + , primitive, transformers + }: mkDerivation { pname = "monad-choice"; - version = "0.1.0.0"; - sha256 = "0vhfiqrnkfhqkhnh9h4npl3rfam321iikabr3przywfcfd4gap4z"; - revision = "3"; - editedCabalFile = "055zzzz9ag1wb79bjx0wg59plajym156hz0bh0lq4ndvn4k7sxay"; + version = "0.2.0.0"; + sha256 = "1ryakbs6ydgdfvz067jw6a2aqg566pynwyibxl6qi77ywwahqlvk"; libraryHaskellDepends = [ - base invariant MonadRandom mtl transformers + base contravariant invariant MonadRandom mtl primitive transformers ]; description = "Monad, monad transformer, and typeclass representing choices"; license = stdenv.lib.licenses.agpl3; @@ -165539,8 +166196,8 @@ self: { pname = "monad-chronicle"; version = "1"; sha256 = "03x19683pm99zcw7gkipmdkrqwaspcyvy7yv68nlh6g4swl31a0l"; - revision = "1"; - editedCabalFile = "059qa4kb6x3vqw0pahbkp3i6v33cyaiizzkgxd1n36l9ybchwr4l"; + revision = "2"; + editedCabalFile = "0ajjcv8h6104k2xlzlqkhvy7hmv6p4ldca3jdsa9ns38sxy8j6ld"; libraryHaskellDepends = [ base data-default-class mtl semigroupoids these transformers transformers-compat @@ -166081,8 +166738,6 @@ self: { testHaskellDepends = [ base ]; description = "A convenient wrapper around EKG metrics"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "monad-metrics-extensible" = callPackage @@ -167525,8 +168180,6 @@ self: { ]; description = "A web service framework for Haskell, similar in purpose to dropwizard"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "more-containers" = callPackage @@ -168090,31 +168743,25 @@ self: { }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage - ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion - , monad-loops, openmpi, store - }: + ({ mkDerivation, base, bytestring, c2hs, monad-loops, mpich }: mkDerivation { pname = "mpi-hs"; - version = "0.5.3.0"; - sha256 = "0z2m4xfk0w1zx29jb27xb6hs01xid0ghv93yhqx7zwiw01815krk"; + version = "0.7.1.0"; + sha256 = "1xja12laj9pznwkgllgn2126g0izgv7mp267jv0ihlzy4yv2ps8m"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring cereal monad-loops store - ]; - librarySystemDepends = [ openmpi ]; + libraryHaskellDepends = [ base bytestring monad-loops ]; + librarySystemDepends = [ mpich ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base binary ]; - executableSystemDepends = [ openmpi ]; + executableHaskellDepends = [ base ]; + executableSystemDepends = [ mpich ]; testHaskellDepends = [ base monad-loops ]; - testSystemDepends = [ openmpi ]; - benchmarkHaskellDepends = [ base criterion ]; - benchmarkSystemDepends = [ openmpi ]; + testSystemDepends = [ mpich ]; description = "MPI bindings for Haskell"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) openmpi;}; + }) {inherit (pkgs) mpich;}; "mplayer-spot" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, conduit @@ -168320,8 +168967,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "mr-env"; - version = "0.1.0.1"; - sha256 = "102m1gqjcscwf620jpaz1i7hg73ikd19an2wjgnfpfrlzw83xgd6"; + version = "0.1.0.2"; + sha256 = "1bw0ga59lf1crhjx4hlmsnzllsf3nfwzzsfcll0xf04fkj0jgxlg"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A simple way to read environment variables in Haskell"; @@ -168443,6 +169090,32 @@ self: { broken = true; }) {}; + "msgpack-binary" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , data-binary-ieee754, deepseq, groom, hashable, hspec + , msgpack-types, QuickCheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "msgpack-binary"; + version = "0.0.14"; + sha256 = "1pf0fzxkrd2f1jzm3mkybayd94pxq28a49nvjzx8i2lxrdmynkp6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring data-binary-ieee754 msgpack-types text + ]; + executableHaskellDepends = [ base bytestring groom ]; + testHaskellDepends = [ + base bytestring containers hashable hspec msgpack-types QuickCheck + text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq QuickCheck + ]; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "msgpack-idl" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, cmdargs , containers, directory, filepath, hspec, msgpack, peggy @@ -168488,6 +169161,48 @@ self: { broken = true; }) {}; + "msgpack-rpc-conduit" = callPackage + ({ mkDerivation, async, base, binary, binary-conduit, bytestring + , conduit, conduit-extra, data-default-class + , data-default-instances-base, exceptions, hspec, monad-control + , msgpack-binary, msgpack-types, mtl, network, text, unliftio-core + }: + mkDerivation { + pname = "msgpack-rpc-conduit"; + version = "0.0.6"; + sha256 = "000aycbvxac4li8rxqxmj3a020fwl08wnq01fv8jdlx3qg7k57hf"; + libraryHaskellDepends = [ + base binary binary-conduit bytestring conduit conduit-extra + data-default-class data-default-instances-base exceptions + monad-control msgpack-binary msgpack-types mtl network text + unliftio-core + ]; + testHaskellDepends = [ async base bytestring hspec mtl network ]; + description = "A MessagePack-RPC Implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "msgpack-types" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq + , generic-arbitrary, hashable, hspec, QuickCheck, text + , unordered-containers, vector + }: + mkDerivation { + pname = "msgpack-types"; + version = "0.0.4"; + sha256 = "076szvjs80a765c72prjp73416gyq70b4k1319qfl339sa8lz1ky"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable QuickCheck text + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq generic-arbitrary hashable hspec + QuickCheck text unordered-containers vector + ]; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "msh" = callPackage ({ mkDerivation, base, containers, haskell-src-exts , haskell-src-meta, lens, mtl, parsec, template-haskell, text @@ -169321,8 +170036,6 @@ self: { testHaskellDepends = [ base cryptonite doctest hedgehog ]; description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "multihash-serialise" = callPackage @@ -170153,8 +170866,8 @@ self: { }: mkDerivation { pname = "musicScroll"; - version = "0.2.0.0"; - sha256 = "1iv80yhal5f8klsc095yabq7402w45j8lb0g64avdyp2zy569vmx"; + version = "0.2.2.0"; + sha256 = "1r1n22g98sqi8hnrkwb6cyv805ggq8770iwa4bzwiq7a59x3rlm6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -171228,8 +171941,6 @@ self: { ]; description = "Parse Nagios performance data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nagios-plugin-ekg" = callPackage @@ -172163,8 +172874,6 @@ self: { ]; description = "General tools for Neil"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "neither" = callPackage @@ -172511,16 +173220,16 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.1.0"; - sha256 = "09ww6ya4h7j8vd9j18492qx6x0y1aqmis271smrb45mylj4hsaqb"; + version = "0.4.2.0"; + sha256 = "1jpqkwgi13a0hw99andw6f8jsq8isqsqlqjc42bapy97wxba2bii"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative safe-exceptions scientific text time unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec text time - vector + aeson base bytestring doctest doctest-discover greskell hashable + hspec text time vector ]; description = "A graph database middleware to maintain a time-varying graph"; license = stdenv.lib.licenses.bsd3; @@ -173586,8 +174295,6 @@ self: { ]; description = "MessagePack RPC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-messagepack-rpc-websocket" = callPackage @@ -174673,19 +175380,20 @@ self: { "ngx-export-tools-extra" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base64, bytestring - , containers, ede, enclosed-exceptions, http-client, http-types - , ngx-export, ngx-export-tools, snap-core, snap-server - , template-haskell, text, time, unordered-containers + , case-insensitive, containers, ede, enclosed-exceptions + , http-client, http-types, ngx-export, ngx-export-tools, snap-core + , snap-server, template-haskell, text, time, trifecta + , unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.2.1.0"; - sha256 = "0xka55h7c5zqyb8nj1pyq0iq50yfwy4p6fspya1zbi0yjblnxnsa"; + version = "0.3.2.1"; + sha256 = "0dc7g592xcby4ycq7y19879xz83kq1d5vjh7d9ymgfmxa3nl1hrk"; libraryHaskellDepends = [ - aeson ansi-wl-pprint base base64 bytestring containers ede - enclosed-exceptions http-client http-types ngx-export - ngx-export-tools snap-core snap-server template-haskell text time - unordered-containers + aeson ansi-wl-pprint base base64 bytestring case-insensitive + containers ede enclosed-exceptions http-client http-types + ngx-export ngx-export-tools snap-core snap-server template-haskell + text time trifecta unordered-containers ]; description = "More extra tools for Nginx haskell module"; license = stdenv.lib.licenses.bsd3; @@ -175021,8 +175729,7 @@ self: { ]; description = "Explain why two Nix derivations differ"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ terlar ]; }) {}; "nix-eval" = callPackage @@ -176831,8 +177538,8 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.3.0"; - sha256 = "0j75qig7smx2lnl6drmsj2zs4zg6rw9vvcb1d0cjv47haw9xgz62"; + version = "0.3.1"; + sha256 = "0phvn46cnf2ffia703k3lsxv32n8mzcjx1szm9qic1nd6k8wrnv7"; libraryHaskellDepends = [ adjunctions base containers distributive foldl lattices semigroupoids tdigest text time @@ -177787,8 +178494,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.5.0.0"; - sha256 = "09ykb49qzg0hpkjgylmilvy9dkcsxlv1lxrp0mwqamq4vxkm2wz3"; + version = "0.5.1.0"; + sha256 = "1qp69bdfam86y90vrm3z1nlk4kh03pnyzc5k06w9xvaq6i0965z6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178802,6 +179509,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "openid-connect" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, cookie + , cryptonite, http-client, http-types, jose, lens, memory, mtl + , network-uri, tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "openid-connect"; + version = "0.1.0.0"; + sha256 = "12qp155dazycypv0fvw8mbh3rl5j5ybd2vyfga8wi55n16v1w8mv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive cookie cryptonite + http-client http-types jose lens memory mtl network-uri text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive cookie cryptonite + http-client http-types jose lens memory mtl network-uri tasty + tasty-hunit text time unordered-containers + ]; + description = "An OpenID Connect library that does all the heavy lifting for you"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "openpgp" = callPackage ({ mkDerivation, base, binary, bytestring, bzlib, HUnit, QuickCheck , quickcheck-instances, test-framework, test-framework-hunit @@ -179537,6 +180269,8 @@ self: { pname = "optics-core"; version = "0.2"; sha256 = "19hsax8wxxgr28rjz6p9afb06f338xnyvws7salmm1dsik1ghzr8"; + revision = "1"; + editedCabalFile = "1sghrm6xyflzkv350phcm344ljv82wk2vjnwhwyvcqwirkwg8rk9"; libraryHaskellDepends = [ array base containers indexed-profunctors transformers ]; @@ -179770,6 +180504,8 @@ self: { pname = "optparse-applicative"; version = "0.15.1.0"; sha256 = "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd"; + revision = "1"; + editedCabalFile = "0zmhqkd96v2z1ilhqdkd9z4jgsnsxb8yi2479ind8m5zm9363zr9"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -180129,8 +180865,8 @@ self: { }: mkDerivation { pname = "org-mode-lucid"; - version = "1.2.0"; - sha256 = "1y7dxm3g7jzq7y45z1d4k1j4rsfjdg4l8gk1ykn5frigwf01vwkf"; + version = "1.3.0"; + sha256 = "0a6iy2x0k9r3072zx0sf4k27xnihwckyd1h2pcqd61sxkgf3qkn3"; libraryHaskellDepends = [ base containers hashable lucid org-mode text ]; @@ -180240,8 +180976,6 @@ self: { ]; description = "Statistics visualizer for org-mode"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "origami" = callPackage @@ -180587,8 +181321,6 @@ self: { ]; description = "External sorting package based on Conduit"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "overhang" = callPackage @@ -181305,50 +182037,53 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_9_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , case-insensitive, cmark-gfm, containers, criterion, data-default - , deepseq, Diff, directory, doclayout, doctemplates, emojis - , exceptions, executable-path, filepath, Glob, haddock-library - , hslua, hslua-module-system, hslua-module-text, HsYAML, HTTP - , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup - , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec - , process, QuickCheck, random, safe, scientific, SHA, skylighting - , skylighting-core, split, syb, tagsoup, tasty, tasty-golden - , tasty-hunit, tasty-lua, tasty-quickcheck, temporary, texmath - , text, text-conversions, time, unicode-transforms, unix - , unordered-containers, vector, weigh, xml, zip-archive, zlib + "pandoc_2_9_2_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base-compat + , base-noprelude, base64-bytestring, binary, blaze-html + , blaze-markup, bytestring, case-insensitive, cmark-gfm, containers + , criterion, data-default, deepseq, Diff, directory, doclayout + , doctemplates, emojis, exceptions, executable-path, filepath, Glob + , haddock-library, hslua, hslua-module-system, hslua-module-text + , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-transforms, unix, unordered-containers, vector + , weigh, xml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.9.2"; - sha256 = "1f9wbwzv6c3dlsn15iydh921icjqj7kjgrb726kqmj5gmaypc39j"; + version = "2.9.2.1"; + sha256 = "0myz7firqkx4k0vrsd62j443gvm2pk09bi69c8qdbdzq5hvkavf2"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive cmark-gfm - containers data-default deepseq directory doclayout doctemplates - emojis exceptions filepath Glob haddock-library hslua - hslua-module-system hslua-module-text HsYAML HTTP http-client - http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl - network network-uri pandoc-types parsec process random safe - scientific SHA skylighting skylighting-core split syb tagsoup - temporary texmath text text-conversions time unicode-transforms - unix unordered-containers vector xml zip-archive zlib + aeson aeson-pretty attoparsec base-compat base-noprelude + base64-bytestring binary blaze-html blaze-markup bytestring + case-insensitive cmark-gfm containers data-default deepseq + directory doclayout doctemplates emojis exceptions filepath Glob + haddock-library hslua hslua-module-system hslua-module-text HsYAML + HTTP http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-transforms unix unordered-containers vector xml zip-archive + zlib ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base-compat base-noprelude ]; testHaskellDepends = [ - base base64-bytestring bytestring containers Diff directory - doctemplates executable-path filepath Glob hslua mtl pandoc-types - process QuickCheck tasty tasty-golden tasty-hunit tasty-lua - tasty-quickcheck temporary text time xml zip-archive + base-compat base-noprelude base64-bytestring bytestring containers + Diff directory doctemplates executable-path filepath Glob hslua mtl + pandoc-types process QuickCheck tasty tasty-golden tasty-hunit + tasty-lua tasty-quickcheck temporary text time xml zip-archive ]; benchmarkHaskellDepends = [ - base bytestring containers criterion mtl text time weigh + base-compat base-noprelude bytestring containers criterion mtl text + time weigh ]; postInstall = '' mkdir -p $out/share/man/man1 @@ -181482,8 +182217,6 @@ self: { ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pandoc-csv2table" = callPackage @@ -181679,8 +182412,8 @@ self: { }: mkDerivation { pname = "pandoc-placetable"; - version = "0.5.1"; - sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112"; + version = "0.6"; + sha256 = "0jcnf4lv4sszkbnsbvj21zi0xf9vplbpk9yavhz1b62m61xp76pg"; configureFlags = [ "-finlinemarkdown" ]; isLibrary = false; isExecutable = true; @@ -181878,8 +182611,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.3"; - sha256 = "1sk8hhw3ad0jb2ik787pqjgaprd78k7qc0m0chcji3z5bprxp1cw"; + version = "0.2.5"; + sha256 = "1nj56liyyrgmng4290p19zf89c3lyi6pzqjrqr4bfc0gmmkm4719"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -182690,8 +183423,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "1"; - editedCabalFile = "0a3kn7arck8f2gwm8cwfkplsw4q9v9j6ifbhj1l3bmclmkwcckcj"; + revision = "2"; + editedCabalFile = "0shw96f4fc3vbr2vrnsk794qcsxyv3ra3snhw4wng81rkapp54y6"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; @@ -183051,6 +183784,8 @@ self: { pname = "parsec"; version = "3.1.14.0"; sha256 = "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67"; + revision = "1"; + editedCabalFile = "0dhg5xwqnig83hbkpawqi1k2prrps7jhkj4gb3ccram2drfmb933"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit @@ -183327,6 +184062,8 @@ self: { pname = "parser-combinators-tests"; version = "1.2.1"; sha256 = "0iy4iajpjka1diy660x3mvmh8kldwf3svwdmvlxh26dsqy2s8sx8"; + revision = "1"; + editedCabalFile = "07isz6d136dkbr1aykznfi3dr3dp18x14548af207rd29x51g0di"; isLibrary = false; isExecutable = false; testHaskellDepends = [ @@ -183432,8 +184169,6 @@ self: { ]; description = "`parsers` instances for Megaparsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "parsestar" = callPackage @@ -183492,8 +184227,6 @@ self: { ]; description = "Parser combinators with slicing, error recovery, and syntax highlighting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "partage" = callPackage @@ -183581,8 +184314,6 @@ self: { ]; description = "Provides typeclass suitable for types admitting a partial order"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "partial-records" = callPackage @@ -183602,8 +184333,8 @@ self: { ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.5.1.1"; - sha256 = "1n0nr7yprkg9ca86yd1w8d42zqjjdf6k7bbk818kfwbh72csxl0q"; + version = "0.5.1.4"; + sha256 = "1szzggr0j52cn6n7j288kh5rma6g8vpjr4dwfmwrhz2jsn4ag9hh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; @@ -183616,8 +184347,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.1"; - sha256 = "0wn5gdgjza17qhxqmkp8mkj77ky2q39xs1gpjx4nrs5af34pavpy"; + version = "0.6.0.4"; + sha256 = "0ijmaj8zkcqikm2jr749n8pqcbf2g05bqpdmvljd1q18vydwxx6q"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = stdenv.lib.licenses.asl20; @@ -183928,29 +184659,25 @@ self: { }) {}; "patch-image" = callPackage - ({ mkDerivation, accelerate, accelerate-arithmetic - , accelerate-cufft, accelerate-fourier, accelerate-io - , accelerate-llvm-ptx, accelerate-utility, array, base, bool8 - , bytestring, Cabal, carray, cassava, comfort-array, containers - , dsp, enumset, explicit-exception, fft, filepath, gnuplot - , JuicyPixels, knead, llvm-extra, llvm-tf, non-empty, pqueue - , prelude-compat, semigroups, storable-complex, storable-tuple, tfp - , unordered-containers, utility-ht, vector + ({ mkDerivation, array, base, bool8, bytestring, carray, cassava + , comfort-array, containers, dsp, enumset, explicit-exception, fft + , filepath, JuicyPixels, knead, llvm-extra, llvm-tf, non-empty + , pqueue, prelude-compat, semigroups, shell-utility + , storable-complex, storable-record, tfp, unordered-containers + , utility-ht, vector }: mkDerivation { pname = "patch-image"; - version = "0.3.3"; - sha256 = "0jm723xrbiwpq7sci67z0vilsv8a8i2ndm795ssyqkgqm7g1psby"; + version = "0.3.3.1"; + sha256 = "0nvp2y2f5cb29vzk2a9bvr3mgf17j70ir0nhb648pzfa0h1xj76k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-cufft - accelerate-fourier accelerate-io accelerate-llvm-ptx - accelerate-utility array base bool8 bytestring Cabal carray cassava - comfort-array containers dsp enumset explicit-exception fft - filepath gnuplot JuicyPixels knead llvm-extra llvm-tf non-empty - pqueue prelude-compat semigroups storable-complex storable-tuple - tfp unordered-containers utility-ht vector + array base bool8 bytestring carray cassava comfort-array containers + dsp enumset explicit-exception fft filepath JuicyPixels knead + llvm-extra llvm-tf non-empty pqueue prelude-compat semigroups + shell-utility storable-complex storable-record tfp + unordered-containers utility-ht vector ]; description = "Compose a big image from overlapping parts"; license = stdenv.lib.licenses.bsd3; @@ -184059,8 +184786,8 @@ self: { ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { pname = "path-text-utf8"; - version = "0.0.1.2"; - sha256 = "1z8wyjsr7mgl120ayfl520i6p6s961380b1xy63zl7qp4cnnbhpn"; + version = "0.0.1.4"; + sha256 = "1nc9favrfr5xxk45rq77zf574m79p5qv3lrngl8yfxdzhbi4q8ld"; libraryHaskellDepends = [ base bytestring path safe-exceptions text ]; @@ -185405,8 +186132,8 @@ self: { pname = "perfect-vector-shuffle"; version = "0.1.1.1"; sha256 = "1z4iv4sv9ld0gvdfa46ll5bsbxi9lckh69paip1c5ijcg78vy5y0"; - revision = "1"; - editedCabalFile = "1pnxrzncwi5qmmyjimjdjhgh65n9kxs663b356rnpdf7brc5bxa0"; + revision = "3"; + editedCabalFile = "1qqfab4jm304wcqgng2fmbwsckhyfyimkbwldc6nisxp7sfp2pz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185835,6 +186562,17 @@ self: { broken = true; }) {}; + "persistent-generic" = callPackage + ({ mkDerivation, base, persistent, text }: + mkDerivation { + pname = "persistent-generic"; + version = "0.1.0.0"; + sha256 = "1a9h7dfj9v47di4pwg3fwzwa550fh8wj2ri1w2kd8xbw9xym5kqk"; + libraryHaskellDepends = [ base persistent text ]; + description = "Derive Persistent classes generically"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-hssqlppp" = callPackage ({ mkDerivation, base, bytestring, hssqlppp, monad-control, mtl , persistent, persistent-template, template-haskell, text, th-lift @@ -185936,8 +186674,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.9.0.2"; - sha256 = "0q78y1ydsvm0jrsi211zq789vy50czhskwq13plv6l2h4860917v"; + version = "2.10.0.0"; + sha256 = "1z895y21raak3x9qw05hgif5qyvr6c7pkc59wzg7irk8mxijyf4n"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -186392,8 +187130,6 @@ self: { ]; description = "Type safe access to multiple database schemata"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "persistent-vector" = callPackage @@ -186919,8 +187655,6 @@ self: { ]; description = "Haskell Debug Adapter for Visual Studio Code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "phone-metadata" = callPackage @@ -188156,8 +188890,6 @@ self: { ]; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-errors" = callPackage @@ -189677,8 +190409,8 @@ self: { }: mkDerivation { pname = "ploton"; - version = "1.1.3.0"; - sha256 = "1bq2qnzlms6j6hl7d728h5mc672h0lpbxcxfh2bz327nhhqid3hn"; + version = "1.2.0.0"; + sha256 = "0qzi5vdn8j4s2338x2m7mbw2n10bdplm1ki3q841acwixh9rr4ak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190491,6 +191223,8 @@ self: { pname = "polyparse"; version = "1.13"; sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w"; + revision = "1"; + editedCabalFile = "09jcn26py3lkjn3lvxgry86bad8xb8cwl3avxymqmf7b181krfb8"; libraryHaskellDepends = [ base bytestring text ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; @@ -190612,8 +191346,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Disambiguate obvious uses of effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "polysemy-zoo" = callPackage @@ -190676,8 +191408,6 @@ self: { ]; description = "Online XML parsing with polyparse and tagsoup"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "polytypeable" = callPackage @@ -190725,8 +191455,8 @@ self: { }: mkDerivation { pname = "pomaps"; - version = "0.1.0.0"; - sha256 = "0vacywl9yg5dyayf34k5sxnf35x0hxwh0dsdglqk243hf9lrd0wz"; + version = "0.2.0.0"; + sha256 = "1a3vf0r69263gpq1aass2x5wcmgrfk16pnsf4wsvrnka5lgnsijp"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -191772,8 +192502,8 @@ self: { pname = "postgresql-libpq"; version = "0.9.4.2"; sha256 = "1y86kysakfcf3zq252yl2llrx3765vxvkdwda4q5ql7ikv3m786f"; - revision = "1"; - editedCabalFile = "0hilyfb2gjh471ia2g8mwjs56ykrgl0qd06vpigwhc493ia7a9mv"; + revision = "2"; + editedCabalFile = "1i0z3c0d657050kfggr5z8y4hmcqkckm2x1gn3fjbdzyx3p1rcaa"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; @@ -191957,8 +192687,8 @@ self: { pname = "postgresql-simple"; version = "0.6.2"; sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv"; - revision = "2"; - editedCabalFile = "1rlawj79mfff915bz5fr62g5ig4pfh77m30xrq8q71s6ql0ly4bj"; + revision = "3"; + editedCabalFile = "0wngpd4187sfz2jhpnnrycfvpd1irz2m798p515mn1ryg1ywmhbr"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -192147,8 +192877,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; - revision = "2"; - editedCabalFile = "1nb1ks6hdfn16389f2yhf37qhjqd2y5wjc1dcp9bjhzd787z7ypr"; + revision = "3"; + editedCabalFile = "02l1g5jiw6idnnax7q2lzayjycgi029pv41njdmwdch57k59vai5"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -193317,22 +194047,29 @@ self: { "preql" = callPackage ({ mkDerivation, aeson, alex, array, base, binary-parser , bytestring, bytestring-strict-builder, contravariant, free, happy - , mtl, postgresql-binary, postgresql-libpq, postgresql-simple, syb - , template-haskell, text, th-lift-instances, time, transformers - , uuid, vector + , mtl, postgresql-binary, postgresql-libpq, scientific, tasty + , tasty-hunit, template-haskell, text, th-lift-instances, time + , transformers, uuid, vector }: mkDerivation { pname = "preql"; - version = "0.1"; - sha256 = "1a5b45vplknan61l0p68559pg7la89ly97mzbqxb5j6v3cifgmcg"; + version = "0.2"; + sha256 = "062px686v2rlpc2bplva900vk35k7hdvxrpjj9dfkj02knqmjxi7"; libraryHaskellDepends = [ aeson array base binary-parser bytestring bytestring-strict-builder contravariant free mtl postgresql-binary postgresql-libpq - postgresql-simple syb template-haskell text th-lift-instances time + scientific template-haskell text th-lift-instances time transformers uuid vector ]; libraryToolDepends = [ alex happy ]; - description = "experiments with SQL"; + testHaskellDepends = [ + aeson array base binary-parser bytestring bytestring-strict-builder + contravariant free mtl postgresql-binary postgresql-libpq + scientific tasty tasty-hunit template-haskell text + th-lift-instances time transformers uuid vector + ]; + testToolDepends = [ alex happy ]; + description = "safe PostgreSQL queries using Quasiquoters"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -193861,6 +194598,17 @@ self: { broken = true; }) {}; + "prim" = callPackage + ({ mkDerivation, ghc-prim }: + mkDerivation { + pname = "prim"; + version = "0.1.0.1"; + sha256 = "01h93hrlmz3aps1xic8arkh7s28jnch5b47lpn4rxazi0fr8pgdw"; + libraryHaskellDepends = [ ghc-prim ]; + description = "An ergonomic but conservative interface to ghc-prim"; + license = stdenv.lib.licenses.mit; + }) {}; + "prim-array" = callPackage ({ mkDerivation, base, ghc-prim, primitive, semigroups }: mkDerivation { @@ -194872,8 +195620,8 @@ self: { pname = "product-profunctors"; version = "0.10.0.0"; sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd"; - revision = "3"; - editedCabalFile = "09czbjfn7kwg18726401dhlpkd5gibkk96wzczn9lngpl730jhm9"; + revision = "4"; + editedCabalFile = "0vf9w949qfi6p1nqr0cxb9shxdz15mmrd8r0w4gxid56fjc2kaia"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -195688,21 +196436,22 @@ self: { }) {}; "prosidy" = callPackage - ({ mkDerivation, aeson, aeson-diff, aeson-pretty, base, binary - , bytestring, containers, contravariant, deepseq, directory - , filepath, hashable, megaparsec, profunctors, tagged, tasty - , tasty-ant-xml, tasty-golden, tasty-hunit, tasty-quickcheck, text - , transformers, unordered-containers, vector + ({ mkDerivation, aeson, aeson-diff, aeson-pretty, base + , base-compat-batteries, binary, bytestring, containers, deepseq + , directory, filepath, hashable, megaparsec, prettyprinter + , profunctors, tagged, tasty, tasty-ant-xml, tasty-golden + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "prosidy"; - version = "1.6.0.1"; - sha256 = "1yd36sjs342may33fbrpzgaghql03wjgprbllkms8pr6d16z8m49"; + version = "1.6.0.2"; + sha256 = "1961zr94cn6vza66ndd3hjh3ksm5c70bc2nr33nhvyna9q9hzs5w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base binary bytestring containers contravariant deepseq - hashable megaparsec profunctors tagged text transformers - unordered-containers vector + aeson base base-compat-batteries binary bytestring containers + deepseq hashable megaparsec prettyprinter profunctors tagged text + transformers unordered-containers vector ]; testHaskellDepends = [ aeson aeson-diff aeson-pretty base bytestring containers directory @@ -197724,8 +198473,8 @@ self: { }: mkDerivation { pname = "pvar"; - version = "0.1.1.0"; - sha256 = "1fzcv2bzm9hf879a6vcgcsmyjn4fhpl9smz8phi6bq1acfzkg026"; + version = "0.2.0.0"; + sha256 = "183pc9xk4b62rrmchzqxi1wvys8k118zi7060wr0xm2azn7wny6h"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ async base deepseq genvalidity hspec primitive QuickCheck @@ -198438,6 +199187,27 @@ self: { broken = true; }) {}; + "quarantimer" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, directory + , filepath, lucid, process, sandi, servant, servant-client + , servant-lucid, servant-multipart, servant-server, stm, text, time + , uuid, wai, wai-extra, warp, warp-tls + }: + mkDerivation { + pname = "quarantimer"; + version = "1.20200326"; + sha256 = "1q0rraxq1gv86chi64ijxxkx4dm8w9v2610wj58315bap3d3m91c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base bytestring directory filepath lucid process sandi + servant servant-client servant-lucid servant-multipart + servant-server stm text time uuid wai wai-extra warp warp-tls + ]; + description = "Coronavirus quarantine timer web app for your things"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "qudb" = callPackage ({ mkDerivation, alex, array, base, bytestring, directory, happy , mtl, snappy @@ -198853,8 +199623,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.22"; sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax"; - revision = "2"; - editedCabalFile = "1ia5fjhpg7rz793552v88gv2iqx7hl9mi2g09m0llasy1cpzc9jr"; + revision = "4"; + editedCabalFile = "0wx4jcmiv6f3iwc92wf4l2j9025bv4997rn2ycl08ld585m1xlgv"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific splitmix tagged text time @@ -200130,6 +200900,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rainbox_0_26_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, lens, QuickCheck + , rainbow, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "rainbox"; + version = "0.26.0.0"; + sha256 = "07hh904p0mlc3iww184849yps80kwrhdna9nr840m2qyd81m37d1"; + libraryHaskellDepends = [ + base bytestring containers lens rainbow text + ]; + testHaskellDepends = [ + base bytestring containers lens QuickCheck rainbow tasty + tasty-quickcheck text + ]; + description = "Two-dimensional box pretty printing, with colors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rake" = callPackage ({ mkDerivation, base, containers, text }: mkDerivation { @@ -200225,6 +201015,8 @@ self: { pname = "ral"; version = "0.1"; sha256 = "0h8jqaapagrp9faixq817lib8l4nq4ycjj6ppl1ra8llnfsz5304"; + revision = "2"; + editedCabalFile = "0a3ryzcmjgyp64f8s2pl95pkz8zddq9qsn76dlimg23gczf1cql4"; libraryHaskellDepends = [ adjunctions base bin deepseq distributive fin hashable QuickCheck semigroupoids @@ -200240,6 +201032,8 @@ self: { pname = "ral-lens"; version = "0.1"; sha256 = "0hm8mzj51hdql8rp3v0yvmcvmgha4ys8zsgbbx93mlp2b4rfhzpv"; + revision = "1"; + editedCabalFile = "0j7lxlbj2klhcx12xixp3glhbvc9k1pccaiqm2kqr5l3lkrcnirv"; libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; license = stdenv.lib.licenses.gpl2Plus; @@ -200510,8 +201304,6 @@ self: { ]; description = "Additional functions for random values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "random-fu" = callPackage @@ -200529,8 +201321,6 @@ self: { ]; description = "Random number generation"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "random-fu-multivariate" = callPackage @@ -200543,8 +201333,6 @@ self: { testHaskellDepends = [ base ]; description = "Multivariate distributions for random-fu"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "random-hypergeometric" = callPackage @@ -200752,6 +201540,8 @@ self: { pname = "range-set-list"; version = "0.1.3.1"; sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j"; + revision = "1"; + editedCabalFile = "0ma1gxmk2in2fj4rxhwshy2zq690ylw1zz0c9cnyin8mxkp96inc"; libraryHaskellDepends = [ base containers deepseq hashable ]; testHaskellDepends = [ base containers deepseq hashable tasty tasty-quickcheck @@ -200822,8 +201612,6 @@ self: { ]; description = "Find the rank product of a data set"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rank1dynamic" = callPackage @@ -202314,20 +203102,21 @@ self: { }) {}; "readme-lhs" = callPackage - ({ mkDerivation, base, containers, doctest, pandoc, pandoc-types - , protolude, text, transformers + ({ mkDerivation, attoparsec, base, blaze-html, containers, doctest + , foldl, pandoc, pandoc-types, protolude, text, transformers }: mkDerivation { pname = "readme-lhs"; - version = "0.3.0"; - sha256 = "1w113jr7sjmq4wkilwjmcaic6sgxp3vzg67dfs0imbd730xhqda8"; + version = "0.5.0"; + sha256 = "01h1zaa14v1hfj7gzm7y1x1rf8mh2w10h1x8k3z3y05kgsfhaspa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers pandoc pandoc-types protolude text transformers + attoparsec base blaze-html containers foldl pandoc pandoc-types + protolude text transformers ]; - executableHaskellDepends = [ base protolude ]; - testHaskellDepends = [ base doctest protolude ]; + executableHaskellDepends = [ base protolude text ]; + testHaskellDepends = [ base containers doctest ]; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -202511,7 +203300,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_6_0_1" = callPackage + "rebase_1_6_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, contravariant-extras, deepseq, dlist, either , hashable, mtl, profunctors, scientific, selective, semigroupoids @@ -202520,8 +203309,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.6.0.1"; - sha256 = "0w0vy4y2v09a9v8qjqcxq5nqrdk8c1mw7lak9mwv16j59bcijn0x"; + version = "1.6.1"; + sha256 = "020aw7wlgx8nqbq6ara13szgxw2q0n0hx3vrsn2lfp53b2jdsvax"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant contravariant-extras deepseq dlist either hashable mtl profunctors @@ -202607,6 +203396,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "record-dot-preprocessor_0_2_3" = callPackage + ({ mkDerivation, base, extra, filepath, ghc, record-hasfield + , uniplate + }: + mkDerivation { + pname = "record-dot-preprocessor"; + version = "0.2.3"; + sha256 = "0pmy59xihjsn31ahq76cjsla779b4vidzf7m9g4j8z88pk65rk7z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base extra ghc uniplate ]; + executableHaskellDepends = [ base extra ]; + testHaskellDepends = [ base extra filepath record-hasfield ]; + description = "Preprocessor to allow record.field syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "record-encode" = callPackage ({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck , vector @@ -203308,8 +204115,6 @@ self: { testHaskellDepends = [ base doctest QuickCheck ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "refined-http-api-data" = callPackage @@ -203321,8 +204126,6 @@ self: { libraryHaskellDepends = [ base http-api-data refined text ]; description = "http-api-data instances for refined types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "refinery" = callPackage @@ -203399,8 +204202,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.6.4.1"; - sha256 = "0zm5jgjn4r59h8r0180mkmfnggqv4mgg52vqfwpnz20dv942wzcb"; + version = "0.7.0.0"; + sha256 = "107xi9mwz20zcn9s941lfdyx79py3yvqn7117yqa2h7lnimda9fm"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -204174,8 +204977,8 @@ self: { pname = "regex-applicative-text"; version = "0.1.0.1"; sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh"; - revision = "4"; - editedCabalFile = "0ykzppl1v6k70idjl73m4w161f6lsax89v1gp100y4xgipf3yijj"; + revision = "5"; + editedCabalFile = "1jgmhqhlhj9zhxwikmhiq71fj1900iqiyg6r9l5y7xjk7arwscmi"; libraryHaskellDepends = [ base regex-applicative text ]; description = "regex-applicative on text"; license = stdenv.lib.licenses.bsd3; @@ -204187,6 +204990,8 @@ self: { pname = "regex-base"; version = "0.94.0.0"; sha256 = "055rlq67xnbqv43fgrlw6d7s8nhyavahrp6blihwjmqizksq47y4"; + revision = "1"; + editedCabalFile = "13lnky4ps9as73jqrwz4aqn5sfyrcz2zj2ng52xzz512fv59baj4"; libraryHaskellDepends = [ array base bytestring containers mtl text ]; @@ -204447,6 +205252,8 @@ self: { pname = "regex-posix"; version = "0.96.0.0"; sha256 = "08a584jabmmn5gmaqrcar5wsp3qzk0hklldzp2mr2bmvlvqh04r5"; + revision = "1"; + editedCabalFile = "1cy39n1928wv55i7k4wm7zd3xijk7p54kbrxxlfzfvgax5k163b9"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -204493,6 +205300,8 @@ self: { pname = "regex-tdfa"; version = "1.3.1.0"; sha256 = "1h1fliv2zjxwmddl9wnn7ckxxpgy1049hdfg6fcknyrr7mw7dhqm"; + revision = "1"; + editedCabalFile = "1fhi4g2p29qnnfyb211n62g97qrw3gz1kahca7rlz43all93ihdy"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -205142,18 +205951,19 @@ self: { }) {}; "relation" = callPackage - ({ mkDerivation, base, containers, hedgehog, hspec, hspec-discover - , hw-hspec-hedgehog + ({ mkDerivation, base, containers, doctest, doctest-discover + , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog }: mkDerivation { pname = "relation"; - version = "0.5"; - sha256 = "13vzx6hq7ncd9z05ikvls60xp5dc4f7qb926s8df26zll4ayndlb"; + version = "0.5.1.0"; + sha256 = "0hsixpln8wf47cqan8yhx86n1k1vww35l4zzf0bjarqazd060pyv"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ - base containers hedgehog hspec hw-hspec-hedgehog + base containers doctest doctest-discover hedgehog hspec + hw-hspec-hedgehog ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -205292,21 +206102,6 @@ self: { "relational-schemas" = callPackage ({ mkDerivation, base, bytestring, containers, relational-query - , template-haskell, time - }: - mkDerivation { - pname = "relational-schemas"; - version = "0.1.7.0"; - sha256 = "1yhgn2sjq7530s31fyyaxms5vnqwl03pwvsn0sm8f6yyzjvwm38b"; - libraryHaskellDepends = [ - base bytestring containers relational-query template-haskell time - ]; - description = "RDBMSs' schema templates for relational-query"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-schemas_0_1_8_0" = callPackage - ({ mkDerivation, base, bytestring, containers, relational-query , sql-words, template-haskell, time }: mkDerivation { @@ -205319,7 +206114,6 @@ self: { ]; description = "RDBMSs' schema templates for relational-query"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relative-date" = callPackage @@ -205729,8 +206523,8 @@ self: { pname = "repa"; version = "3.4.1.4"; sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; - revision = "3"; - editedCabalFile = "17hxj42cm82sac42by78jgbjjn5r3qv7n4919llaq17a2k1np0sw"; + revision = "4"; + editedCabalFile = "0bay8j0fm7l2nhrbdvy9fvrb6hgkrk5qx9y03az2kakvjdc4gvvh"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -206056,8 +206850,8 @@ self: { }: mkDerivation { pname = "replace-attoparsec"; - version = "1.2.0.0"; - sha256 = "0b3f3i4vhnn4d71bsjjdrspca20nk52wn8a6dnanf53x408jfkay"; + version = "1.2.1.0"; + sha256 = "0i88mylhbm3hx7rj59ms125xnzinxrcjv98df73xzzz54cjf123j"; libraryHaskellDepends = [ attoparsec base bytestring text ]; testHaskellDepends = [ attoparsec base bytestring Cabal parsers text @@ -206066,6 +206860,22 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "replace-attoparsec_1_2_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text + }: + mkDerivation { + pname = "replace-attoparsec"; + version = "1.2.2.0"; + sha256 = "1byrd62j7aafjn959xciam6s17zjvrisfi6q4y6ndvla77rg09cm"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal parsers text + ]; + description = "Find, replace, and edit text patterns with Attoparsec parsers (instead of regex)"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replace-megaparsec" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: mkDerivation { @@ -206078,15 +206888,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "replace-megaparsec_1_3_1_0" = callPackage + "replace-megaparsec_1_3_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: mkDerivation { pname = "replace-megaparsec"; - version = "1.3.1.0"; - sha256 = "074vbw5gc3sg2qsj9zlcjdgzdjc8yxa369dvx2w2adl0jv4dk5ib"; + version = "1.3.2.0"; + sha256 = "0bhxjk2yc0h49i9b8irszhgg5041s63clrrcrd6l58s2nmfr3zw5"; libraryHaskellDepends = [ base bytestring megaparsec text ]; testHaskellDepends = [ base bytestring Cabal megaparsec text ]; - description = "Find, replace, and edit text patterns with Megaparsec parsers"; + description = "Find, replace, and edit text patterns with Megaparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -206159,6 +206969,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "repline_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, exceptions, haskeline, mtl + , process + }: + mkDerivation { + pname = "repline"; + version = "0.3.0.0"; + sha256 = "0niihfyggg2qisadg7w49cr5k5qyyynia93iip0ng2bbmzwi88g8"; + libraryHaskellDepends = [ + base containers exceptions haskeline mtl process + ]; + testHaskellDepends = [ base containers mtl process ]; + description = "Haskeline wrapper for GHCi-like REPL interfaces"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "repo-based-blog" = callPackage ({ mkDerivation, base, blaze-html, containers, data-default , directory, dyre, filepath, filestore, hspec, hspec-discover @@ -206409,8 +207236,6 @@ self: { ]; description = "A local http server to catch the HTTP redirect"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "request-monad" = callPackage @@ -206467,6 +207292,8 @@ self: { pname = "rere"; version = "0.1"; sha256 = "0hskndalxqmlwscvacqmp7gbp8m75a8hnvbifw0hw7hhszlf0yac"; + revision = "1"; + editedCabalFile = "0k2fcc94dlcf33by0zcqk01i9k2g8x4j8rnlpfmabld9dvf5cjwg"; libraryHaskellDepends = [ base containers fin parsec QuickCheck transformers vec ]; @@ -206493,12 +207320,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_6_0_1" = callPackage + "rerebase_1_6_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.6.0.1"; - sha256 = "07ddcmm2yx71nvgcbj87skrx5pfzsqhi87dxn7vv41ssibv714fk"; + version = "1.6.1"; + sha256 = "0lyi925jk6jbi3qc5xmv61ag07ff9d3xxmf9hfjlblqw2y9fsy93"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -206622,8 +207449,8 @@ self: { }: mkDerivation { pname = "resolv"; - version = "0.1.1.3"; - sha256 = "10y9x63m2w87qfmx9fxjfliq9881cp1x8zkf94sb0hq52rgxd3r4"; + version = "0.1.2.0"; + sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -207082,8 +207909,6 @@ self: { ]; description = "Easy Git repository serialization"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "restricted-workers" = callPackage @@ -207248,10 +208073,8 @@ self: { }: mkDerivation { pname = "retrie"; - version = "0.1.0.0"; - sha256 = "0x8mc4w6w1pr8k9cmhnb4wad2brqj37qfhkg1vm47zmv3r5sza3s"; - revision = "1"; - editedCabalFile = "1gxd78fpn7pw30k0p70vgrr82qcbq4397fk41c4i7rb7m0y4kk3j"; + version = "0.1.0.1"; + sha256 = "01giwrn6cxkpcjflarpphyvbz6japjq6xjilpg29wfq40c64nzyn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207976,8 +208799,6 @@ self: { libraryHaskellDepends = [ ascetic base MissingH ]; description = "Integrated pretty-printing and error/static analysis reporting"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ridley" = callPackage @@ -208166,6 +208987,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio_0_1_15_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, microlens, mtl, primitive + , process, QuickCheck, text, time, typed-process, unix, unliftio + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.15.0"; + sha256 = "0171sgxysksyhpcnpqrlawp1zrb279a0lr9bp5j5f4g0ak59h4p6"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens mtl primitive process text time typed-process + unix unliftio unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens mtl primitive process QuickCheck text time + typed-process unix unliftio unliftio-core unordered-containers + vector + ]; + description = "A standard library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rio-orphans" = callPackage ({ mkDerivation, base, exceptions, fast-logger, hspec , monad-control, monad-logger, resourcet, rio, transformers-base @@ -210084,6 +210931,17 @@ self: { broken = true; }) {}; + "run-haskell-module" = callPackage + ({ mkDerivation, base, data-default, filepath, process }: + mkDerivation { + pname = "run-haskell-module"; + version = "0.0.2"; + sha256 = "1ra8rv7cbsj1x8vfd3sbynd7a73v9arfimzcfhg9j6blqcii2i2d"; + libraryHaskellDepends = [ base data-default filepath process ]; + description = "Running newly generated Haskell source module"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "run-st" = callPackage ({ mkDerivation, base, primitive, primitive-unlifted }: mkDerivation { @@ -210198,8 +211056,6 @@ self: { ]; description = "Random Variables"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rwlock" = callPackage @@ -210492,8 +211348,6 @@ self: { ]; description = "Automatic JSON format versioning"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-lazy-io" = callPackage @@ -210635,8 +211489,6 @@ self: { ]; description = "Instances from the xmlbf library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-plugins" = callPackage @@ -210906,6 +211758,25 @@ self: { broken = true; }) {}; + "sak" = callPackage + ({ mkDerivation, base, bytestring, bz2, cpphs, directory, filepath + , lz4-hs, lzlib, lzma, optparse-applicative, zlib, zstd + }: + mkDerivation { + pname = "sak"; + version = "0.1.1.0"; + sha256 = "0k40jkdg2029h549zgkq4ciayx162lb280l4lkna47dd3r5mf3xd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring bz2 directory filepath lz4-hs lzlib lzma + optparse-applicative zlib zstd + ]; + executableToolDepends = [ cpphs ]; + description = "Compression command-line tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sakuraio-platform" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, time , unordered-containers @@ -210934,37 +211805,10 @@ self: { }: mkDerivation { pname = "salak"; - version = "0.3.5.3"; - sha256 = "0k6z2vjxg6za6rfhx1xgjdck7ainnsbhrvzav2ngwpvy8li5g02b"; - revision = "1"; - editedCabalFile = "138c763crbfipcb9ss1lk3wx3482nm2v4zbm3k88h6jszxhmxvav"; - libraryHaskellDepends = [ - base bytestring containers data-default directory dlist exceptions - filepath hashable heaps megaparsec mtl scientific text time - unliftio-core unordered-containers - ]; - testHaskellDepends = [ - base hspec mtl QuickCheck random scientific text - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base criterion data-default mtl text time - ]; - description = "Configuration (re)Loader and Parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "salak_0_3_6" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, directory, dlist, exceptions, filepath, hashable - , heaps, hspec, hspec-discover, megaparsec, mtl, QuickCheck, random - , scientific, text, time, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "salak"; version = "0.3.6"; sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3"; + revision = "1"; + editedCabalFile = "1ra0bbk3xkfsy5p78q57abjwmn95kmfjpvsldm4s1455bg2yhi26"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions filepath hashable heaps megaparsec mtl scientific text time @@ -210980,7 +211824,6 @@ self: { ]; description = "Configuration (re)Loader and Parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salak-toml" = callPackage @@ -211015,6 +211858,8 @@ self: { pname = "salak-yaml"; version = "0.3.5.3"; sha256 = "07wcwld58bdr8n5fdfq98x6c1xdr8rrx919y4f9y7abdnc4aj000"; + revision = "1"; + editedCabalFile = "0x1wkd2yqmgd0lxy45d3w8p53ms942am14flc0m2jz6dk9vi3k7a"; libraryHaskellDepends = [ base conduit libyaml salak text ]; testHaskellDepends = [ base conduit exceptions hspec libyaml mtl QuickCheck salak text @@ -212221,15 +213066,17 @@ self: { }) {}; "schema" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: + ({ mkDerivation, base, groom, hspec, msgpack-binary, QuickCheck }: mkDerivation { pname = "schema"; - version = "0.0.1"; - sha256 = "0357j9xn0rw427x2f5pqkzmya9scyqwz3ksn4lyryzvmm9p6lii7"; + version = "0.0.2"; + sha256 = "0wzihrcjx6bha6yibsghcl0l3r3bwcsmnidbm072c16sppbglbqh"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ + base groom hspec msgpack-binary QuickCheck + ]; description = "Encoding-independent schemas for Haskell data types"; - license = stdenv.lib.licenses.agpl3; + license = stdenv.lib.licenses.gpl3; }) {}; "schemas" = callPackage @@ -212434,33 +213281,33 @@ self: { }) {}; "scidb-hquery" = callPackage - ({ mkDerivation, alex, array, base, base-compat, BNFC, bytestring - , Cabal, connection, cryptonite, data-default-class, directory - , exceptions, filepath, happy, haskeline, hostname-validate, HTTP - , http-client, http-client-tls, http-conduit, http-types, memory - , mtl, network, process, regex, safe, split, terminal-size, text - , tls, x509-store + ({ mkDerivation, alex, array, base, BNFC, bytestring, Cabal + , connection, cryptonite, data-default-class, directory, exceptions + , filepath, happy, haskeline, hostname-validate, HTTP, http-client + , http-client-tls, http-conduit, http-types, memory, mtl, network + , process, regex, safe, split, terminal-size, text, tls, x509-store }: mkDerivation { pname = "scidb-hquery"; - version = "2.8.0.436"; - sha256 = "0mkicmfvwc7xg37d46s7xrcsdaff09v7x86npd1bgv1k60m4c8gq"; + version = "2.8.0.437"; + sha256 = "1nxcxfr55rf6ds0hvgbnss5hjf059rdd7y613yc485w8bfmv5cil"; + revision = "1"; + editedCabalFile = "1xbiiaa5rj5nc4if69d97f5spbrsa8jv1mhcrgjkwff6a879274q"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - array base base-compat bytestring connection cryptonite - data-default-class exceptions haskeline hostname-validate HTTP - http-client http-client-tls http-conduit http-types memory mtl - network process regex safe split terminal-size text tls x509-store + array base bytestring connection cryptonite data-default-class + exceptions haskeline hostname-validate HTTP http-client + http-client-tls http-conduit http-types memory mtl network process + regex safe split terminal-size text tls x509-store ]; libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ - array base base-compat bytestring connection cryptonite - data-default-class directory exceptions filepath haskeline - hostname-validate HTTP http-client http-client-tls http-conduit - http-types memory mtl network process regex safe split - terminal-size text tls x509-store + array base bytestring connection cryptonite data-default-class + directory exceptions filepath haskeline hostname-validate HTTP + http-client http-client-tls http-conduit http-types memory mtl + network process regex safe split terminal-size text tls x509-store ]; description = "Haskell query for SciDB via shim"; license = stdenv.lib.licenses.gpl3; @@ -214009,14 +214856,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "selective_0_4" = callPackage + "selective_0_4_1" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, tasty , tasty-expected-failure, tasty-quickcheck, transformers }: mkDerivation { pname = "selective"; - version = "0.4"; - sha256 = "0kwf6s21gc64nl04rvaydz838kjf7b7xgw1vvyvr44mf36ggcv2p"; + version = "0.4.1"; + sha256 = "1pwbfayh4s6afhkgyvyq187m4vcnyvy3frb1zxjs7xjb2sxp9r80"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers mtl QuickCheck tasty tasty-expected-failure @@ -214144,8 +214991,8 @@ self: { }: mkDerivation { pname = "semantic-source"; - version = "0.0.2.0"; - sha256 = "072iax2d2nhskpmm754ii28qdfvxrbwpvgix0igrrfaa52pcw286"; + version = "0.1.0.0"; + sha256 = "179rxsn1cyh77yn7vzmii38ipgcjpavlyf5xbx4j8zzgh1jklmc5"; libraryHaskellDepends = [ aeson base bytestring containers deepseq generic-monoid hashable lingo pathtype semilattices text @@ -214219,6 +215066,8 @@ self: { pname = "semialign"; version = "1.1"; sha256 = "1n47w9c6i6azb4w65rzhci00v6p9c0s1w1givd2q3smkgyziiqpk"; + revision = "1"; + editedCabalFile = "0rfnjzbzzclzh2a1m5wpzzsqf8hrkrqnc90pflshb40i7rwkm6xf"; libraryHaskellDepends = [ base base-compat containers hashable semigroupoids tagged these transformers unordered-containers vector @@ -214253,6 +215102,8 @@ self: { pname = "semialign-indexed"; version = "1.1"; sha256 = "1b6amfhwk968ah56w8vala3hbpzf9mfza2ajhdnvzcdiyqyxvwb0"; + revision = "1"; + editedCabalFile = "1g7b15xki938vljmkcwnz1hvqfp77ja39cxnfnwd5j507a0qp800"; libraryHaskellDepends = [ base containers hashable lens semialign these unordered-containers vector @@ -216085,8 +216936,6 @@ self: { ]; description = "Helpers for using ekg with servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-elm" = callPackage @@ -217351,8 +218200,6 @@ self: { ]; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-stache" = callPackage @@ -217717,8 +218564,6 @@ self: { ]; description = "Automatically generate Elm clients for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-tracing" = callPackage @@ -217812,8 +218657,6 @@ self: { ]; description = "Servant support for the XML Content-Type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-yaml" = callPackage @@ -218077,8 +218920,6 @@ self: { ]; description = "Snap bindings for serversession"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "serversession-frontend-wai" = callPackage @@ -218274,8 +219115,8 @@ self: { }: mkDerivation { pname = "set-cover"; - version = "0.1"; - sha256 = "1yidgc1nbhbkxpchd96vzfgkk95hdwgpvd9ys2b4xw2m1zyzi1kb"; + version = "0.1.1"; + sha256 = "04jjcmjll0azz24rx91p0dp5b8ya5jc0qacr21764ri1dbkfflgw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218387,16 +219228,14 @@ self: { pname = "setgame"; version = "1.1"; sha256 = "1hr2kb4d7m22d48gh74h5z8c6shkprincf0qb9wc2fq2hj7c3c1l"; - revision = "1"; - editedCabalFile = "1shkmfmjnvc47gy9ck6knf94571if4qjm92c1p8kji9v0n24yzfw"; + revision = "2"; + editedCabalFile = "0cb1vajyh3fxrkq97cvlkvpskgrnn4zs2gk8al9dcnn3dq0j3v58"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base random vty ]; executableHaskellDepends = [ base ]; description = "A console interface to the game of Set"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "setlocale" = callPackage @@ -218989,15 +219828,15 @@ self: { }) {}; "shake-bindist" = callPackage - ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, shake - , zlib, zstd + ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, lzma + , shake, zlib, zstd }: mkDerivation { pname = "shake-bindist"; - version = "1.0.0.0"; - sha256 = "0fzq62a8rjh9jc9dc7rfi6ypp0fax7fhlf632a30mrbpk1hqyfz8"; + version = "1.0.1.0"; + sha256 = "0rlbn367czab885l44k698wiyavs0jf1rbzn4hk48mfhqxpcihky"; libraryHaskellDepends = [ - archive-sig base bytestring bz2 lzlib shake zlib zstd + archive-sig base bytestring bz2 lzlib lzma shake zlib zstd ]; description = "Rules for binary distributions"; license = stdenv.lib.licenses.bsd3; @@ -219691,6 +220530,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shell-utility_0_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shell-utility"; + version = "0.1"; + sha256 = "1n15v0avvkxvczmyjc6g4z9axr5c61n8jlpa1cm4xr3qk7spm1mi"; + libraryHaskellDepends = [ base ]; + description = "Utility functions for writing command-line programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shellish" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , process, strict, time, unix-compat @@ -220159,6 +221010,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "show-combinators_0_2_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "show-combinators"; + version = "0.2.0.0"; + sha256 = "07ds87ldl9165hj3k5h84iawc6vqlbggni3dg1nhbxww1spxn0n9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Combinators to write Show instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-please" = callPackage ({ mkDerivation, base, mtl, parsec, template-haskell, th-orphans , time @@ -220770,8 +221634,8 @@ self: { ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.5"; - sha256 = "097b8qv0755p0iq6bcw6ndvvvv017x9hgf6l2zvb3sgqdg9wlj88"; + version = "0.1.6"; + sha256 = "18dikz7hy61wgrbpgnxmgfp1i485hkhgrdnqbkzl2mrmmjn8p1zd"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = stdenv.lib.licenses.bsd3; @@ -221801,8 +222665,8 @@ self: { pname = "singleton-bool"; version = "0.1.5"; sha256 = "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0"; - revision = "1"; - editedCabalFile = "1g2dchvp5clg3hfdrp7hf5pbl9kcyhqhnqxqxd7n861nfd661wqd"; + revision = "2"; + editedCabalFile = "118j0h29nqg2acqbzif2ffqnanjbwnqmv2kch9z7xiwqkz6iq8an"; libraryHaskellDepends = [ base dec ]; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; @@ -221825,8 +222689,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.4.3"; - sha256 = "0xj5w6dszm832y90qxmwqnyiwpav30q199cjcdbdxr7q1d4klszi"; + version = "0.4.4"; + sha256 = "14am0aggfrnd2w5g8cjljx0vmmrhy6r36xpkfrxpralhkr7h52m8"; libraryHaskellDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; @@ -221866,6 +222730,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singletons_2_7" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, deepseq + , directory, filepath, ghc-boot-th, mtl, pretty, process, syb + , tasty, tasty-golden, template-haskell, text, th-desugar + , transformers, turtle + }: + mkDerivation { + pname = "singletons"; + version = "2.7"; + sha256 = "0az22as3rbzkfzv6a4m779qgibwah5r77l0zdgml9x7ajpkdcaz1"; + revision = "1"; + editedCabalFile = "18vd0jnr3skf2fmj13g06gjjzgmw5rnsjqwivsmqs3pkfv9qi3sm"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl pretty syb template-haskell text + th-desugar transformers + ]; + testHaskellDepends = [ + base bytestring deepseq filepath process tasty tasty-golden text + turtle + ]; + description = "A framework for generating singleton types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singletons-presburger" = callPackage ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection , singletons @@ -222068,8 +222958,6 @@ self: { ]; description = "A simple to understand static site generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sixfiguregroup" = callPackage @@ -222374,8 +223262,6 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "skip-list" = callPackage @@ -222459,6 +223345,24 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "skylighting_0_8_3_4" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , skylighting-core + }: + mkDerivation { + pname = "skylighting"; + version = "0.8.3.4"; + sha256 = "1fqjz2s8i9i235mrp4364ycidax2zl7xrgcahsqpbr4cx7vgy9qz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers skylighting-core + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -222491,6 +223395,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skylighting-core_0_8_3_4" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random + , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, text, transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.8.3.4"; + sha256 = "0jcryl83873jjn6lximl1pnshf84nlln1hdvrdcybhrpjyd56qdc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe text transformers + utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -222756,8 +223693,6 @@ self: { ]; description = "Generate C++ skeletons from slice files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sliceofpy" = callPackage @@ -223246,6 +224181,31 @@ self: { broken = true; }) {}; + "smarties" = callPackage + ({ mkDerivation, base, haskeline, hspec, ilist, microlens + , microlens-th, MonadRandom, mtl, QuickCheck, random, text, vector + }: + mkDerivation { + pname = "smarties"; + version = "1.2.1"; + sha256 = "0560d49crj5s9xpj8sk552qdqm19grj87lyqif0dxypc7qpn3dc8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base microlens microlens-th MonadRandom mtl QuickCheck random text + ]; + executableHaskellDepends = [ + base haskeline ilist microlens microlens-th MonadRandom mtl + QuickCheck random text vector + ]; + testHaskellDepends = [ + base hspec microlens microlens-th MonadRandom mtl QuickCheck random + text + ]; + description = "Haskell Behavior Tree Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smartword" = callPackage ({ mkDerivation, base, haskell98, pretty, unix, utf8-string }: mkDerivation { @@ -224350,8 +225310,6 @@ self: { ]; description = "Serve javascript files compiled with GHCJS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "snaplet-hasql" = callPackage @@ -225343,8 +226301,6 @@ self: { ]; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "soap-tls" = callPackage @@ -225762,6 +226718,8 @@ self: { pname = "some"; version = "1.0.1"; sha256 = "13dpvxswjcsmic8h2vayp77qzl820gg4g29g5n2xcja8gnzjkkii"; + revision = "1"; + editedCabalFile = "0gpr24rf427l82d8gb3x97yj03vc2v8ky3b6m1gb4j3g4yvvmr96"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -225794,8 +226752,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "sop-core"; - version = "0.5.0.0"; - sha256 = "12zqdr0g4s3fr6710ngph0fr06lbc12c849izcl4cjj4g9w3v3zz"; + version = "0.5.0.1"; + sha256 = "1c4xk4bw1ij4gpgy35iv08bhcxhv1siy55qnvp2xd6wcc3qnghys"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; license = stdenv.lib.licenses.bsd3; @@ -226526,8 +227484,8 @@ self: { }: mkDerivation { pname = "spdx"; - version = "1.0.0.1"; - sha256 = "00j0dqx9hrlpqy1jml85nykg0xl108q45ljan385bzb5nnap36l6"; + version = "1.0.0.2"; + sha256 = "0aydw4gwhvy45jgk038jnzhzgq8ijg16fk48appn67jn1c3yi0xj"; libraryHaskellDepends = [ base Cabal containers transformers ]; testHaskellDepends = [ base base-compat Cabal tasty tasty-quickcheck @@ -227015,8 +227973,6 @@ self: { ]; description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "splines" = callPackage @@ -227761,20 +228717,21 @@ self: { , network-uri, pretty, process, process-extras, pureMD5, QuickCheck , random, safecopy, show-combinators, show-please, syb , template-haskell, text, th-lift, th-lift-instances, th-orphans - , time, unix, Unixutils, userid, uuid, uuid-orphans, uuid-types - , zlib + , time, transformers, unexceptionalio-trans, unix, Unixutils + , userid, uuid, uuid-orphans, uuid-types, zlib }: mkDerivation { pname = "sr-extra"; - version = "1.64"; - sha256 = "18yrl19dzjwfp56xam7m4d61wrxl224lz8jhi198j78pq6b4d1vl"; + version = "1.72.3"; + sha256 = "0jm7r0lxcwppc85rpyasq6grqqkcwhxs0clwyasicqklkcx2l5xw"; libraryHaskellDepends = [ base bytestring bzlib Cabal cereal containers Diff directory exceptions fgl filemanip filepath generic-data hslogger HUnit lens ListLike mmorph mtl network-uri pretty process process-extras pureMD5 QuickCheck random safecopy show-combinators show-please syb template-haskell text th-lift th-lift-instances th-orphans time - unix Unixutils userid uuid uuid-orphans uuid-types zlib + transformers unexceptionalio-trans unix Unixutils userid uuid + uuid-orphans uuid-types zlib ]; description = "Module limbo"; license = stdenv.lib.licenses.bsd3; @@ -228489,8 +229446,6 @@ self: { ]; description = "Create etags for Haskell projects based on Stack snapshots"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-templatizer" = callPackage @@ -229405,8 +230360,6 @@ self: { ]; description = "JavaScript and Css files concat for http optimization. Now with LESS support."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "static-tensor" = callPackage @@ -229466,8 +230419,6 @@ self: { libraryHaskellDepends = [ base MissingH ]; description = "Reusable static analysis interfaces and modules"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "statistics" = callPackage @@ -229694,8 +230645,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.3.3"; - sha256 = "1mrd2w1a1nxi4k5lwav6hk8wphfk2j519hwdscj5855a9kk9piba"; + version = "0.2.3.4"; + sha256 = "0b3hkk6m2wpcyj1zkl3az4v2m9cb7djxk7iz00rxz5j13ngxgfci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229969,8 +230920,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; - revision = "3"; - editedCabalFile = "0aa7x22n5ylvryd7bm1j9s12k5xcp9fp5fz9qy03hjicxzlhm07a"; + revision = "4"; + editedCabalFile = "0zxjrsa54g65p7kf5mfpjb897d1add2dfp5dm4xfs5321rs31knv"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -230544,8 +231495,8 @@ self: { ({ mkDerivation, base, semigroups, transformers, utility-ht }: mkDerivation { pname = "storable-record"; - version = "0.0.4.1"; - sha256 = "1waj81810ywbrzizifsrjd0n3803scl8sr248z9nlrc94fz8vg58"; + version = "0.0.5"; + sha256 = "17nf0bx3g169cpslf8prr5h5lvxl389m23rbsyb3kdai45fibpwf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230780,15 +231731,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_50_0" = callPackage + "stratosphere_0_51_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.50.0"; - sha256 = "0nxvrfi3jp0p874gkj25rdlfsb2rskp82bz58c0rply0s5rivlfl"; + version = "0.51.0"; + sha256 = "053q621zw2c0nf08qc232mnh1cn4qxyzshayis6siqabdnjlqnk2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232879,19 +233830,20 @@ self: { }) {}; "stylist" = callPackage - ({ mkDerivation, base, css-syntax, hashable, hspec, network-uri - , QuickCheck, scientific, text, unordered-containers + ({ mkDerivation, async, base, css-syntax, hashable, hspec + , network-uri, QuickCheck, scientific, text, unordered-containers }: mkDerivation { pname = "stylist"; - version = "1.1.1.0"; - sha256 = "0adcw26540a8srlmypjdv41icw5d3j3i2q6i7j92hhssj642bfw4"; + version = "1.2.0.0"; + sha256 = "1b3kz8kp2dda4f0vghbaxc6y29r39k197fzphy4av8p6vxgp2ka0"; libraryHaskellDepends = [ - base css-syntax hashable network-uri text unordered-containers + async base css-syntax hashable network-uri text + unordered-containers ]; testHaskellDepends = [ - base css-syntax hashable hspec network-uri QuickCheck scientific - text unordered-containers + async base css-syntax hashable hspec network-uri QuickCheck + scientific text unordered-containers ]; description = "Apply CSS styles to a document tree"; license = stdenv.lib.licenses.mit; @@ -233263,26 +234215,28 @@ self: { }) {}; "summoner" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , directory, filepath, generic-deriving, gitrev, hedgehog, hspec - , neat-interpolation, optparse-applicative, process, relude - , shellmet, text, time, tomland, tree-diff + ({ mkDerivation, aeson, base, bytestring, colourista, containers + , directory, filepath, generic-data, gitrev, hedgehog, hspec + , hspec-hedgehog, neat-interpolation, optparse-applicative, process + , relude, shellmet, text, time, tomland, tree-diff + , validation-selective }: mkDerivation { pname = "summoner"; - version = "1.4.0.0"; - sha256 = "0niakfpnk86n69n7kazlv2z00g211b9lgp2b8qphlr4xyz3b7fn0"; + version = "2.0.0.0"; + sha256 = "0cphigybxmvh2ff62b100hywqgln6fhsl68yp2049g4wnmvfzgjf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring containers directory filepath - generic-deriving gitrev neat-interpolation optparse-applicative - process relude shellmet text time tomland + aeson base bytestring colourista containers directory filepath + generic-data gitrev neat-interpolation optparse-applicative process + relude shellmet text time tomland validation-selective ]; executableHaskellDepends = [ base relude ]; testHaskellDepends = [ - base directory filepath hedgehog hspec neat-interpolation relude - text tomland tree-diff + base directory filepath hedgehog hspec hspec-hedgehog + neat-interpolation relude text tomland tree-diff + validation-selective ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects"; license = stdenv.lib.licenses.mpl20; @@ -233292,17 +234246,17 @@ self: { "summoner-tui" = callPackage ({ mkDerivation, base, brick, directory, filepath, microlens - , microlens-th, relude, summoner, text, vty + , microlens-th, relude, summoner, text, validation-selective, vty }: mkDerivation { pname = "summoner-tui"; - version = "1.4.0.0"; - sha256 = "0vz4nd5wwjdk8n9n1lwa5b8xs863fkkcq56rwy0fifp1xr4184si"; + version = "2.0.0.0"; + sha256 = "1cgwdfbw55xvmw3k8cbwlcf8773mz1rlsvnf1slsk8kn91irhs9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick directory filepath microlens microlens-th relude - summoner text vty + summoner text validation-selective vty ]; executableHaskellDepends = [ base relude ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI"; @@ -235224,22 +236178,22 @@ self: { }) {UniqueLogicNP = null;}; "synthesizer-llvm" = callPackage - ({ mkDerivation, base, containers, event-list, llvm-extra, llvm-tf - , midi, non-empty, non-negative, numeric-prelude, pathtype + ({ mkDerivation, base, containers, event-list, llvm-dsl, llvm-extra + , llvm-tf, midi, non-empty, non-negative, numeric-prelude, pathtype , QuickCheck, random, semigroups, sox, storable-record - , storable-tuple, storablevector, synthesizer-core - , synthesizer-midi, tfp, transformers, unsafe, utility-ht, vault + , storablevector, synthesizer-core, synthesizer-midi, tfp + , transformers, unsafe, utility-ht, vault }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.8.3"; - sha256 = "1ff56jrk2a3hppw9s1iv167926vcmd9p51mzav73kkaxni1n6hry"; + version = "0.9"; + sha256 = "0bqncysaq164235792657yyf1ngkr7gm9vkzkbiqy6f7g7a62shd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers event-list llvm-extra llvm-tf midi non-empty - non-negative numeric-prelude pathtype random semigroups sox - storable-record storable-tuple storablevector synthesizer-core + base containers event-list llvm-dsl llvm-extra llvm-tf midi + non-empty non-negative numeric-prelude pathtype random semigroups + sox storable-record storablevector synthesizer-core synthesizer-midi tfp transformers unsafe utility-ht vault ]; testHaskellDepends = [ @@ -236455,8 +237409,6 @@ self: { ]; description = "Support library to enable TAI usage on systems with time kept in UTC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tai64" = callPackage @@ -236767,8 +237719,8 @@ self: { pname = "tar"; version = "0.5.1.1"; sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k"; - revision = "1"; - editedCabalFile = "1ni8zym7k6f1hg6wfvnnf3xcs2ar3z8xaabkgjg8q329arjcm8wp"; + revision = "2"; + editedCabalFile = "131f369a2vjzr26r7f2c2p534xvyw0s7cvgvih2ck56lqha58wbs"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -236792,8 +237744,8 @@ self: { }: mkDerivation { pname = "tar-bytestring"; - version = "0.6.3.0"; - sha256 = "18c5493zwwbri2m50a2najbxaqnprxwng48kdcap7qppbvdmra66"; + version = "0.6.3.1"; + sha256 = "09hmsgbjsk2ddnl9hfmhq1l274r7ay2fzs4rmqgs6x09q1kc5i5p"; libraryHaskellDepends = [ array base bytestring containers deepseq hpath-directory hpath-filepath hpath-posix safe-exceptions these time unix word8 @@ -237034,6 +237986,8 @@ self: { pname = "taskwarrior"; version = "0.1.2.2"; sha256 = "0iy2fxgxhjdhi62zbd7iwbvblgr9shlqwg4a92k7b3cd9mqwskv6"; + revision = "1"; + editedCabalFile = "0fyidh845imi20r9h5sh4nvhnzylj5wg1rkfp9zpml7ifvpv609v"; libraryHaskellDepends = [ aeson base bytestring process random text time unordered-containers uuid @@ -237146,6 +238100,8 @@ self: { pname = "tasty-expected-failure"; version = "0.11.1.2"; sha256 = "175gdk1mkslcwjxajkbl4zmaigzf8h4svzd7va5qb519y0dxk28n"; + revision = "1"; + editedCabalFile = "1r367zar3gdad99nh53z7pr1qcw640pkcdv8zgl1b162ds3sv6zz"; libraryHaskellDepends = [ base tagged tasty ]; description = "Mark tasty tests as failure expected"; license = stdenv.lib.licenses.mit; @@ -237608,8 +238564,8 @@ self: { pname = "tasty-test-vector"; version = "0"; sha256 = "1kgz9mp1h391rqj9n78bfvxl8pd3bxanbnwkc5l9gvlygly3fz8j"; - revision = "1"; - editedCabalFile = "13z7fj49hsxs79brh0jrncx5qcqicgzcif9gnbx8y3hbh6qw4bv0"; + revision = "2"; + editedCabalFile = "131ldlbp4ji1m8wayl8h28ykcda29bsvifa3mw8513mnqnndgahc"; libraryHaskellDepends = [ base tasty ]; description = "Test vector support for tasty"; license = stdenv.lib.licenses.bsd3; @@ -238412,8 +239368,6 @@ self: { testHaskellDepends = [ base ]; description = "Command-line tool to log time-tracking information into JIRA Tempo plugin"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tempodb" = callPackage @@ -238868,6 +239822,8 @@ self: { pname = "tensors"; version = "0.1.4"; sha256 = "1wiq38px85ypnfpvbr3hcawrag457z0jvd4jr1bh7jf6qw6jqpfn"; + revision = "1"; + editedCabalFile = "0a96iw75ylygbjdlab5dj3dkkqamd2k1g2nfy6w7ly6j7rq6f84p"; libraryHaskellDepends = [ base deepseq vector ]; testHaskellDepends = [ base deepseq hspec QuickCheck reflection vector @@ -239365,8 +240321,8 @@ self: { pname = "test-framework-quickcheck2"; version = "0.3.0.5"; sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"; - revision = "1"; - editedCabalFile = "1vmpk70h1594h9s216d3ngkb399fpny1d3sh4gg0vrc75p4as68d"; + revision = "2"; + editedCabalFile = "1apgf91van2070m6jhj9w3h2xmr42r4kk0da9crq9994hd8zwny2"; libraryHaskellDepends = [ base extensible-exceptions QuickCheck random test-framework ]; @@ -240163,8 +241119,6 @@ self: { libraryHaskellDepends = [ base MissingH ]; description = "Simple text formatting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "text-generic-pretty" = callPackage @@ -240593,8 +241547,6 @@ self: { testHaskellDepends = [ base hedgehog neat-interpolation text ]; description = "Simple text replacements from a list of search/replace pairs"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "text-short" = callPackage @@ -240606,8 +241558,8 @@ self: { pname = "text-short"; version = "0.1.3"; sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz"; - revision = "1"; - editedCabalFile = "0lb4papn54fbgjdqj4ladaf5q12dhlwkg5z2vc5qxlh35x82sw4a"; + revision = "2"; + editedCabalFile = "17cb7p0qywf2dsrq3g8qb3ssknd9wl5k0nc2pxz9gc3l8rxpkw51"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable text ]; @@ -240631,6 +241583,8 @@ self: { pname = "text-show"; version = "3.8.5"; sha256 = "0xc2269v0bfcvlwm60l2zs6l6lwljfnq5n05n9kp580qybvynzjg"; + revision = "2"; + editedCabalFile = "13s8jn3vaza5103596bq4gash6h2yykzkm8ixf17d2869xg61x1y"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -240662,8 +241616,8 @@ self: { pname = "text-show-instances"; version = "3.8.3"; sha256 = "11v335p3wzf9ijqlkls5mk4m16dfak8fckn4gj7mahs8c7l9lm5d"; - revision = "2"; - editedCabalFile = "001xn2aq5k8hhn5iwhmxv1s3mnxyg630klmmdhbp3lxdb2yq8rha"; + revision = "4"; + editedCabalFile = "0qdnzgwnpgizdm0bvmdwhdf0hwg0kabjswkmnhijkac688rkw1m2"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -241173,6 +242127,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-desugar_1_11" = callPackage + ({ mkDerivation, base, containers, fail, ghc-prim, hspec, HUnit + , mtl, ordered-containers, semigroups, syb, template-haskell + , th-abstraction, th-lift, th-orphans, transformers-compat + }: + mkDerivation { + pname = "th-desugar"; + version = "1.11"; + sha256 = "0ap8dk1a1wl62ggqkg9rb7vna131drrjcd2hn5dw7mwnbc1rxqhl"; + libraryHaskellDepends = [ + base containers fail ghc-prim mtl ordered-containers semigroups syb + template-haskell th-abstraction th-lift th-orphans + transformers-compat + ]; + testHaskellDepends = [ + base containers hspec HUnit mtl syb template-haskell th-lift + th-orphans + ]; + description = "Functions to desugar Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-dict-discovery" = callPackage ({ mkDerivation, base, constraints, template-haskell }: mkDerivation { @@ -241211,6 +242188,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-expand-syns_0_4_6_0" = callPackage + ({ mkDerivation, base, containers, syb, template-haskell }: + mkDerivation { + pname = "th-expand-syns"; + version = "0.4.6.0"; + sha256 = "1dz8bl4yb6sis74knmvqxa21y9yws9l8gafzsi0chaqx15b5asxj"; + libraryHaskellDepends = [ base containers syb template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "Expands type synonyms in Template Haskell ASTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-extras" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -241271,8 +242261,8 @@ self: { }: mkDerivation { pname = "th-instance-reification"; - version = "0.1.5"; - sha256 = "0ssnd45bvz4k0fajc3xlqy7iq92rm0pjn3wwl4brnvaf7l1180q4"; + version = "0.1.5.1"; + sha256 = "0jafxmd767z52my86dh1dk89h6wx2qf11vx4yk9qw563a7xzv6rm"; libraryHaskellDepends = [ base containers list-extras template-haskell th-expand-syns ]; @@ -241282,8 +242272,6 @@ self: { ]; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "th-instances" = callPackage @@ -241592,8 +242580,8 @@ self: { }: mkDerivation { pname = "th-utilities"; - version = "0.2.3.1"; - sha256 = "1sy3bgwc85zw999cya92xsp9jllclwbzw9fmjmhqi4r5kj2gyk96"; + version = "0.2.4.0"; + sha256 = "1c3idsx9fyh9n4d969mibxsyfb2nmivwm65zap3hyl40bnldc39l"; libraryHaskellDepends = [ base bytestring containers directory filepath primitive syb template-haskell text th-orphans @@ -241783,8 +242771,8 @@ self: { pname = "these"; version = "1.0.1"; sha256 = "1k0pi65g7cm9hzdw6my6bzz2zvddkmj1qs45ymqmi316bpiixk3r"; - revision = "1"; - editedCabalFile = "0923r86fnmgpx0msm68aszirh2n19nn5bccgjxfh2146jw4z7w3z"; + revision = "3"; + editedCabalFile = "1z6aqz41m1cdm5q5y4jj4fl9j1qcvi32d08r2a103x5ndhf8151q"; libraryHaskellDepends = [ aeson assoc base base-compat binary deepseq hashable QuickCheck semigroupoids unordered-containers @@ -241799,8 +242787,8 @@ self: { pname = "these-lens"; version = "1"; sha256 = "144ly13qng95mwnfis8dm7n3843z3w2vp4212qawbpw8hw921c7y"; - revision = "1"; - editedCabalFile = "1lrpq5a8ldddmsi7ckaqinamn2f7kkijq5jq05yzdx818b2563wn"; + revision = "2"; + editedCabalFile = "0krnf1arsr05ygqcpfd7p34k7319fwjbg59fqhilrjl6jzzpyaka"; libraryHaskellDepends = [ base base-compat lens these ]; description = "Lenses for These"; license = stdenv.lib.licenses.bsd3; @@ -242081,8 +243069,6 @@ self: { ]; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "threefish" = callPackage @@ -242937,8 +243923,8 @@ self: { pname = "time-parsers"; version = "0.1.2.1"; sha256 = "102k6l9888kbgng045jk170qjbmdnwv2lbzlc12ncybfk2yk7wdv"; - revision = "1"; - editedCabalFile = "00063s6a75sy9fjg5507yix0wizdfx5vangn3yfmfvh3wgw8yj8c"; + revision = "2"; + editedCabalFile = "10bawg6cwfwm31fcs63z8imd1cdl1wq8syn669yfkycrk77wfkli"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -243540,8 +244526,6 @@ self: { ]; description = "Load TimeZoneSeries from an Olson file at compile time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "timezone-series" = callPackage @@ -243926,8 +244910,8 @@ self: { }: mkDerivation { pname = "tldr"; - version = "0.6.2"; - sha256 = "13m88za5pfal00kldqjgag232k563y168ri84acdim8km62b861z"; + version = "0.6.4"; + sha256 = "0gg9zplk8widfiwm5q1pi7fl45hby68c3ljm8p4livrp72s10f9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244561,8 +245545,8 @@ self: { pname = "toml-parser"; version = "0.1.0.0"; sha256 = "0p1nl3009qlcqn4jjggbm1v719a6bswklkyjb3plm0cz3bsyr0fs"; - revision = "2"; - editedCabalFile = "02vblwkja1in6fi3zbvxmw6k1c0zny9jljiis0krvn94h2rdflwd"; + revision = "3"; + editedCabalFile = "1hls6xw2c7379m1x92da91v7mv1ysdsj6shi1nslfq5xgm53bw14"; libraryHaskellDepends = [ array base text time ]; libraryToolDepends = [ alex happy ]; description = "Parser for the TOML configuration language"; @@ -244910,10 +245894,8 @@ self: { }: mkDerivation { pname = "topograph"; - version = "1"; - sha256 = "0vm7ja5f677lpphfmggx68h144k0fzj0n6r6ypf5474da405xad7"; - revision = "2"; - editedCabalFile = "0sci2p1spsh7as4n7mp1hb4pwiq4wd69p60c71kwx56wpwiglp9i"; + version = "1.0.0.1"; + sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -245082,6 +246064,33 @@ self: { broken = true; }) {toxcore = null;}; + "toxcore-c" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring + , bytestring-arbitrary, data-default-class, directory, hspec + , QuickCheck, saltine, toxcore + }: + mkDerivation { + pname = "toxcore-c"; + version = "0.2.11"; + sha256 = "1fgz30y867lw9d6pmssi75k1prlfgrlpfa9qzqkm52mra2r5d2mb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring data-default-class ]; + librarySystemDepends = [ toxcore ]; + executableHaskellDepends = [ + base base16-bytestring bytestring directory + ]; + executableSystemDepends = [ toxcore ]; + testHaskellDepends = [ + base base16-bytestring bytestring bytestring-arbitrary + data-default-class hspec QuickCheck saltine + ]; + description = "Haskell bindings to the C reference implementation of Tox"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {toxcore = null;}; + "toxiproxy-haskell" = callPackage ({ mkDerivation, aeson, base, containers, hspec, http-client , process, servant, servant-client, silently, text, time @@ -246348,22 +247357,20 @@ self: { "tree-sitter" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, fused-effects, hedgehog, semantic-source, split - , template-haskell, text, unordered-containers + , filepath, fused-effects, hedgehog, split, template-haskell, text + , unordered-containers }: mkDerivation { pname = "tree-sitter"; - version = "0.9.0.0"; - sha256 = "12mjscpibhh15jiqcplnj2m4gxd4ym4xbbji96l5zwpzmd2x4bjb"; + version = "0.9.0.1"; + sha256 = "1khkc2v87i9vgbakc3gh1rmrakz43n4lglx50vvckp192in4svzm"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath fused-effects - semantic-source split template-haskell text unordered-containers + split template-haskell text unordered-containers ]; testHaskellDepends = [ base hedgehog ]; description = "Unstable bindings for the tree-sitter parsing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-go" = callPackage @@ -246376,8 +247383,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Go"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-haskell" = callPackage @@ -246391,8 +247396,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-java" = callPackage @@ -246405,8 +247408,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Java"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-json" = callPackage @@ -246419,8 +247420,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for JSON"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-php" = callPackage @@ -246433,8 +247432,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for PHP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-python" = callPackage @@ -246447,22 +247444,18 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Python"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-ql" = callPackage ({ mkDerivation, base, tree-sitter }: mkDerivation { pname = "tree-sitter-ql"; - version = "0.1.0.1"; - sha256 = "07k5vxkwy2l49f1gyvqasqva41n1h4xz381rmy1dd0625mshyvs2"; + version = "0.1.0.3"; + sha256 = "0sxfjkdbajk3q5qpy0y51q1srvp3lnch1jvypppcz3ria59svhzx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for QL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-ruby" = callPackage @@ -246475,8 +247468,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Ruby"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-tsx" = callPackage @@ -246489,8 +247480,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for TSX"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-typescript" = callPackage @@ -246503,8 +247492,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for TypeScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-traversals" = callPackage @@ -246697,8 +247684,8 @@ self: { pname = "trie-simple"; version = "0.4.1.1"; sha256 = "0h3wfq4fjakkwvrv35l25709xv528h1c08cr754gvk4l8vqnk6k7"; - revision = "1"; - editedCabalFile = "09kzna10hdf2qjialdg6rql0w55si9db7sjd89l661sgidlbq7y0"; + revision = "2"; + editedCabalFile = "1v3aiqn3c91md7y0wqcdvafy1fwjr8hfsg17ykqr1si8ax6hy5j0"; libraryHaskellDepends = [ base containers deepseq mtl ]; testHaskellDepends = [ base containers hspec QuickCheck vector ]; benchmarkHaskellDepends = [ @@ -247701,8 +248688,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.17"; - sha256 = "0chj4issjbkdkj1jbcpi8v104784qnzvkq81a4wcdijk09biphq7"; + version = "1.5.18"; + sha256 = "0xdkn6vhmir7sxazi5sxrgvwsi8zqyqbcyvjnqvckz0ac5d8zj68"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -247804,6 +248791,8 @@ self: { pname = "tweet-hs"; version = "1.0.2.1"; sha256 = "0b277whd3jywb6w0gkaijmzadpwabmyxvxyg6fmsysq1kp3isrnm"; + revision = "1"; + editedCabalFile = "0ca923bxx8aj6qzm0nvxvh1zmzqw34jv4xmnrjy1lfyndg0qg9vj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248304,8 +249293,8 @@ self: { }: mkDerivation { pname = "twitter-types"; - version = "0.10.0"; - sha256 = "0a2wgidg5dk3cxszb0q07cg0sywqgyxl5scswlr91yjvmjmlnkby"; + version = "0.10.1"; + sha256 = "0rz4xq66fckvd6q7qlsz2bgi1df95cs5mksihzjcq9x2axvsz632"; libraryHaskellDepends = [ aeson base text time unordered-containers ]; @@ -249283,8 +250272,6 @@ self: { executableHaskellDepends = [ base diagrams-lib text ]; description = "Typed and composable spreadsheets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "typed-streams" = callPackage @@ -251269,8 +252256,6 @@ self: { semigroups split text ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "unitym" = callPackage @@ -251368,8 +252353,8 @@ self: { pname = "universe-base"; version = "1.1.1"; sha256 = "1a6yyvrzkz7jnjz4lyp8aw0r5hci1nx8c06v3dicgfqs3frk1v8x"; - revision = "1"; - editedCabalFile = "1l6vxapfjhm5mb6w25ah8sl78hdw1ia5s18cf40lm0vzb6ip4bkk"; + revision = "2"; + editedCabalFile = "0601hqv5h2274i11j1ai2yqb7zk2fkqkiqlpwnq5awbgdkwb10i8"; libraryHaskellDepends = [ base containers tagged transformers ]; testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; @@ -251382,8 +252367,8 @@ self: { }: mkDerivation { pname = "universe-dependent-sum"; - version = "1.2"; - sha256 = "1xjw6mhlj1vyw6m4b4j0k81p86hls9031sfv59zgiq5y0ngm1f07"; + version = "1.2.0.1"; + sha256 = "0002wc68z803jys90s7sdh5nzdx1dk2jl49d19sjylk1cf18n5fi"; libraryHaskellDepends = [ base dependent-sum some universe-base universe-some ]; @@ -251412,6 +252397,8 @@ self: { pname = "universe-instances-extended"; version = "1.1.1"; sha256 = "1ppklq2rjcryld9d9kdzz55vfllfpxxgsvvkhpd1jrvhyj51yahh"; + revision = "1"; + editedCabalFile = "0g3qpvgw304yml1n9ly78qrsrrw53f6zpkciyk1xc0nmlm0dkwih"; libraryHaskellDepends = [ adjunctions base comonad containers contravariant universe-base ]; @@ -251438,8 +252425,8 @@ self: { pname = "universe-reverse-instances"; version = "1.1"; sha256 = "0pdmv146ap0dh38mxhjf11jx3fbr9im7mc0zxb3bsnwpfrv1kfqd"; - revision = "2"; - editedCabalFile = "1ls6hss9mrdk535k9ssy4lv01gbw11pbqiikpv2m8sjmh65fjilx"; + revision = "3"; + editedCabalFile = "1zkpcipbzhxricr94pkhn4cqmjcnsxx301kxarx798qr9il37qzw"; libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = stdenv.lib.licenses.bsd3; @@ -251453,6 +252440,8 @@ self: { pname = "universe-some"; version = "1.2"; sha256 = "1c9pdk682xdzscq77c006x052c9jizpgja3xk0ym8n421h0k8zlh"; + revision = "1"; + editedCabalFile = "1rx1cw40clsla3sixm0gzdbni9f13ngncl02fm9fl8kgf23w9q73"; libraryHaskellDepends = [ base some template-haskell th-abstraction transformers universe-base @@ -251753,6 +252742,8 @@ self: { pname = "unliftio-core"; version = "0.2.0.1"; sha256 = "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi"; + revision = "1"; + editedCabalFile = "16k5fxlm9xpbd0ca861nmhb1j2ahyid02m1vbg1vzb5ckbm48glv"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = stdenv.lib.licenses.mit; @@ -251765,21 +252756,6 @@ self: { }: mkDerivation { pname = "unliftio-pool"; - version = "0.2.1.0"; - sha256 = "0qhgiym7slz3n68py4izs52wfhs5d7nyxzwnj8q86rvkvy6lfm5v"; - libraryHaskellDepends = [ - base resource-pool time transformers unliftio-core - ]; - description = "Data.Pool generalized to MonadUnliftIO."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unliftio-pool_0_2_1_1" = callPackage - ({ mkDerivation, base, resource-pool, time, transformers - , unliftio-core - }: - mkDerivation { - pname = "unliftio-pool"; version = "0.2.1.1"; sha256 = "0hxxngldp4zr55qv67gf62a87yxr1f0xfyh4gfzr45q62mscs8xv"; libraryHaskellDepends = [ @@ -251787,7 +252763,6 @@ self: { ]; description = "Data.Pool generalized to MonadUnliftIO."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-streams" = callPackage @@ -252943,8 +253918,6 @@ self: { executableHaskellDepends = [ base random-fu text ]; description = "A collection of user agents"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "userid" = callPackage @@ -253262,8 +254235,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "utility-ht"; - version = "0.0.14"; - sha256 = "1a7bgk7wv7sqbxbiv7kankiimr3wij7zdm7s83zwsf886ghyxhk9"; + version = "0.0.15"; + sha256 = "148gdz6pbl1i5qjvjrq5576pg58anmh18xha37n9fncjy36pjp44"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; @@ -253968,8 +254941,6 @@ self: { ]; description = "Lighweight pure data validation based on Applicative and Selective functors"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "validations" = callPackage @@ -254613,6 +255584,8 @@ self: { pname = "vec"; version = "0.3"; sha256 = "0r2jk3jqwn0r4wnpgc8k8i664g3rrs6dkyfsysysn4w10j22j5sr"; + revision = "2"; + editedCabalFile = "0v9m2x1p1395dqf0g2agfgmlx6w1dak2fr50hh6aahjk4y0jp30j"; libraryHaskellDepends = [ adjunctions base deepseq distributive fin hashable QuickCheck semigroupoids transformers @@ -254631,6 +255604,8 @@ self: { pname = "vec-lens"; version = "0.3"; sha256 = "0i08p7rfmivf03mir7hcbkr7rarji95icsyvi6diclav1jd6fa7q"; + revision = "1"; + editedCabalFile = "0grj1abb7gjbzw06672464r75wjnmra9d12yvlmdm1qyj9zya0ph"; libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; license = stdenv.lib.licenses.bsd3; @@ -254765,8 +255740,8 @@ self: { pname = "vector-binary-instances"; version = "0.2.5.1"; sha256 = "04n5cqm1v95pw1bp68l9drjkxqiy2vswxdq0fy1rqcgxisgvji9r"; - revision = "1"; - editedCabalFile = "1p7cbxdpix0rakvggnnb06kcrb787fyyqlzric6i4s3rn34547q8"; + revision = "2"; + editedCabalFile = "0ia9i7q7jrk3ab3nq2368glr69vl6fwvh42zlwvdmxn4xd861qfx"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; benchmarkHaskellDepends = [ @@ -255189,6 +256164,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.1.7"; sha256 = "0q8dqnbv1c2gi7jjdhqj14abj1vik23ki6lq4iz2sz18yc7q69fi"; + revision = "1"; + editedCabalFile = "11qhhir9cdy3x7pd0z0xk8vi4nzr9fn9q3ggwbhhc43jglngw1x7"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -255447,8 +256424,6 @@ self: { benchmarkHaskellDepends = [ base criterion lens ]; description = "Random verilog generation and simulator testing"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "versioning" = callPackage @@ -256140,6 +257115,17 @@ self: { broken = true; }) {}; + "vitrea" = callPackage + ({ mkDerivation, base, mtl, profunctors }: + mkDerivation { + pname = "vitrea"; + version = "0.1.0.0"; + sha256 = "0f7rwww8gcfg6q0xq6z8c3010gx0vxr0v6yf143qxqjx02f93d1p"; + libraryHaskellDepends = [ base mtl profunctors ]; + description = "Profunctor optics via the profunctor representation theorem"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "vivid" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, hashable, MonadRandom, mtl, network, process, random @@ -256451,7 +257437,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_28_1" = callPackage + "vty_5_28_2" = callPackage ({ mkDerivation, ansi-terminal, base, binary, blaze-builder , bytestring, Cabal, containers, deepseq, directory, filepath , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl @@ -256462,8 +257448,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.28.1"; - sha256 = "0hshmpa3n6936527wimxf3vi5v6gddp09kxjjmcxjwq39h9a640y"; + version = "5.28.2"; + sha256 = "0jfiha8hwpdpnz4i7d94dsgcrfd20y0kjp9crn3ds2jx8kln1prv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256561,12 +257547,18 @@ self: { }) {}; "vulkan" = callPackage - ({ mkDerivation, base, cpphs, vector-sized, vulkan }: + ({ mkDerivation, base, bytestring, transformers, vector + , vector-sized, vulkan + }: mkDerivation { pname = "vulkan"; - version = "2.1.0.0"; - sha256 = "1w19ip6qc5qbscp06a2b58x9yhjc98naaq1gxymk7gs3iagylrzq"; - libraryHaskellDepends = [ base cpphs vector-sized ]; + version = "3.0.0.0"; + sha256 = "1kz0b5kn6dm70i1php7aywjsamjn4ymka87j7c4md93gy9z20ia5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring transformers vector vector-sized + ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; license = stdenv.lib.licenses.bsd3; @@ -257785,8 +258777,6 @@ self: { ]; description = "A WAI middleware to collect EKG request metrics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wai-middleware-preprocessor" = callPackage @@ -258641,8 +259631,8 @@ self: { }: mkDerivation { pname = "warp-grpc"; - version = "0.4.0.0"; - sha256 = "1isi0xd6vvavvr4m3gfiqj2cmmpa3jn9py61m0ksrarxwmsw8s1g"; + version = "0.4.0.1"; + sha256 = "0dajbs3gxibnllzs134wa7vqclnyfj2r3hc70dci51wgnmi4b7xr"; libraryHaskellDepends = [ async base binary bytestring case-insensitive http-types http2 http2-grpc-types unliftio-core wai warp warp-tls @@ -259043,8 +260033,6 @@ self: { ]; description = "Wrappers for web frameworks to ease usage with the FP Complete environment"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "web-inv-route" = callPackage @@ -259175,16 +260163,16 @@ self: { }: mkDerivation { pname = "web-rep"; - version = "0.3.0"; - sha256 = "1qfgs3jb146a37zpsgcl2vc4k6p9h1mqhhkgrcq386x535v2ivmq"; + version = "0.3.1"; + sha256 = "03rm0qa9y43fd9mbaix4vhrsjk6vdkd6yqji7d5m89q3j0xamm3v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bifunctors box clay foldl generic-lens interpolatedstring-perl6 javascript-bridge JuicyPixels - language-javascript lens lucid lucid-svg mmorph mtl - optparse-generic scotty streaming text text-format transformers - unordered-containers wai wai-extra wai-middleware-static + language-javascript lens lucid lucid-svg mmorph mtl scotty + streaming text text-format transformers unordered-containers + wai-middleware-static ]; executableHaskellDepends = [ attoparsec base box lens lucid optparse-generic scotty text wai @@ -260481,8 +261469,6 @@ self: { random-fu random-shuffle random-source relude temporary time ]; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "why3" = callPackage @@ -260511,8 +261497,8 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.1.0"; - sha256 = "101a2irkgsz9264zj9vdwbkycf25phsf1kbhh6nrx8mh9207aaiw"; + version = "0.1.1.1"; + sha256 = "19mxi6mfri4q96lqh3zllmacaln2wdp0ipzmhk7v9xqbphpfjrfj"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck @@ -261006,6 +261992,8 @@ self: { pname = "wizards"; version = "1.0.3"; sha256 = "1clvbd1ckhvy29qrbmpkn7bya7300fq6znnps23nn3nxyrxhsr85"; + revision = "1"; + editedCabalFile = "095qd17zrdhqmcvmslbyzfa5sh9glvvsnsvnlz31gzsmi8nnsgim"; libraryHaskellDepends = [ base containers control-monad-free haskeline mtl transformers ]; @@ -261041,8 +262029,8 @@ self: { }: mkDerivation { pname = "wkt-geom"; - version = "0.0.10"; - sha256 = "10hzfa063sp2f4v3ki7322x74iqn8wan0klalhddqfr554j3b1g5"; + version = "0.0.11"; + sha256 = "19mcfs9php03g3kb7pgfxcpilvmq5bxbyfkx59mk41nx6f0jfl0d"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers geojson scientific trifecta utf8-string vector @@ -261519,8 +262507,6 @@ self: { ]; description = "Command-line tool to get random words"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wordpass" = callPackage @@ -262299,8 +263285,6 @@ self: { testHaskellDepends = [ base bytestring envy hspec skews text ]; description = "A-little-higher-level WebSocket client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wtk" = callPackage @@ -263638,8 +264622,8 @@ self: { }: mkDerivation { pname = "xml-conduit-stylist"; - version = "1.0.1.0"; - sha256 = "1csa940r6a63i01khcm89lvhp7m6dyxpnljn6l6m105z7jfvvy8r"; + version = "1.1.0.0"; + sha256 = "0bj6mcd4k6wlrzizf3j2mnmbbl624k0xcsfrz9c3wpvdxb9iyqsr"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit @@ -264171,8 +265155,6 @@ self: { ]; description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xmlbf-xeno" = callPackage @@ -264193,8 +265175,6 @@ self: { ]; description = "xeno backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xmlbf-xmlhtml" = callPackage @@ -264216,8 +265196,6 @@ self: { ]; description = "xmlhtml backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xmlgen" = callPackage @@ -266369,8 +267347,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.9"; - sha256 = "0x843l5z03a563i8nc2x9c6afw213chblm7ldd7yxn5g110h5ybx"; + version = "1.6.10"; + sha256 = "0nfrq61dqifzbnqx8m62j1q6nmlj04mis864yg2k36mra9njap27"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -266970,6 +267948,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_18" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, fast-logger + , gauge, hspec, hspec-expectations, http-types, HUnit, memory + , monad-logger, mtl, network, parsec, path-pieces, primitive + , random, resourcet, 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.18"; + sha256 = "1hm0frswqcj34scvapszdryjfmnrqq5fhf5hv7qcz8sj3qf46zkd"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -270312,6 +271328,8 @@ self: { pname = "zlib"; version = "0.6.2.1"; sha256 = "1l11jraslcrp9d4wnhwfyhwk4fsiq1aq8i6vj81vcq1m2zzi1y7h"; + revision = "1"; + editedCabalFile = "0i9g71jvdw22bi9bi8dm5khwzcsv6cv8yadmf7afklg4xigxykfk"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix new file mode 100644 index 000000000000..db849bb542de --- /dev/null +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchurl, graalvm8 }: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "babashka"; + version = "0.0.78"; + + reflectionJson = fetchurl { + name = "reflection.json"; + url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; + sha256 = "1m1nwdxjsc6bkdzkbsll316ly0c3qxaimjzyfph1220irjxnm7xf"; + }; + + src = fetchurl { + url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; + sha256 = "01w990zk5qjrbnc846snh6na002kdyrlrfnqwg03ibx20g3mr7if"; + }; + + dontUnpack = true; + + buildInputs = [ graalvm8 ]; + + buildPhase = '' + native-image \ + -jar ${src} \ + -H:Name=bb \ + -H:+ReportExceptionStackTraces \ + -J-Dclojure.spec.skip-macros=true \ + -J-Dclojure.compiler.direct-linking=true \ + "-H:IncludeResources=BABASHKA_VERSION" \ + "-H:IncludeResources=SCI_VERSION" \ + -H:ReflectionConfigurationFiles=${reflectionJson} \ + --initialize-at-run-time=java.lang.Math\$RandomNumberGeneratorHolder \ + --initialize-at-build-time \ + -H:Log=registerResource: \ + -H:EnableURLProtocols=http,https \ + --enable-all-security-services \ + -H:+JNI \ + --verbose \ + --no-fallback \ + --no-server \ + --report-unsupported-elements-at-runtime \ + "-J-Xmx3g" + ''; + + installPhase = '' + mkdir -p $out/bin + cp bb $out/bin/bb + ''; + + meta = with stdenv.lib; { + description = "A Clojure babushka for the grey areas of Bash"; + longDescription = '' + The main idea behind babashka is to leverage Clojure in places where you + would be using bash otherwise. + + As one user described it: + + I’m quite at home in Bash most of the time, but there’s a substantial + grey area of things that are too complicated to be simple in bash, but + too simple to be worth writing a clj/s script for. Babashka really + seems to hit the sweet spot for those cases. + + Goals: + + - Low latency Clojure scripting alternative to JVM Clojure. + - Easy installation: grab the self-contained binary and run. No JVM needed. + - Familiarity and portability: + - Scripts should be compatible with JVM Clojure as much as possible + - Scripts should be platform-independent as much as possible. Babashka + offers support for linux, macOS and Windows. + - Allow interop with commonly used classes like java.io.File and System + - Multi-threading support (pmap, future, core.async) + - Batteries included (tools.cli, cheshire, ...) + - Library support via popular tools like the clojure CLI + ''; + homepage = "https://github.com/borkdude/babashka"; + license = licenses.epl10; + platforms = graalvm8.meta.platforms; + maintainers = with maintainers; [ bhougland DerGuteMoritz jlesquembre ]; + }; +} diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index d6252a7506aa..122831e80cc0 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -279,7 +279,7 @@ stdenv.mkDerivation { Thanks to V8's custom startup snapshots, Lumo starts up instantaneously, making it the fastest Clojure REPL in existence. ''; - homepage = https://github.com/anmonteiro/lumo; + homepage = "https://github.com/anmonteiro/lumo"; license = stdenv.lib.licenses.epl10; maintainers = [ stdenv.lib.maintainers.hlolli ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 88fe21453a82..7596ad9e2f10 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "22.1.7"; - sha256 = "18aqy2s8nqd82v4lzzxknrwjva8mv1y2hvai9cakz5nkyd3vwq62"; + version = "22.3"; + sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27"; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index e1d404a6b15d..1572f5e4be2c 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "10nn04hfky4x75nss33vvslw958pjvhw35lcfb3lxvaifqg23cpl"; + sha256 = "1ddw3fqrmwh4w6z6xgck4jhmq33rwgbmpjw07g12ri1vgw4xks9w"; }; buildInputs = [ unzip makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An agile dynamic language for the Java Platform"; - homepage = http://groovy-lang.org/; + homepage = "http://groovy-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 0fc6928c1aba..828cf3a72442 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "1z7r4ddgwxgxy1pp36p2wchcmzjqfyki3a4kicnr23ldflqv9ycc"; + sha256 = "1v2kgbx6w1ii83a1c9ridm1i52rmcjb0g1d23fhqn7hya5bwrhr6"; }; nativeBuildInputs = [ meson ninja ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Janet programming language"; - homepage = https://janet-lang.org/; + homepage = "https://janet-lang.org/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ andrewchambers ]; diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 1db2dd60197b..b176c55cbfd1 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "joker"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1wi80sr8h9fwh4xipff0y6qdzrliwyk2w1bmi33ncykxd9r2g7nk"; + sha256 = "03lbvxmkn0rr7yv7kj6c4dh4zayiwbhrkqbz2m22dw568rjbp8az"; }; - modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1mylgim9nm0v5wybgzi74nqzmvzwzws0027wzl86dbj5id83ab9v"; preBuild = '' go generate ./... diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 3784b6ab282f..79cb1c7154b5 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.11.0"; + version = "9.2.11.1"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "01yzpasnpqqm0vfc0ki8vkxbzijjfws135jw8k0r50b5lahjvs4a"; + sha256 = "1p4ml5rqidqllc7z85zn2q4pyyih71j0gb71wl43j4v74p44j17i"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index b32d15b2a1f9..4a63d1862014 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -49,6 +49,8 @@ # - JIT compiler for loops: , enableJIT ? false , llvm ? null +, libiconv +, darwin }: let @@ -107,10 +109,13 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (python != null) python) ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]) + ++ (stdenv.lib.optionals (stdenv.isDarwin) [ libiconv + darwin.apple_sdk.frameworks.Accelerate + darwin.apple_sdk.frameworks.Cocoa ]) ; nativeBuildInputs = [ pkgconfig - gfortran + gfortran # Listed here as well because it's outputs are split fftw fftwSinglePrec @@ -135,6 +140,7 @@ stdenv.mkDerivation rec { "--with-blas=openblas" "--with-lapack=openblas" ] + ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ]) ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] ++ stdenv.lib.optionals openblas.blas64 [ "--enable-64" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ] @@ -161,7 +167,7 @@ stdenv.mkDerivation rec { # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT broken = enableJIT; platforms = if overridePlatforms == null then - (with stdenv.lib.platforms; linux ++ darwin) + (with stdenv.lib; platforms.linux ++ platforms.darwin) else overridePlatforms; }; } diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 8f8b63a261e5..0f9bee05946e 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -170,11 +170,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "ba90816ef2c24dc06fd6cd2c854abcfa1aae00a3"; # Nov 22, 2019 + crossVersion = "1.3.2"; # Mar 21, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "19jq5fz6l64s0v6j64n5mkk5v2srpyfn9sc09hwbpkp9n74q82j4"; + sha256 = "1283crdjsyi45mgdiak4jmy907mqn09frxzxp21b18hvxmfn4smq"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -202,15 +202,15 @@ in { perl530 = common { perl = pkgs.perl530; buildPerl = buildPackages.perl530; - version = "5.30.1"; - sha256 = "0r7r8a7pkgxp3w5lza559ahxczw6hzpwvhkpc4c99vpi3xbjagdz"; + version = "5.30.2"; + sha256 = "128nfdxcvxfn5kq55qcfrx2851ys8hv794dcdxbyny8rm7w7vnv6"; }; # the latest Devel version perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.31.6"; - sha256 = "08n3c8xm1brxpckqy8i1xgjrpl4afrhcva9bhxswr938n675x71k"; + version = "5.31.10"; + sha256 = "1gvv5zs54gzb947x7ryjkaalm9rbqf8l8hwjwdm9lbfgkpg07kny"; }; } diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 497a1d87f557..1d6576b383cd 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,13 +1,9 @@ -# pcre functionality is tested in nixos/tests/php-pcre.nix -{ config, lib, stdenv, fetchurl -, autoconf, automake, bison, file, flex, libtool, pkgconfig, re2c -, libxml2, readline, zlib, curl, postgresql, gettext -, openssl, pcre, pcre2, sqlite -, libxslt, bzip2, icu, openldap, cyrus_sasl, unixODBC -, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 -, gd, freetype, libXpm, libjpeg, libpng, libwebp -, libzip, valgrind, oniguruma, symlinkJoin, writeText -, makeWrapper, callPackage +# We have tests for PCRE and PHP-FPM in nixos/tests/php/ or +# both in the same attribute named nixosTests.php + +{ callPackage, config, fetchurl, lib, makeWrapper, stdenv, symlinkJoin +, writeText , autoconf, automake, bison, flex, libtool, pkgconfig, re2c +, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, valgrind }: let @@ -15,182 +11,83 @@ let { version , sha256 , extraPatches ? [] - , withSystemd ? config.php.systemd or stdenv.isLinux - , imapSupport ? config.php.imap or (!stdenv.isDarwin) - , ldapSupport ? config.php.ldap or true - , mysqlndSupport ? config.php.mysqlnd or true - , mysqliSupport ? (config.php.mysqli or true) && (mysqlndSupport) - , pdo_mysqlSupport ? (config.php.pdo_mysql or true) && (mysqlndSupport) - , libxml2Support ? config.php.libxml2 or true - , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin) - , embedSupport ? config.php.embed or false - , bcmathSupport ? config.php.bcmath or true - , socketsSupport ? config.php.sockets or true - , curlSupport ? config.php.curl or true - , gettextSupport ? config.php.gettext or true - , pcntlSupport ? config.php.pcntl or true - , pdo_odbcSupport ? config.php.pdo_odbc or true - , postgresqlSupport ? config.php.postgresql or true - , pdo_pgsqlSupport ? config.php.pdo_pgsql or true - , readlineSupport ? config.php.readline or true - , sqliteSupport ? config.php.sqlite or true - , soapSupport ? (config.php.soap or true) && (libxml2Support) - , zlibSupport ? config.php.zlib or true - , opensslSupport ? config.php.openssl or true - , mbstringSupport ? config.php.mbstring or true - , gdSupport ? config.php.gd or true - , intlSupport ? config.php.intl or true - , exifSupport ? config.php.exif or true - , xslSupport ? config.php.xsl or false - , bz2Support ? config.php.bz2 or false - , zipSupport ? config.php.zip or true - , ftpSupport ? config.php.ftp or true - , fpmSupport ? config.php.fpm or true - , gmpSupport ? config.php.gmp or true - , ztsSupport ? (config.php.zts or false) || (apxs2Support) - , calendarSupport ? config.php.calendar or true - , sodiumSupport ? (config.php.sodium or true) && (lib.versionAtLeast version "7.2") - , tidySupport ? (config.php.tidy or false) - , argon2Support ? (config.php.argon2 or true) && (lib.versionAtLeast version "7.2") - , libzipSupport ? (config.php.libzip or true) && (lib.versionAtLeast version "7.2") - , phpdbgSupport ? config.php.phpdbg or true + + # Sapi flags , cgiSupport ? config.php.cgi or true , cliSupport ? config.php.cli or true + , fpmSupport ? config.php.fpm or true + , pearSupport ? config.php.pear or true , pharSupport ? config.php.phar or true - , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support) + , phpdbgSupport ? config.php.phpdbg or true + + + # Misc flags + , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin) + , argon2Support ? config.php.argon2 or true , cgotoSupport ? config.php.cgoto or false - , valgrindSupport ? (config.php.valgrind or true) && (lib.versionAtLeast version "7.2") + , embedSupport ? config.php.embed or false , ipv6Support ? config.php.ipv6 or true - , pearSupport ? (config.php.pear or true) && (libxml2Support) - }: stdenv.mkDerivation { + , systemdSupport ? config.php.systemd or stdenv.isLinux + , valgrindSupport ? config.php.valgrind or true + , ztsSupport ? (config.php.zts or false) || (apxs2Support) + }: let + pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre; + in stdenv.mkDerivation { pname = "php"; inherit version; enableParallelBuilding = true; - nativeBuildInputs = [ autoconf automake bison file flex libtool pkgconfig re2c ]; - - buildInputs = [ ] - ++ lib.optional (lib.versionOlder version "7.3") pcre - ++ lib.optional (lib.versionAtLeast version "7.3") pcre2 - ++ lib.optional (lib.versionAtLeast version "7.4") oniguruma - ++ lib.optional withSystemd systemd - ++ lib.optionals imapSupport [ uwimap openssl pam ] - ++ lib.optionals curlSupport [ curl openssl ] - ++ lib.optionals ldapSupport [ openldap openssl ] - ++ lib.optionals gdSupport [ gd freetype libXpm libjpeg libpng libwebp ] - ++ lib.optionals opensslSupport [ openssl openssl.dev ] + nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; + + buildInputs = + # PCRE extension + [ pcre' ] + + # Enable sapis + ++ lib.optional pearSupport [ libxml2.dev ] + + # Misc deps ++ lib.optional apxs2Support apacheHttpd - ++ lib.optional (ldapSupport && stdenv.isLinux) cyrus_sasl - ++ lib.optional zlibSupport zlib - ++ lib.optional libxml2Support libxml2 - ++ lib.optional readlineSupport readline - ++ lib.optional sqliteSupport sqlite - ++ lib.optional postgresqlSupport postgresql - ++ lib.optional pdo_odbcSupport unixODBC - ++ lib.optional pdo_pgsqlSupport postgresql - ++ lib.optional gmpSupport gmp - ++ lib.optional gettextSupport gettext - ++ lib.optional intlSupport icu - ++ lib.optional xslSupport libxslt - ++ lib.optional bz2Support bzip2 - ++ lib.optional sodiumSupport libsodium - ++ lib.optional tidySupport html-tidy ++ lib.optional argon2Support libargon2 - ++ lib.optional libzipSupport libzip - ++ lib.optional valgrindSupport valgrind; + ++ lib.optional systemdSupport systemd + ++ lib.optional valgrindSupport valgrind + ; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - configureFlags = [ "--with-config-file-scan-dir=/etc/php.d" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre.dev}" "PCRE_LIBDIR=${pcre}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ] - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ] - ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}" - ++ lib.optional withSystemd "--with-fpm-systemd" - ++ lib.optionals imapSupport [ - "--with-imap=${uwimap}" - "--with-imap-ssl" - ] - ++ lib.optionals ldapSupport [ - "--with-ldap=/invalid/path" - "LDAP_DIR=${openldap.dev}" - "LDAP_INCDIR=${openldap.dev}/include" - "LDAP_LIBDIR=${openldap.out}/lib" - ] - ++ lib.optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}" - ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" - ++ lib.optional embedSupport "--enable-embed" - ++ lib.optional curlSupport "--with-curl=${curl.dev}" - ++ lib.optional zlibSupport "--with-zlib=${zlib.dev}" - ++ lib.optional (libxml2Support && (lib.versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}" - ++ lib.optional (!libxml2Support) [ - "--disable-dom" - (if (lib.versionOlder version "7.4") then "--disable-libxml" else "--without-libxml") - "--disable-simplexml" - "--disable-xml" - "--disable-xmlreader" - "--disable-xmlwriter" - "--without-pear" - ] - ++ lib.optional pcntlSupport "--enable-pcntl" - ++ lib.optional readlineSupport "--with-readline=${readline.dev}" - ++ lib.optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}" - ++ lib.optional postgresqlSupport "--with-pgsql=${postgresql}" - ++ lib.optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}" - ++ lib.optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}" - ++ lib.optional (pdo_mysqlSupport && mysqlndSupport) "--with-pdo-mysql=mysqlnd" - ++ lib.optional (mysqliSupport && mysqlndSupport) "--with-mysqli=mysqlnd" - ++ lib.optional (pdo_mysqlSupport || mysqliSupport) "--with-mysql-sock=/run/mysqld/mysqld.sock" - ++ lib.optional bcmathSupport "--enable-bcmath" - ++ lib.optionals (gdSupport && lib.versionAtLeast version "7.4") [ - "--enable-gd" - "--with-external-gd=${gd.dev}" - "--with-webp=${libwebp}" - "--with-jpeg=${libjpeg.dev}" - "--with-xpm=${libXpm.dev}" - "--with-freetype=${freetype.dev}" - "--enable-gd-jis-conv" - ] ++ lib.optionals (gdSupport && lib.versionOlder version "7.4") [ - "--with-gd=${gd.dev}" - "--with-webp-dir=${libwebp}" - "--with-jpeg-dir=${libjpeg.dev}" - "--with-png-dir=${libpng.dev}" - "--with-freetype-dir=${freetype.dev}" - "--with-xpm-dir=${libXpm.dev}" - "--enable-gd-jis-conv" - ] - ++ lib.optional gmpSupport "--with-gmp=${gmp.dev}" - ++ lib.optional soapSupport "--enable-soap" - ++ lib.optional socketsSupport "--enable-sockets" - ++ lib.optional opensslSupport "--with-openssl" - ++ lib.optional mbstringSupport "--enable-mbstring" - ++ lib.optional gettextSupport "--with-gettext=${gettext}" - ++ lib.optional intlSupport "--enable-intl" - ++ lib.optional exifSupport "--enable-exif" - ++ lib.optional xslSupport "--with-xsl=${libxslt.dev}" - ++ lib.optional bz2Support "--with-bz2=${bzip2.dev}" - ++ lib.optional (zipSupport && (lib.versionOlder version "7.4")) "--enable-zip" - ++ lib.optional (zipSupport && (lib.versionAtLeast version "7.4")) "--with-zip" - ++ lib.optional ftpSupport "--enable-ftp" - ++ lib.optional fpmSupport "--enable-fpm" - ++ lib.optional ztsSupport "--enable-maintainer-zts" - ++ lib.optional calendarSupport "--enable-calendar" - ++ lib.optional sodiumSupport "--with-sodium=${libsodium.dev}" - ++ lib.optional tidySupport "--with-tidy=${html-tidy}" - ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" - ++ lib.optional (libzipSupport && (lib.versionOlder version "7.4")) "--with-libzip=${libzip.dev}" - ++ lib.optional phpdbgSupport "--enable-phpdbg" - ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" + configureFlags = + # Disable all extensions + [ "--disable-all" ] + + # PCRE + ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre'.dev}" ] + ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] + ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] + ++ [ "PCRE_LIBDIR=${pcre'}" ] + + + # Enable sapis ++ lib.optional (!cgiSupport) "--disable-cgi" ++ lib.optional (!cliSupport) "--disable-cli" - ++ lib.optional (!pharSupport) "--disable-phar" - ++ lib.optional xmlrpcSupport "--with-xmlrpc" + ++ lib.optional fpmSupport "--enable-fpm" + ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] + ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" + ++ lib.optional pharSupport "--enable-phar" + ++ lib.optional phpdbgSupport "--enable-phpdbg" + + + # Misc flags + ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" + ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" ++ lib.optional cgotoSupport "--enable-re2c-cgoto" - ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional embedSupport "--enable-embed" ++ lib.optional (!ipv6Support) "--disable-ipv6" - ++ lib.optional (pearSupport && libxml2Support) "--with-pear=$(out)/lib/php/pear"; + ++ lib.optional systemdSupport "--with-fpm-systemd" + ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional ztsSupport "--enable-maintainer-zts" + ; hardeningDisable = [ "bindnow" ]; @@ -204,8 +101,6 @@ let --replace '@PHP_LDFLAGS@' "" done - substituteInPlace ./build/libtool.m4 --replace /usr/bin/file ${file}/bin/file - export EXTENSION_DIR=$out/lib/php/extensions ./buildconf --copy --force @@ -235,6 +130,12 @@ let inherit sha256; }; + patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + + separateDebugInfo = true; + + outputs = [ "out" "dev" ]; + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = "https://www.php.net/"; @@ -243,57 +144,121 @@ let platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; }; + }; - patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + generic' = { version, sha256, self, selfWithExtensions, ... }@args: + let + php = generic (builtins.removeAttrs args [ "self" "selfWithExtensions" ]); - stripDebugList = "bin sbin lib modules"; + php-packages = (callPackage ../../../top-level/php-packages.nix { + php = self; + phpWithExtensions = selfWithExtensions; + }); - outputs = [ "out" "dev" ]; - }; + buildEnv = { extensions ? (_: []), extraConfig ? "" }: + let + getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; + enabledExtensions = extensions php-packages.extensions; - generic' = { version, sha256, ... }@args: let php = generic args; in php.overrideAttrs (_: { - passthru.buildEnv = { exts ? (_: []), extraConfig ? "" }: let - extraInit = writeText "custom-php.ini" '' - ${extraConfig} - ${lib.concatMapStringsSep "\n" (ext: let - extName = lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; - type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; - in '' - ${type}=${ext}/lib/php/extensions/${extName}.so - '') (exts (callPackage ../../../top-level/php-packages.nix { inherit php; }))} - ''; - in symlinkJoin { - name = "php-custom-${version}"; - nativeBuildInputs = [ makeWrapper ]; - paths = [ php ]; - postBuild = '' - wrapProgram $out/bin/php \ - --add-flags "-c ${extraInit}" - wrapProgram $out/bin/php-fpm \ - --add-flags "-c ${extraInit}" - ''; - }; - }); + # Generate extension load configuration snippets from the + # extension parameter. This is an attrset suitable for use + # with textClosureList, which is used to put the strings in + # the right order - if a plugin which is dependent on + # another plugin is placed before its dependency, it will + # fail to load. + extensionTexts = + lib.listToAttrs + (map (ext: + let + extName = getExtName ext; + type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + in + lib.nameValuePair extName { + text = "${type}=${ext}/lib/php/extensions/${extName}.so"; + deps = lib.optionals (ext ? internalDeps) + (map getExtName ext.internalDeps); + }) + enabledExtensions); -in { - php72 = generic' { - version = "7.2.28"; - sha256 = "18sjvl67z5a2x5s2a36g6ls1r3m4hbrsw52hqr2qsgfvg5dkm5bw"; + extNames = map getExtName enabledExtensions; + extraInit = writeText "custom-php.ini" '' + ${lib.concatStringsSep "\n" + (lib.textClosureList extensionTexts extNames)} + ${extraConfig} + ''; + in + symlinkJoin { + name = "php-with-extensions-${version}"; + inherit (php) version; + nativeBuildInputs = [ makeWrapper ]; + passthru = { + inherit buildEnv withExtensions enabledExtensions; + inherit (php-packages) packages extensions; + }; + paths = [ php ]; + postBuild = '' + cp ${extraInit} $out/lib/custom-php.ini + + wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + + if test -e $out/bin/php-fpm; then + wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + fi + ''; + }; + + withExtensions = extensions: buildEnv { inherit extensions; }; + in + php.overrideAttrs (_: { + passthru = { + enabledExtensions = []; + inherit buildEnv withExtensions; + inherit (php-packages) packages extensions; + }; + }); + + php72base = generic' { + version = "7.2.29"; + sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; + self = php72base; + selfWithExtensions = php72; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; - php73 = generic' { - version = "7.3.15"; - sha256 = "0g84hws15s8gh8iq4h6q747dyfazx47vh3da3whz8d80x83ibgld"; + php73base = generic' { + version = "7.3.16"; + sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; + self = php73base; + selfWithExtensions = php73; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }; - php74 = generic' { - version = "7.4.3"; - sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ="; + php74base = generic' { + version = "7.4.4"; + sha256 = "17w2m4phhpj76x5fx67vgjrlkcczqvky3f5in1kjg2pch90qz3ih"; + self = php74base; + selfWithExtensions = php74; }; + + defaultPhpExtensions = extensions: with extensions; ([ + bcmath calendar curl ctype dom exif fileinfo filter ftp gd + gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache + openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql + posix readline session simplexml sockets soap sodium sqlite3 + tokenizer xmlreader xmlwriter zip zlib + ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]); + + defaultPhpExtensionsWithHash = extensions: + (defaultPhpExtensions extensions) ++ [ extensions.hash ]; + + php74 = php74base.withExtensions defaultPhpExtensions; + php73 = php73base.withExtensions defaultPhpExtensionsWithHash; + php72 = php72base.withExtensions defaultPhpExtensionsWithHash; + +in { + inherit php72base php73base php74base php72 php73 php74; } diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index b778b62f908d..abf2e223a4d1 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -28,6 +28,8 @@ , stripTkinter ? false , rebuildBytecode ? true , stripBytecode ? false +, includeSiteCustomize ? true +, static ? false }: assert x11Support -> tcl != null @@ -130,7 +132,7 @@ in with passthru; stdenv.mkDerivation { CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; - NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "-lgcc_s" + optionalString stdenv.hostPlatform.isMusl "-lgcc_eh"; # Determinism: We fix the hashes of str, bytes and datetime objects. PYTHONHASHSEED=0; @@ -169,7 +171,7 @@ in with passthru; stdenv.mkDerivation { # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. "ac_cv_func_lchmod=no" - ]; + ] ++ optional static "LDFLAGS=-static"; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity @@ -237,7 +239,7 @@ in with passthru; stdenv.mkDerivation { '' + optionalString stripTests '' # Strip tests rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} - '' + '' + '' + optionalString includeSiteCustomize '' # Include a sitecustomize.py file cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py '' + optionalString rebuildBytecode '' @@ -262,7 +264,7 @@ in with passthru; stdenv.mkDerivation { # Enforce that we don't have references to the OpenSSL -dev package, which we # explicitly specify in our configure flags above. disallowedReferences = - stdenv.lib.optionals (openssl != null) [ openssl.dev ] + stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 94f04b73f498..099632b1e853 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -96,10 +96,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "6"; + patch = "7"; suffix = ""; }; - sha256 = "0gskry19ylw91p38pdq36qcgk6h3x5i4ia0ik977kw2943kwr8jm"; + sha256 = "0di1y2cna823qgk6sd2lvpjdm3g2qikdd50i2bjd330dpzqsk806"; inherit (darwin) configd; inherit passthruFun; }; @@ -147,6 +147,7 @@ in { stripTkinter = true; rebuildBytecode = false; stripBytecode = true; + includeSiteCustomize = false; }).overrideAttrs(old: { pname = "python3-minimal"; meta = old.meta // { diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 47690320e81e..4d736426f3bf 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -89,6 +89,14 @@ in rec { }; } ./python-imports-check-hook.sh) {}; + pythonNamespacesHook = callPackage ({}: + makeSetupHook { + name = "python-namespaces-hook.sh"; + substitutions = { + inherit pythonSitePackages; + }; + } ./python-namespaces-hook.sh) {}; + pythonRemoveBinBytecodeHook = callPackage ({ }: makeSetupHook { name = "python-remove-bin-bytecode-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh new file mode 100644 index 000000000000..50f21819d176 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh @@ -0,0 +1,40 @@ +# Clean up __init__.py's found in namespace directories +echo "Sourcing python-namespaces-hook" + +pythonNamespacesHook() { + echo "Executing pythonNamespacesHook" + + for namespace in ${pythonNamespaces[@]}; do + echo "Enforcing PEP420 namespace: ${namespace}" + + # split namespace into segments. "azure.mgmt" -> "azure mgmt" + IFS='.' read -ra pathSegments <<< $namespace + constructedPath=$out/@pythonSitePackages@ + + # Need to remove the __init__.py at each namespace level + # E.g `azure/__init__.py` and `azure/mgmt/__init__.py` + # The __pycache__ entry also needs to be removed + for pathSegment in ${pathSegments[@]}; do + constructedPath=${constructedPath}/${pathSegment} + pathToRemove=${constructedPath}/__init__.py + pycachePath=${constructedPath}/__pycache__/__init__* + + if [ -f "$pathToRemove" ]; then + echo "Removing $pathToRemove" + rm "$pathToRemove" + fi + + if [ -f "$pycachePath" ]; then + echo "Removing $pycachePath" + rm "$pycachePath" + fi + done + done + + echo "Finished executing pythonNamespacesHook" +} + +if [ -z "${dontUsePythonNamespacesHook-}" -a -n "${pythonNamespaces-}" ]; then + postFixupHooks+=(pythonNamespacesHook) +fi + diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 180bc63857c2..22938a455852 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -16,6 +16,7 @@ , pipInstallHook , pythonCatchConflictsHook , pythonImportsCheckHook +, pythonNamespacesHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook , setuptoolsBuildHook @@ -131,6 +132,9 @@ let ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ # This is a test, however, it should be ran independent of the checkPhase and checkInputs pythonImportsCheckHook + ] ++ lib.optionals (python.pythonAtLeast "3.3") [ + # Optionally enforce PEP420 for python3 + pythonNamespacesHook ] ++ nativeBuildInputs; buildInputs = buildInputs ++ pythonPath; diff --git a/pkgs/development/interpreters/python/sitecustomize.py b/pkgs/development/interpreters/python/sitecustomize.py index e03b244dbc04..72ce951328f1 100644 --- a/pkgs/development/interpreters/python/sitecustomize.py +++ b/pkgs/development/interpreters/python/sitecustomize.py @@ -21,6 +21,19 @@ paths = os.environ.pop('NIX_PYTHONPATH', None) if paths: functools.reduce(lambda k, p: site.addsitedir(p, k), paths.split(':'), site._init_pathinfo()) -executable = os.environ.pop('NIX_PYTHONEXECUTABLE', None) -if 'PYTHONEXECUTABLE' not in os.environ and executable: - sys.executable = executable +# Check whether we are in a venv. +# Note Python 2 does not support base_prefix so we assume we are not in a venv. +in_venv = sys.version_info.major == 3 and sys.prefix != sys.base_prefix + +if not in_venv: + executable = os.environ.pop('NIX_PYTHONEXECUTABLE', None) + prefix = os.environ.pop('NIX_PYTHONPREFIX', None) + + if 'PYTHONEXECUTABLE' not in os.environ and executable is not None: + sys.executable = executable + if prefix is not None: + # Because we cannot check with Python 2 whether we are in a venv, + # creating a venv from a Nix env won't work as well with Python 2. + # Also, note that sysconfig does not like it when sys.prefix is set to None + sys.prefix = sys.exec_prefix = prefix + site.PREFIXES.insert(0, prefix) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 37fbe6701148..55065c45d576 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -2,6 +2,7 @@ , runCommand , substituteAll , lib +, callPackage }: let @@ -36,6 +37,7 @@ let is_venv = "True"; is_nixenv = "False"; }; + # Venv built using Python Nix environment (python.buildEnv) # TODO: Cannot create venv from a nix env # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. @@ -49,6 +51,14 @@ let # }; }; + # All PyPy package builds are broken at the moment + integrationTests = lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages + nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { + interpreter = python; + }; + }; + testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ inherit (python) pythonVersion; } // attrs) '' @@ -60,4 +70,4 @@ let touch $out/success ''; -in lib.mapAttrs testfun envs \ No newline at end of file +in lib.mapAttrs testfun envs // integrationTests diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix new file mode 100644 index 000000000000..05798cbaf1b8 --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix @@ -0,0 +1,25 @@ +{ interpreter, writeText, runCommandNoCC }: + +let + + python = let + packageOverrides = self: super: { + typeddep = super.callPackage ./typeddep {}; + }; + in interpreter.override {inherit packageOverrides; self = python;}; + + pythonEnv = python.withPackages(ps: [ + ps.typeddep + ps.mypy + ]); + + pythonScript = writeText "myscript.py" '' + from typeddep import util + s: str = util.echo("hello") + print(s) + ''; + +in runCommandNoCC "${interpreter.name}-site-prefix-mypy-test" {} '' + ${pythonEnv}/bin/mypy ${pythonScript} + touch $out +'' diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix new file mode 100644 index 000000000000..06219a69fcaf --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix @@ -0,0 +1,11 @@ +{ buildPythonPackage }: + + +buildPythonPackage { + + pname = "typeddep"; + version = "1.3.3.7"; + + src = ./.; + +} diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.py b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.py new file mode 100644 index 000000000000..25bac69ea09a --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.py @@ -0,0 +1,18 @@ +from setuptools import setup + +setup(**{ + 'name': 'typeddep', + 'version': '1.3.3.7', + 'description': 'Minimal repro to test mypy and site prefixes with Nix', + 'long_description': None, + 'author': 'adisbladis', + 'author_email': 'adisbladis@gmail.com', + 'maintainer': None, + 'maintainer_email': None, + 'url': None, + 'packages': ['typeddep'], + 'package_data': {'': ['*']}, + 'install_requires': [], + 'entry_points': {}, + 'python_requires': '>=3.7,<4.0', +}) diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/__init__.py b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/__init__.py diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/py.typed b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/py.typed new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/py.typed diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.py b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.py new file mode 100644 index 000000000000..c1c3ffe74777 --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.py @@ -0,0 +1,2 @@ +def echo(s: str) -> str: + return s diff --git a/pkgs/development/interpreters/python/tests/test_python.py b/pkgs/development/interpreters/python/tests/test_python.py index f631a172ccc6..011978c62547 100644 --- a/pkgs/development/interpreters/python/tests/test_python.py +++ b/pkgs/development/interpreters/python/tests/test_python.py @@ -27,7 +27,7 @@ class TestCasePython(unittest.TestCase): def test_interpreter(self): self.assertEqual(sys.executable, INTERPRETER) - @unittest.skipIf(IS_NIXENV or IS_PYPY, "Prefix is incorrect and needs to be fixed.") + @unittest.skipIf(IS_PYPY, "Prefix is incorrect and needs to be fixed.") def test_prefix(self): self.assertEqual(sys.prefix, ENV) self.assertEqual(sys.prefix, sys.exec_prefix) @@ -35,9 +35,9 @@ class TestCasePython(unittest.TestCase): def test_site_prefix(self): self.assertTrue(sys.prefix in site.PREFIXES) - @unittest.skipIf(sys.version_info.major==2, "Python 2 does not have base_prefix") + @unittest.skipIf(IS_PYPY or sys.version_info.major==2, "Python 2 does not have base_prefix") def test_base_prefix(self): - if IS_VENV: + if IS_VENV or IS_NIXENV: self.assertNotEqual(sys.prefix, sys.base_prefix) else: self.assertEqual(sys.prefix, sys.base_prefix) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 7e0580ce063d..b568ee6751d7 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -315,11 +315,11 @@ def _update(path, target): return False -def _commit(path, pname, old_version, new_version, **kwargs): +def _commit(path, pname, old_version, new_version, pkgs_prefix="python: ", **kwargs): """Commit result. """ - msg = f'python: {pname}: {old_version} -> {new_version}' + msg = f'{pkgs_prefix}{pname}: {old_version} -> {new_version}' try: subprocess.check_call([GIT, 'add', path]) @@ -337,6 +337,7 @@ def main(): parser.add_argument('package', type=str, nargs='+') parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major') parser.add_argument('--commit', action='store_true', help='Create a commit for each package update') + parser.add_argument('--use-pkgs-prefix', action='store_true', help='Use python3Packages.${pname}: instead of python: ${pname}: when making commits') args = parser.parse_args() target = args.target @@ -347,17 +348,23 @@ def main(): # Use threads to update packages concurrently with Pool() as p: - results = list(p.map(lambda pkg: _update(pkg, target), packages)) + results = list(filter(bool, p.map(lambda pkg: _update(pkg, target), packages))) logging.info("Finished updating packages.") + commit_options = {} + if args.use_pkgs_prefix: + logging.info("Using python3Packages. prefix for commits") + commit_options["pkgs_prefix"] = "python3Packages." + # Commits are created sequentially. if args.commit: logging.info("Committing updates...") - list(map(lambda x: _commit(**x), filter(bool, results))) + # list forces evaluation + list(map(lambda x: _commit(**x, **commit_options), results)) logging.info("Finished committing updates") - count = sum(map(bool, results)) + count = len(results) logging.info("{} package(s) updated".format(count)) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index b437584024fe..dffad6b98f5e 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -37,7 +37,7 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 3e9716af5508..8e66bf96e8ca 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { homepage = https://racket-lang.org/; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kkallio henrytill vrthra ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; broken = stdenv.isDarwin; # No support yet for setting FFI lookup path }; } diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index ca8d2b2b0dab..9d0f47d90d2a 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.02"; + version = "2020.02.1"; src = fetchurl { - url = "https://github.com/rakudo/rakudo/releases/download/${version}/rakudo-${version}.tar.gz"; - sha256 = "0yhld3ij4mfa42chkfph7lzcl5q9b613hdjmw9rv46appmxvvmrs"; + url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; + sha256 = "1qfaiqfclqd6zz04xl90yiqkvmm610r905nnbd6gszgyq1k77ckv"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 3c5c5f2a2f27..ade97b56a648 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.02"; + version = "2020.02.1"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "1kz97yy357lax7xdz4mnnwswn7axhp14nq0dw3n6xbcpap6m82aw"; + sha256 = "0cnnyjyci24pbws2cic80xdr7a5g3qvrsi221c6bpbnpkar81jw2"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 84a214201a01..f12e60b14f06 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.02"; + version = "2020.02.1"; src = fetchurl { url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0ik3fscywxjx1qxlbjf68msz83alpckzw3myj9jmkalvy8q5v0nk"; + sha256 = "0zw3g7viyq4n4qwy0laww2mzz6wrzkfcq4fm82scy1mh65r7bdgj"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 8ddd19bb40cc..da8d5ce20f47 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -224,26 +224,26 @@ let in { ruby_2_5 = generic { - version = rubyVersion "2" "5" "7" ""; + version = rubyVersion "2" "5" "8" ""; sha256 = { - src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b"; - git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp"; + src = "16md4jspjwixjlbhx3pnd5iwpca07p23ghkxkqd82sbchw3xy2vc"; + git = "19gkk3q9l33cwkfsp5k8f8fipq7gkyqkqirm9farbvy425519rv2"; }; }; ruby_2_6 = generic { - version = rubyVersion "2" "6" "5" ""; + version = rubyVersion "2" "6" "6" ""; sha256 = { - src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6"; - git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j"; + src = "1492x795qzgp3zhpl580kd1sdp50n5hfsmpbfhdsq2rnxwyi8jrn"; + git = "1jr9v99a7awssqmw7531afbx4a8i9x5yfqyffha545g7r4s7kj50"; }; }; ruby_2_7 = generic { - version = rubyVersion "2" "7" "0" ""; + version = rubyVersion "2" "7" "1" ""; sha256 = { - src = "1glc3zpnih6h8mrgfcak0aa7cgmi4zyvxfyi6y2brwg2nn9sm6cc"; - git = "11iz64k95czs273mb10195d1j75mmbcgddfdx1vay5876ffw81dq"; + src = "0674x98f542y02r7n2yv2qhmh97blqhi2mvh2dn5f000vlxlh66l"; + git = "0qk729kr5wm67xmwpljpdprwhp5wvn5y4ikqy00p1zcgwlwdcs33"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 4838a1a09e54..b0c26e19e13b 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,21 +1,19 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.4.9" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" - ]; - "2.5.7" = ops useRailsExpress [ + "2.5.8" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.6.5" = ops useRailsExpress [ + "2.6.6" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.7.0" = ops useRailsExpress [ # no patches yet (2019-12-25) + "2.7.1" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" + "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 883987683b0a..331dda5d0503 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "58f72dccc8bb4dc9b1035f6af903d21f2465367a"; - sha256 = "00gbrhvnf05g6zmfim472ld0l1lp100dy4pi3lixm6ry9iw9m4ag"; + rev = "6d8888d34a321198f7fd9253343b78c209efb046"; + sha256 = "0xczl0nng1649km3bcbjn6zrr591l6m2kkwgnknh1fnwmmrdaya7"; } diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix new file mode 100644 index 000000000000..807a26a7b95b --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/68.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, python3, zip, buildPackages +, which, readline, zlib, icu, cargo, rustc, llvmPackages }: + +with stdenv.lib; + +let + python3Env = buildPackages.python3.withPackages (p: [p.six]); +in stdenv.mkDerivation rec { + pname = "spidermonkey"; + version = "68.4.2"; + + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; + sha256 = "1x1fglg1b85hb0srd6k7n5svl0nlgdm4njc8q13s2750v5ck4ljx"; + }; + + outputs = [ "out" "dev" ]; + setOutputFlags = false; # Configure script only understands --includedir + + nativeBuildInputs = [ + autoconf213 + pkgconfig + perl + which + python2 + zip + cargo + rustc + llvmPackages.llvm + ]; + + buildInputs = [ + readline + zlib + icu + ]; + + preConfigure = '' + export CXXFLAGS="-fpermissive" + export LIBXUL_DIST=$out + export PYTHON3="${python3Env.interpreter}" + + # We can't build in js/src/, so create a build dir + mkdir obj + cd obj/ + configureScript=../js/src/configure + ''; + + configureFlags = [ + # Reccommended by gjs upstream + "--disable-jemalloc" + "--enable-unaligned-private-values" + "--with-intl-api" + "--enable-posix-nspr-emulation" + "--with-system-zlib" + "--with-system-icu" + + "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-clang-path=${llvmPackages.clang}/bin/clang" + + "--enable-shared-js" + "--enable-readline" + # Fedora and Arch disable optimize, but it doesn't seme to be necessary + # It turns on -O3 which some gcc version had a problem with: + # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e + "--enable-optimize" + "--enable-release" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Spidermonkey seems to use different host/build terminology for cross + # compilation here. + "--host=${stdenv.buildPlatform.config}" + "--target=${stdenv.hostPlatform.config}" + ]; + + configurePlatforms = []; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + # Remove unnecessary static lib + preFixup = '' + moveToOutput bin/js60-config "$dev" + rm $out/lib/libjs_static.ajs + ln -s $out/bin/js60 $out/bin/js + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = https://developer.mozilla.org/en/SpiderMonkey; + license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. + maintainers = [ maintainers.abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index e02ea05a7262..d9ace4deddd1 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -24,11 +24,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl"; + sha256 = "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index b410e64d667d..8016053c42de 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -7,5 +7,5 @@ libchipcard.releaseId = "158"; aqbanking.version = "6.0.2"; aqbanking.sha256 = "0n41n3yki1wmax4i9wi485g8zqb43z1adywcixzfq9gbdjhz05hx"; - aqbanking.releaseId = "243"; + aqbanking.releaseId = "273"; } diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index eaeddbcad368..40a96553fbe2 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool -, audit, glib, libusb, libxml2 +, audit, glib, libusb1, libxml2 , wrapGAppsHook , gstreamer ? null , gst-plugins-base ? null @@ -53,7 +53,7 @@ in buildInputs = [ glib libxml2 ] - ++ stdenv.lib.optional enableUsb libusb + ++ stdenv.lib.optional enableUsb libusb1 ++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 6c0b3c867a48..f6710d4fc576 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.850.1"; + version = "9.860.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "07y0s87srj2wxbywmnxam9bif0x625n6b8np19832mvsb6wqkhyl"; + sha256 = "1ab5y4ll6js2w4p9dabj2dmzzc3f8dja8dqsvy40azrvny58h0qn"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ linear algebra library"; - homepage = http://arma.sourceforge.net; + homepage = "http://arma.sourceforge.net"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ juliendehos knedlsepp ]; diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index ad0f910dcbf6..2dcf80ec30df 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { patch interfaces/cc/aspell.h < ${./clang.patch} ''; + nativeBuildInputs = [ perl ]; buildInputs = [ perl ]; doCheck = true; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index f16b38e3fd84..6a1ca6d24d36 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index cdb172d0d21f..6914877b4f70 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.34.0"; + version = "2.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn"; + sha256 = "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8"; }; outputs = [ "out" "dev" ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 9e80d4fc6ca6..10009c26d828 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -4,7 +4,7 @@ let pname = "atk"; - version = "2.34.1"; + version = "2.35.1"; in stdenv.mkDerivation rec { @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"; + sha256 = "111qajn7kxwmh40drc8i6jc3hnril2rp63n207q92pl47zx614xy"; }; outputs = [ "out" "dev" ]; buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; propagatedBuildInputs = [ # Required by atk.pc diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 3552e335feda..0165e8ea0d3c 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -15,7 +15,7 @@ let x86_64-linux = "x64/libbass.so"; }; urlpath = "bass24-linux.zip"; - sha256 = "1nyzs08z0djyvz6jx1y9y99y0ksp4sxz9l2x43k1c9irls24xpfy"; + sha256 = "1z01im0l2ydi608vc0n0c1cfyp1vrh6681zn2zkhg98vvs20y805"; }; bass_fx = { diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix new file mode 100644 index 000000000000..e5f1080631e4 --- /dev/null +++ b/pkgs/development/libraries/audio/libinstpatch/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }: + +stdenv.mkDerivation rec { + pname = "libinstpatch"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "swami"; + repo = pname; + rev = "v${version}"; + sha256 = "1v7mv43xxwrzi3agrc60agcw46jaidr8ql9kkm1w4jxkf4c6z6dz"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + propagatedBuildInputs = [ glib libsndfile ]; # Both are needed for includes. + + cmakeFlags = [ + "-DLIB_SUFFIX=" # Install in $out/lib. + ]; + + meta = with stdenv.lib; { + homepage = "http://www.swamiproject.org/"; + description = "MIDI instrument patch files support library"; + license = licenses.lgpl21; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 44be67d71b4e..233b93d6782b 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -9,8 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1p3hafsxgs5d4za7n66lf5nz74qssfqpmk520cm7iq2njvvlqm2z"; }; + patches = [ ./lilv-pkgconfig.patch ]; + nativeBuildInputs = [ pkgconfig python3 wafHook ]; - buildInputs = [ lv2 serd sord sratom ]; + buildInputs = [ serd sord sratom ]; + propagatedBuildInputs = [ lv2 ]; meta = with stdenv.lib; { homepage = http://drobilla.net/software/lilv; diff --git a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch b/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch new file mode 100644 index 000000000000..a5a8c6007e43 --- /dev/null +++ b/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch @@ -0,0 +1,6 @@ +--- a/lilv.pc.in ++++ b/lilv.pc.in +@@ -9 +9,2 @@ Description: Simple C library for hosting LV2 plugins +-Requires: @LILV_PKG_DEPS@ ++Requires: lv2 ++Requires.private: @LILV_PKG_DEPS@ diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index f26f2b07e71a..fc14236fe24a 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1pglnjz907ajlhnlnig3p0sx7hdkpggr8ss7b3wzf1lykzgv9l52"; }; + patches = [ ./rtaudio-pkgconfig.patch ]; + enableParallelBuilding = true; buildInputs = [ autoconf automake libtool libjack2 alsaLib pulseaudio rtmidi ]; diff --git a/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch b/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch new file mode 100644 index 000000000000..8536332d46d7 --- /dev/null +++ b/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch @@ -0,0 +1,5 @@ +--- a/rtaudio.pc.in ++++ b/rtaudio.pc.in +@@ -9 +9 @@ Version: @PACKAGE_VERSION@ +-Requires: @req@ ++Requires.private: @req@ diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix new file mode 100644 index 000000000000..559642e7485e --- /dev/null +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -0,0 +1,29 @@ +# set VAMP_PATH ? +# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) + +{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: + +stdenv.mkDerivation rec { + pname = "vamp-plugin-sdk"; + version = "2.9"; + + src = fetchFromGitHub { + owner = "c4dm"; + repo = "vamp-plugin-sdk"; + rev = "vamp-plugin-sdk-v${version}"; + sha256 = "1ay12gjqp2wzysg9k2qha3gd8sj5rjlfy4hsl923csi4ssiapsh1"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsndfile ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; + homepage = https://vamp-plugins.org/; + license = licenses.bsd3; + maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix deleted file mode 100644 index 2ac3115af2aa..000000000000 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -# set VAMP_PATH ? -# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) - -{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: - -{ - - vampSDK = stdenv.mkDerivation { - name = "vamp-sdk-2.7.1"; - # version = "2.7.1"; - - src = fetchFromGitHub { - owner = "c4dm"; - repo = "vamp-plugin-sdk"; - rev = "vamp-plugin-sdk-v2.7.1"; - sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsndfile ]; - - meta = with stdenv.lib; { - description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; - homepage = https://sourceforge.net/projects/vamp; - license = licenses.bsd3; - maintainers = [ maintainers.goibhniu maintainers.marcweber ]; - platforms = platforms.linux; - }; - }; - -} diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 1c81dd608cbf..22578dad38db 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchFromGitHub, cmake, bcunit, mbedtls }: +{ bcunit +, cmake +, fetchFromGitLab +, mbedtls +, stdenv +}: stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "0.6.0"; + version = "4.3.1"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; rev = version; - sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909"; + sha256 = "1y91jcrma4kjqpm6w5ahlygjsyvx7l8zjrjvq7g2n39jmw175cvs"; }; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - meta = { + meta = with stdenv.lib; { inherit version; description = "Utilities library for Linphone"; - homepage = "https://github.com/BelledonneCommunications/bctoolbox"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; + # Still using GPLv2 but as the rest of the Linphone projects have switched + # to GPLv3, this might too, so check this when bumping the version number. + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin jluttine ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index aa6cb8513ae4..11de04889159 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -1,24 +1,34 @@ -{ stdenv, cmake, fetchFromGitHub, bctoolbox, belr }: +{ bctoolbox +, belr +, cmake +, fetchFromGitLab +, stdenv +}: stdenv.mkDerivation rec { - baseName = "belcard"; - version = "1.0.2"; - name = "${baseName}-${version}"; + pname = "belcard"; + version = "4.3.1"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; - repo = baseName; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; rev = version; - sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk"; + sha256 = "1w6rbp53cwxr00clp957458x27cgc2y9ylwa5mp812qva7zadmfw"; }; buildInputs = [ bctoolbox belr ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib;{ - description = "Belcard is a C++ library to manipulate VCard standard format"; - homepage = https://github.com/BelledonneCommunications/belcard; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + + meta = with stdenv.lib; { + description = "C++ library to manipulate VCard standard format"; + homepage = "https://gitlab.linphone.org/BC/public/belcard"; license = licenses.lgpl21; platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 0d3df37d8e09..a935372656e7 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -1,22 +1,36 @@ -{ stdenv, antlr3_4, libantlr3c, jre, mbedtls, fetchFromGitHub - , cmake, zlib, bctoolbox +{ antlr3_4 +, bctoolbox +, cmake +, fetchFromGitLab +, jre +, libantlr3c +, mbedtls +, stdenv +, zlib }: stdenv.mkDerivation rec { pname = "belle-sip"; - version = "1.6.3"; - - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-02-18"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; - rev = version; - sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk"; + rev = "0dcb13416eae87edf140771b886aedaf6be8cf60"; + sha256 = "0pzxk8mkkg6zsnmj1bwggbdjv864psx89gglfm51h8s501kg11fv"; }; nativeBuildInputs = [ jre cmake ]; buildInputs = [ zlib ]; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" "-Wno-error=format-truncation" @@ -29,9 +43,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = https://linphone.org/technical-corner/belle-sip; + homepage = "https://linphone.org/technical-corner/belle-sip"; description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers"; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index f0557b0379f2..90067e493a15 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -1,24 +1,35 @@ -{ stdenv, cmake, fetchFromGitHub, bctoolbox }: +{ bctoolbox +, cmake +, fetchFromGitLab +, stdenv +}: stdenv.mkDerivation rec { - baseName = "belr"; - version = "0.1.3"; - name = "${baseName}-${version}"; + pname = "belr"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-03-09"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; - repo = baseName; - rev = version; - sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; + rev = "326d030ca9db12525c2a6d2a65f386f36f3c2ed5"; + sha256 = "1cdblb9smncq3al0crqp5651b02k1g6whlw1ib769p61gad0rs3v"; }; buildInputs = [ bctoolbox ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib;{ + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + + meta = with stdenv.lib; { description = "Belr is Belledonne Communications' language recognition library"; - homepage = https://github.com/BelledonneCommunications/belr; - license = licenses.lgpl21; + homepage = "https://gitlab.linphone.org/BC/public/belr"; + license = licenses.gpl3; platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/boost/1.72.nix b/pkgs/development/libraries/boost/1.72.nix new file mode 100644 index 000000000000..680afe8bcb87 --- /dev/null +++ b/pkgs/development/libraries/boost/1.72.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.72.0"; + + src = fetchurl { + #url = "mirror://sourceforge/boost/boost_1_72_0.tar.bz2"; + urls = [ + "mirror://sourceforge/boost/boost_1_72_0.tar.bz2" + "https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_72_0.html + sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"; + }; +}) + diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index b2dc295db5b7..2eb5a2dfcffb 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -1,26 +1,38 @@ -{ stdenv, cmake, fetchFromGitHub, bctoolbox, sqlite }: +{ bctoolbox +, cmake +, fetchFromGitLab +, sqlite +, stdenv +}: stdenv.mkDerivation rec { - baseName = "bzrtp"; - version = "1.0.6"; - name = "${baseName}-${version}"; + pname = "bzrtp"; + version = "4.3.1"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; - repo = baseName; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; rev = version; - sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45"; + sha256 = "14fqp6r9rf7z6j5phbsrdxlbjak03hs8kb94b6jgcrcdxrxhy3fy"; }; buildInputs = [ bctoolbox sqlite ]; nativeBuildInputs = [ cmake ]; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; meta = with stdenv.lib; { description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol"; - homepage = https://github.com/BelledonneCommunications/bzrtp; + homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; + # They have switched to GPLv3 on git HEAD so probably the next release will + # be GPL3. license = licenses.lgpl21; platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 32e723671e8c..6cb2ac604436 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -5,14 +5,14 @@ let pname = "clutter"; - version = "1.26.2"; + version = "1.26.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7"; + sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e122c1e7b120..3557f1cf1a2a 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -7,11 +7,11 @@ let pname = "cogl"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.22.4"; + version = "1.22.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj"; + sha256 = "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd"; }; patches = [ diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 93ee2ddc7046..6453ff2a3e91 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,25 +7,14 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0cghk1a0ki1063ci63imakmggwzkky1hx6lhrvc0wjfv754wsklb"; + sha256 = "1c5rs28pavv8zabprjbd2y1sblgqbbhww07qvairh149rahvxi85"; }; - # See https://github.com/Martchus/cpp-utilities/issues/18 - patches = [ - (fetchpatch { - url = "https://github.com/Martchus/cpp-utilities/commit/b2a2773cdfb2b0017a3fa3d0ed2259a9a5fda666.patch"; - sha256 = "01js90ba4xxljifncm48zbxmg7mwwz1gla1hn87yzbic47d85hfj"; - }) - (fetchpatch { - url = "https://github.com/Martchus/cpp-utilities/commit/4dd2179f191d1ace113f26177944684fa1561dc1.patch"; - sha256 = "0chw33mwsvj7cigd1c4xl2zhpbfsp5rrijdm46qpn78bq70xcz9j"; - }) - ]; nativeBuildInputs = [ cmake ]; checkInputs = [ cppunit ]; diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 5b37088cd95f..261befbdd05f 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -1,26 +1,18 @@ { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3 -, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }: +, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }: let pname = "dconf"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "0.34.0"; + version = "0.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll"; + sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz"; }; - patches = [ - # Fix build with Meson 0.52 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/dconf/commit/cc32667c5d7d9ff95e65cc21f59905d8f9218394.patch"; - sha256 = "02gfadn34bg818a7vb3crhsiahskiflcvx9l6iqwf1v269q93mr8"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py tests/test-dconf.py patchShebangs meson_post_install.py @@ -29,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 gtk-doc docbook_xsl docbook_xml_dtd_42 ]; + nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 glib gtk-doc docbook_xsl docbook_xml_dtd_42 ]; buildInputs = [ glib bash-completion dbus ]; mesonFlags = [ @@ -42,7 +34,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; @@ -50,6 +41,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/dconf; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index dc7610ee1782..819f94cc44f5 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , zlib , expat , cmake @@ -23,6 +24,16 @@ stdenv.mkDerivation rec { sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf"; }; + patches = [ + # included in next release + (fetchpatch { + name = "cve-2019-20421.patch"; + url = "https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8.patch"; + sha256 = "16r19qb9l5j43ixm5jqid9sdv5brlkk1wq0w79rm5agxq4kblfyc"; + excludes = [ "tests/bugfixes/github/test_issue_1011.py" "test/data/Jp2Image_readMetadata_loop.poc" ]; + }) + ]; + cmakeFlags = [ "-DEXIV2_BUILD_PO=ON" "-DEXIV2_BUILD_DOC=ON" diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 596de28d2df3..f6a7f6c12fbf 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.03"; + version = "20.04"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "0wlbh1py9074896fxa8lcfvjj3l943zz8wjl2rn7g21xf0ar9kyv"; + sha256 = "0ykc2y1w0wh6s3g9xzk3zqscvdjnf59923zxh2x0whxlcvndab2d"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 5eb7e3866ce6..0f580e3cd2b4 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,24 +1,17 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "fcgi"; - version = "2.4.0"; + version = "2.4.2"; - src = fetchurl { - url = "https://launchpad.net/debian/+archive/primary/+files/libfcgi_${version}.orig.tar.gz"; - # url = "http://www.fastcgi.com/dist/${name}.tar.gz"; - sha256 = "1f857wnl1d6jfrgfgfpz3zdaj8fch3vr13mnpcpvy8bang34bz36"; + src = fetchFromGitHub { + owner = "FastCGI-Archives"; + repo = "fcgi2"; + rev = version; + sha256 = "1jhz6jfwv5kawa8kajvg18nfwc1b30f38zc0lggszd1vcmrwqkz1"; }; - patches = [ - ./gcc-4.4.diff - (fetchpatch { - # Fix a stack-smashing bug: - # xhttps://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681591 - url = "https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417/+attachment/2745025/+files/poll.patch"; - sha256 = "0v3gw0smjvrxh1bv3zx9xp633gbv5dd5bcn3ipj6ckqjyv4i6i7m"; - }) - ]; + nativeBuildInputs = [ autoreconfHook ]; postInstall = "ln -s . $out/include/fastcgi"; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 3788974e1244..ceca7e24fb6e 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.6.2"; + version = "1.6.3"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "02k9p5n60gz2k85n805n9niic4miw0mfh0i7yk1vrc8vaa5h69wd"; + sha256 = "17s8nqdxd4xdy7ag9bw06adxccha78jmlsa3zpqnl3qh92pg0hji"; }; patches = [ diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 89b7938de1e4..ac75eae0d129 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.13.2"; + version = "0.14.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wq14yjs7m3axziy679a854vc7r7fj1l38p9jnyapb21vswdcqq2"; + sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"; }; mesonFlags = [ @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { description = "A library that aggregates people from multiple sources to create metacontacts"; homepage = https://wiki.gnome.org/Projects/Folks; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 17b2a6b7c990..64c017185426 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu +{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu , GLUT, Cocoa }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9"; }; - buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ] + buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 855ca0385dfd..52c3f047c190 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.6"; + version = "1.1.26"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2"; + sha256 = "1nqxcnf6lax7grsxhajq87h92ngm487nzzz87kkmh1nzk33r7dwd"; }; buildInputs = [ diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 9946ebc05a54..0034f7ed6333 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { description = "GObject library to create cabinet files"; homepage = "https://gitlab.gnome.org/GNOME/gcab"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index cf0f22fdd408..55827b1ad0bc 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,6 +1,8 @@ { stdenv , fetchurl , pkgconfig +, meson +, ninja , gettext , gnupg , p11-kit @@ -15,30 +17,38 @@ , vala , gnome3 , python3 +, shared-mime-info }: stdenv.mkDerivation rec { pname = "gcr"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9"; + sha256 = "00b6bzpr8rj8mvj66r2273r417wg2y21m6n88mhkq9m22z8bxyda"; }; postPatch = '' patchShebangs build/ gcr/fixtures/ + + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig + meson + python3 + ninja gettext gobject-introspection libxslt makeWrapper vala + shared-mime-info ]; buildInputs = [ @@ -58,6 +68,10 @@ stdenv.mkDerivation rec { python3 ]; + mesonFlags = [ + "-Dgtk_doc=false" + ]; + doCheck = false; # fails 21 out of 603 tests, needs dbus daemon enableParallelBuilding = true; @@ -75,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; description = "GNOME crypto services (daemon and tools)"; homepage = "https://gitlab.gnome.org/GNOME/gcr"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 6f57d735980d..4a0d918cabea 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gd"; - version = "2.2.5"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; - sha256 = "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"; + sha256 = "0n5czhxzinvjvmhkf5l9fwjdx5ip69k5k7pj6zwb6zs1k9dibngc"; }; hardeningDisable = [ "format" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 2 tests meta = with stdenv.lib; { - homepage = https://libgd.github.io/; + homepage = "https://libgd.github.io/"; description = "A dynamic image creation library"; license = licenses.free; # some custom license platforms = platforms.unix; diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index c4baaa3fae98..dd5222f7b511 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome docking library"; homepage = https://developer.gnome.org/gdl/; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index c1d0d7e8a4f1..ec9bf2e5cb99 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geocode-glib"; - version = "3.26.1"; + version = "3.26.2"; outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv"; + sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index e7fce696894f..b8e056edb416 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.7.3"; + name = "geos-3.8.0"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "0znaby3fs3fy7af5njrnmjnfsa80ac97fvamlnjiywddw3j5l0q2"; + sha256 = "1mb2v9fy1gnbjhcgv0xny11ggfb17vkzsajdyibigwsxr4ylq4cr"; }; enableParallelBuilding = true; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ port of the Java Topology Suite (JTS)"; - homepage = http://geos.refractions.net/; + homepage = https://trac.osgeo.org/geos; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 7203f8531c27..7e447a434e45 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "GObject wrapper around the Exiv2 photo metadata library"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 235cd1950713..bd3aff61ee36 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GFBGraph; description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 873865cdf837..8d52f190d016 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "0.99.0"; + version = "1.0.0"; # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg"; + sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index d63c06981273..1f25abd2cf38 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -1,11 +1,14 @@ { fetchurl +, fetchpatch , stdenv +, meson +, ninja , pkgconfig , gnome3 , gtk3 , atk , gobject-introspection -, spidermonkey_60 +, spidermonkey_68 , pango , cairo , readline @@ -14,21 +17,29 @@ , dbus , gdk-pixbuf , makeWrapper +, xvfb_run , nixosTests }: -stdenv.mkDerivation rec { +let + testDeps = [ + gobject-introspection # for Gio and cairo typelibs + gtk3 atk pango.out gdk-pixbuf + ]; +in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.58.5"; + version = "1.64.1"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fm1szmhdawvgbf9fh6vvkv1fdvbn888fciyi2wkhx48kz09jvg7"; + sha256 = "0z4qx4s3174b1w5b0slnn6jwpy2c18s4fvx4xii2kflr7s4q7bsm"; }; outputs = [ "out" "dev" "installedTests" ]; nativeBuildInputs = [ + meson + ninja pkgconfig makeWrapper libxml2 # for xml-stripblanks @@ -38,30 +49,61 @@ stdenv.mkDerivation rec { gobject-introspection cairo readline - spidermonkey_60 + spidermonkey_68 dbus # for dbus-run-session ]; + checkInputs = [ + xvfb_run + ] ++ testDeps; + propagatedBuildInputs = [ glib ]; - configureFlags = [ - "--enable-installed-tests" + mesonFlags = [ + "-Dprofiler=disabled" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + patches = [ + # Hard-code various paths + ./fix-paths.patch + + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch ]; + # Gio test is failing + # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-599325843 + doCheck = false; + postPatch = '' - for f in installed-tests/*.test.in; do - substituteInPlace "$f" --subst-var-by pkglibexecdir "$installedTests/libexec/gjs" - done + substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console ''; - postInstall = '' - moveToOutput "share/installed-tests" "$installedTests" - moveToOutput "libexec/gjs/installed-tests" "$installedTests" + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib $installedTests/libexec/gjs/installed-tests + ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 + ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/gjs/installed-tests/libgimarshallingtests.so + ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/gjs/installed-tests/libregress.so + ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/gjs/installed-tests/libwarnlib.so + ''; + postInstall = '' wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \ - --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk-pixbuf ]}:$installedTests/libexec/gjs/installed-tests" + --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" + ''; + + checkPhase = '' + runHook preCheck + xvfb-run -s '-screen 0 800x600x24' \ + meson test --print-errorlogs + runHook postCheck ''; separateDebugInfo = stdenv.isLinux; @@ -80,7 +122,7 @@ stdenv.mkDerivation rec { description = "JavaScript bindings for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gjs/fix-paths.patch b/pkgs/development/libraries/gjs/fix-paths.patch new file mode 100644 index 000000000000..5ca5372ea947 --- /dev/null +++ b/pkgs/development/libraries/gjs/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh +index 0d118490..54c5507e 100755 +--- a/installed-tests/debugger-test.sh ++++ b/installed-tests/debugger-test.sh +@@ -3,7 +3,7 @@ + if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then + gjs="$TOP_BUILDDIR/gjs-console" + else +- gjs=gjs-console ++ gjs=@gjsConsole@ + fi + + echo 1..1 diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/development/libraries/gjs/installed-tests-path.patch new file mode 100644 index 000000000000..11a39b2dd9a5 --- /dev/null +++ b/pkgs/development/libraries/gjs/installed-tests-path.patch @@ -0,0 +1,24 @@ +diff --git a/installed-tests/meson.build b/installed-tests/meson.build +index 294d20c6..1e5029e0 100644 +--- a/installed-tests/meson.build ++++ b/installed-tests/meson.build +@@ -1,7 +1,7 @@ + ### Installed tests ############################################################ + +-installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests' +-installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name() ++installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / meson.project_name() / 'installed-tests' ++installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name() + + # Simple shell script tests # + +diff --git a/meson_options.txt b/meson_options.txt +index 66f66024..008687cb 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false, + description: 'Skip tests that need a display connection') + option('verbose_logs', type: 'boolean', value: false, + description: 'Enable extra log messages that may decrease performance (not allowed in release builds)') ++option('installed_test_prefix', type: 'string', value: '', ++ description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index 8b522c6e92b0..2ed717a49b85 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -2,12 +2,12 @@ , zlib, libGL, libGLU, libpng, freeglut }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; pname = "gl2ps"; src = fetchurl { url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; - sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3"; + sha256 = "0fsx5lh9pz1xswr4yng24j4ngiijnanksbgz05bfzkh07m5h6qkk"; }; buildInputs = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://geuz.org/gl2ps; + homepage = "http://geuz.org/gl2ps"; description = "An OpenGL to PostScript printing library"; platforms = platforms.all; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 86f73e23d50c..0eb5cb4225d3 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.62.3"; + version = "2.64.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xvzixzwwh8wk8f79qbm2gl7hp3hj1a7skv281v5qsx74dpzi8cc"; + sha256 = "1fm1462v7z556qivlwflvc3qpz36jwpzqxxvsihh45j7aka2gnjw"; }; patches = [ @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { description = "Network-related giomodules for glib"; homepage = https://gitlab.gnome.org/GNOME/glib-networking; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 6bc5a6c2535a..f4f4cefa5405 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.62.5"; + version = "2.64.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq"; + sha256 = "1ixvjmsrj45xq9bq3chhj98jhgcsqa08v627mjx6sjxlph1pd5hp"; }; patches = optionals stdenv.isDarwin [ @@ -62,8 +62,6 @@ stdenv.mkDerivation rec { ./gobject_init_on_demand.patch ] ++ [ ./schema-override-variable.patch - # Require substituteInPlace in postPatch - ./fix-gio-launch-desktop-path.patch # GLib contains many binaries used for different purposes; # we will install them to different outputs: @@ -126,9 +124,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # substitute fix-gio-launch-desktop-path.patch - substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin" - chmod +x gio/tests/gengiotypefuncs.py patchShebangs gio/tests/gengiotypefuncs.py chmod +x docs/reference/gio/concat-files-helper.py @@ -148,11 +143,6 @@ stdenv.mkDerivation rec { # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c - '' + optionalString (!stdenv.isDarwin) '' - # Add gio-launch-desktop to $out so we can refer to it from $lib - mkdir $out/bin - mv "$bin/bin/gio-launch-desktop" "$out/bin/" - ln -s "$out/bin/gio-launch-desktop" "$bin/bin/" '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cp -r ${buildPackages.glib.devdoc} $devdoc ''; diff --git a/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch b/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch deleted file mode 100644 index 4fdec2dd7e7d..000000000000 --- a/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gio/gdesktopappinfo.c -+++ b/gio/gdesktopappinfo.c -@@ -2725,7 +2725,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, - - /* Fall back on usual searching in $PATH */ - if (tmp == NULL) -- tmp = "gio-launch-desktop"; -+ tmp = "@bindir@/gio-launch-desktop"; - g_once_init_leave (&gio_launch_desktop_path, tmp); - } - diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 754d5aa74114..80753823ff13 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection +, vala }: stdenv.mkDerivation rec { - version = "3.2.5"; + version = "3.2.6"; pname = "gmime"; src = fetchurl { url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; - sha256 = "0ndsg1z1kq4w4caascydvialpyn4rfbjdn7xclzbzhw53x85cxgv"; + sha256 = "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb"; }; outputs = [ "out" "dev" ]; - buildInputs = [ gobject-introspection zlib gpgme libidn2 libunistring ]; + buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib ]; - configureFlags = [ "--enable-introspection=yes" ]; + configureFlags = [ + "--enable-introspection=yes" + "--enable-vala=yes" + ]; postPatch = '' substituteInPlace tests/testsuite.c \ @@ -28,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/jstedfast/gmime/; + homepage = "https://github.com/jstedfast/gmime/"; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index f6ff3a2ea4ad..f8e25640f29a 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-menus"; - version = "3.32.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0x2blzqrapmbsbfzxjcdcpa3vkw9hq5k96h9kvjmy9kl415wcl68"; + sha256 = "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r"; }; makeFlags = [ diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index adbb714c7b29..7b254b922bcc 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.34.1"; + version = "3.36.0"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "0ry06qw068rqn4y42953kwl6fkxpgfya58y87cd3zink6gj7q0fm"; + sha256 = "15j3xh93rqjphjw56j00g40m684nr4zy3hs7dsngm6a21l87fkfd"; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -92,7 +92,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; @@ -101,6 +100,6 @@ stdenv.mkDerivation rec { description = "Single sign-on framework for GNOME"; platforms = platforms.linux; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index 03799c1ef7c4..b46eb899ca89 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "A collection of GStreamer effects to be used in different GNOME Modules"; homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index cde8587acc37..09cb217cb058 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.6.12"; + version = "3.6.13"; # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "0jvca1qahn9lrwv6f5kfs95icirc15b2a8x9fzczyj996ipg3b5z"; + sha256 = "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 81df734a2ce3..cf889c282043 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -7,17 +7,14 @@ # it may be worth thinking about using multiple derivation outputs # In that case its about 6MB which could be separated -let - pname = "gobject-introspection"; - version = "1.62.0"; -in with stdenv.lib; stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "gobject-introspection"; + version = "1.64.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "10pwykfnk7pw8k9k8iz3p72phxvyrh5q4d7gr3ysv08w15immh7a"; }; outputs = [ "out" "dev" "man" ]; @@ -32,6 +29,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "--datadir=${placeholder "dev"}/share" + "-Ddoctool=disabled" + "-Dcairo=disabled" ]; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build @@ -56,6 +55,19 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch64; + preBuild = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that we will delete before installation. + mkdir -p $out/lib + ln -s $PWD/tests/scanner/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} + ''; + + preInstall = '' + rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 2d5133afab4d..aab40a556e27 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Gom; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index ed2b5563bd37..9e5ff187ac6a 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which, ncurses , texinfo , buildPackages @@ -20,6 +20,21 @@ stdenv.mkDerivation rec { sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4"; }; + patches = [ + # Fix tests with gnupg > 2.2.19 + # https://dev.gnupg.org/T4820 + (fetchpatch { + name = "cff600f1f65a2164ab25ff2b039cba008776ce62.patch"; + url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=cff600f1f65a2164ab25ff2b039cba008776ce62"; + sha256 = "9vB2aTv3zeAQS3UxCDfkRjqUlng8lkcyJPgMzdm+Qzc="; + }) + (fetchpatch { + name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; + url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"; + sha256 = "pKL1tvUw7PB2w4FHSt2up4SvpFiprBH6TLdgKxYFC3g="; + }) + ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 45096e031d37..818d3c30de2d 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "grantlee"; - version = "5.1.0"; + version = "5.2.0"; grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; src = fetchurl { url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz"; - sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq"; + sha256 = "02lrdbnvaz19hkawbbj2psww1m04qsbhvv172ggpp5bbfkjwx6hk"; name = "${pname}-${version}.tar.gz"; }; diff --git a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch deleted file mode 100644 index d049d6c96f81..000000000000 --- a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Sat, 20 Jul 2019 17:35:30 +0200 -Subject: [PATCH] Fix compile with newer Qt/cmake combination - -Without this i get huge errors about Qt needing C++11 support ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6d51110..0859788 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,6 +11,9 @@ endif() - - project(Grantlee) - -+set (CMAKE_CXX_STANDARD 11) -+set (CMAKE_CXX_EXTENSIONS OFF) -+ - # Workaround for http://public.kitware.com/Bug/view.php?id=12301 - if (MINGW) - if(NOT CMAKE_BUILD_TYPE) diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch index d78ef74ce352..64eb11c3f156 100644 --- a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch +++ b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch @@ -2,17 +2,17 @@ Index: grantlee-5.1.0/templates/lib/templateloader.cpp =================================================================== --- grantlee-5.1.0.orig/templates/lib/templateloader.cpp +++ grantlee-5.1.0/templates/lib/templateloader.cpp -@@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB +@@ -142,10 +142,6 @@ Template FileSystemTemplateLoader::loadByName(const QString &fileName, + QLatin1Char('/') + fileName); const QFileInfo fi(file); - + - if (file.exists() - && !fi.canonicalFilePath().contains( -- QDir(d->m_templateDirs.at(i)).canonicalPath())) +- QDir(d->m_templateDirs.at(i)).canonicalPath())) - return Template(); ++i; } - + @@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co + QLatin1Char('/') + fileName); diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series index 19850b2e7e43..9c4015a1c197 100644 --- a/pkgs/development/libraries/grantlee/5/series +++ b/pkgs/development/libraries/grantlee/5/series @@ -1,3 +1,2 @@ grantlee-nix-profiles.patch grantlee-no-canonicalize-filepath.patch -grantlee-cxx11.patch diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 21530c000dae..d6922dfdcd85 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -87,7 +87,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; @@ -95,7 +94,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Grilo; description = "A collection of plugins for the Grilo framework"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index b52ddbb0408e..b94d93935a04 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Grilo; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 815d3becf6f8..8549eeffde6d 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: stdenv.mkDerivation rec { - version = "1.27.1"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too + version = "1.28.1"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1yvmqxv6pwzbxw3si47x3anvl2pp3qy1acspmz4v60pd188c1fnc"; + sha256 = "17p3xwz5izlqg5ijnim4asl40pr8yhg9wrrmws4g0dk37nkn1x6p"; fetchSubmodules = true; }; patches = [ @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; maintainers = [ maintainers.lnl7 maintainers.marsam ]; - homepage = https://grpc.io/; + homepage = "https://grpc.io/"; + platforms = platforms.all; + changelog = "https://github.com/grpc/grpc/releases/tag/v${version}"; }; } diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index ea6e08811afa..c1fa8af1271c 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bayr76aylawf2fhyjhv9zgk4kpv7ivrrmd80khb0h3h1wk092r8"; + sha256 = "19hfjqzddkmvxg80v23xpbd1my2pzjalx3d56d2k4dk5521vcjkn"; }; passthru = { @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobject-introspection ]; - nativeBuildInputs = [ pkgconfig python3 meson ninja ]; + nativeBuildInputs = [ pkgconfig python3 meson ninja glib ]; meta = with stdenv.lib; { - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 1405d4782ad3..e24fca00a70b 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "gsm"; - version = "1.0.18"; + version = "1.0.19"; src = fetchurl { url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz"; - sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4"; + sha256 = "1xkha9ss5g5qnfaybi8il0mcvp8knwg9plgh8404vh58d0pna0s9"; }; patchPhase = '' diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index b1869193a093..7291ee40afd0 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; description = "Small library for playing system sounds"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 71a427eb2a66..887de1d76c10 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { description = "A spell-checking library for GTK applications"; homepage = https://wiki.gnome.org/Projects/gspell; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 4fb62423d687..ae5fd7531325 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , meson , ninja , gettext @@ -96,6 +97,12 @@ in stdenv.mkDerivation rec { }; patches = [ + # Fix build with neon 0.31 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1165 + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/f10b424418e448211e3427a76fcd046e157ef0b7.patch"; + sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p"; + }) ./fix_pkgconfig_includedir.patch ]; @@ -178,7 +185,6 @@ in stdenv.mkDerivation rec { libgudev libnice libofa - lrdf sbc spandsp diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 178f6a1fe893..79405e5077e0 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -37,6 +37,7 @@ , enableGl ? (enableX11 || enableWayland || enableCocoa) , enableCdparanoia ? (!stdenv.isDarwin) , cdparanoia +, glib }: stdenv.mkDerivation rec { @@ -60,13 +61,15 @@ stdenv.mkDerivation rec { pkgconfig python3 gettext + orc + glib gobject-introspection # docs gtk-doc docbook_xsl docbook_xml_dtd_43 - ]; + ] ++ lib.optional enableWayland wayland; buildInputs = [ orc diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 3dd7a547de96..67a0aa9f3f89 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { flex python3 makeWrapper + glib gobject-introspection bash-completion @@ -57,7 +58,9 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = [ + bash-completion + ] ++ lib.optionals stdenv.isLinux [ libcap libunwind elfutils diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 9f381c5ac708..48b89c51772f 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -48,7 +48,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.14"; + version = "3.24.17"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w"; + sha256 = "1h5snvqz8f6zgwpmq7pblvfwj5dphfckj8bv7vdz1c0w49dja47j"; }; patches = [ @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 ./patches/01-build-Fix-path-handling-in-pkgconfig.patch ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 1b35221f066b..6a60785268c8 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = "gtksourceview"; - attrPath = "gnome3.gtksourceview"; + attrPath = "gtksourceview3"; }; }; @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/GtkSourceView; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index d3a7d849062e..588cf4d2b4da 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16k8kqw9w775f1ijsk898hp210an5mv4yfyrmik9m8khxx593nwx"; + sha256 = "11csdnb5xj1gkn1shynp3jdsfhhi7ks3apgmavfan0p6n85f64sc"; }; propagatedBuildInputs = [ @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/GtkSourceView; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index d60bb29c47ae..c96f7ae820a2 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = https://developer.gnome.org/gtksourceviewmm/; description = "C++ wrapper for gtksourceview"; license = licenses.lgpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 1b66bfd031fc..6b81b7981ee9 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = "gtksourceviewmm"; - attrPath = "gnome3.gtksourceviewmm"; versionPolicy = "none"; }; }; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f8db6f573d93..cff6569be50b 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.42.2"; + version = "1.44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jgrbid8a61hgh05wl8c4f4638x7dffd5vip02jmladxfdszjymm"; + sha256 = "0ipv0jgzim6glsgizmfjkx0m3gd1l9lr242m0jj6cdmhs52k5vsh"; }; postPatch = '' @@ -126,6 +126,6 @@ stdenv.mkDerivation rec { description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ] ++ gnome3.maintainers; + maintainers = [ maintainers.lethalman ] ++ teams.gnome.members; }; } diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 6dc3871e1c18..4055cb8eb71e 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "hiredis"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "0ik38lwpmm780jqrry95ckf6flmvd172444p3q8d1k9n99jwij9c"; + sha256 = "1r93ssniiv610pj6d78i1cngism0cdv2k8cmzy7jf9klf76jiwfq"; }; PREFIX = "\${out}"; meta = with stdenv.lib; { - homepage = https://github.com/redis/hiredis; + homepage = "https://github.com/redis/hiredis"; description = "Minimalistic C client for Redis >= 1.2"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 7c3b313dd60b..203fcaa19ec8 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "2.9.3"; + version = "2.9.4"; in stdenv.mkDerivation { pname = "http-parser"; inherit version; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { owner = "nodejs"; repo = "http-parser"; rev = "v${version}"; - sha256 = "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811"; + sha256 = "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c"; }; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "An HTTP message parser written in C"; - homepage = https://github.com/nodejs/http-parser; + homepage = "https://github.com/nodejs/http-parser"; maintainers = with maintainers; [ matthewbauer ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index ffa64858b758..35f8a8484e72 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null; with stdenv.lib; let - version = "2.1.0"; + version = "2.2.0"; versmm = versions.major version + "." + versions.minor version; name = "hwloc-${version}"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2"; - sha256 = "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr"; + sha256 = "0li27a3lnmb77qxpijj0kpblz32wmqd3b386sypq8ar7vy9vhw5f"; }; configureFlags = [ @@ -80,7 +80,7 @@ in stdenv.mkDerivation { # https://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; - homepage = https://www.open-mpi.org/projects/hwloc/; + homepage = "https://www.open-mpi.org/projects/hwloc/"; maintainers = with maintainers; [ fpletz markuskowa ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 5816f044f574..6fe4484e6a31 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova -, curl, libjpeg, gsl }: +{ stdenv +, fetchurl +, cmake +, cfitsio +, libusb1 +, zlib +, boost +, libnova +, curl +, libjpeg +, gsl +}: stdenv.mkDerivation { name = "indilib-1.1.0"; @@ -9,13 +19,27 @@ stdenv.mkDerivation { sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; }; - patches = [ ./udev-dir.patch ] ; + patches = [ + ./udev-dir.patch + ]; - buildInputs = [ curl cmake cfitsio libusb zlib boost - libnova libjpeg gsl ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + curl + cfitsio + libusb1 + zlib + boost + libnova + libjpeg + gsl + ]; meta = { - homepage = https://www.indilib.org/; + homepage = "https://www.indilib.org/"; license = stdenv.lib.licenses.lgpl2Plus; description = "Implementaion of the INDI protocol for POSIX operating systems"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 4637c8c950fe..23b26c9a8908 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,19 +4,19 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "19.4.1"; + version = "20.1.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "167g5rmrmzmfp4y4vghyxqi4schvvkwax3cvqgniqx8q1ib5l346"; + sha256 = "0k130yiq8n34ppddpgl7kwq5w2y7n49jxiyk7x52y773m97xd6y1"; }; nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/gmmlib; + homepage = "https://github.com/intel/gmmlib"; license = licenses.mit; description = "Intel Graphics Memory Management Library"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index 675265ed4e32..96d2a76df018 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.9"; + version = "3.10"; pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "0l0q1hnicvpbjmxl81ig3rwc212x5sdfnlg3cniwbmnx8fxjgbki"; + sha256 = "144057jrx1jral6dnnb039h3k8rnrx0nj3ii428s725jfhazg68f"; }; installPhase = '' diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 9a18b025fabe..f811c0b09f82 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index b12495467212..05f46b03b0a8 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "A library to communicate using the JSON-RPC 2.0 specification"; homepage = https://gitlab.gnome.org/GNOME/jsonrpc-glib; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index d4fcf620db60..b7e6d7814711 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.66/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.68/ ) diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch index 0411755f45a6..f966064f9291 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch @@ -2,12 +2,12 @@ Index: kcmutils-5.33.0/src/kcmoduleloader.cpp =================================================================== --- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp +++ kcmutils-5.33.0/src/kcmoduleloader.cpp -@@ -96,7 +96,7 @@ KCModule *KCModuleLoader::loadModule(con - KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); - KPluginFactory* factory = loader.factory(); - if (!factory) { -- qWarning() << "Error loading plugin:" << loader.errorString(); -+ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); - } else { - KQuickAddons::ConfigModule *cm = factory->create<KQuickAddons::ConfigModule >(); - if (!cm) { +@@ -95,7 +95,7 @@ KCModule *KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep + KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); + KPluginFactory* factory = loader.factory(); + if (!factory) { +- qWarning() << "Couldn't load plugin:" << loader.errorString(); ++ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); + } else { + std::unique_ptr<KQuickAddons::ConfigModule> cm(factory->create<KQuickAddons::ConfigModule>(nullptr, args2)); + if (!cm) { diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 2441ff693590..ffea42c130f7 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,661 +1,662 @@ -# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks { fetchurl, mirror }: { attica = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/attica-5.66.0.tar.xz"; - sha256 = "e87ea061d393104804aa65db69ec3489512b472d8fb821c9fc49ffdcb85177fb"; - name = "attica-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/attica-5.68.0.tar.xz"; + sha256 = "9b4001a32831c9bae1d44161247acd5e6d3048ca2ece98c2c756c72a1464b9e9"; + name = "attica-5.68.0.tar.xz"; }; }; baloo = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/baloo-5.66.0.tar.xz"; - sha256 = "9495869eee72f587efadc8a848c3f76b93a1dcb1914c8e818d7084451107a1f8"; - name = "baloo-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/baloo-5.68.0.tar.xz"; + sha256 = "4b599fb279ef92dc4f575847767c370f2633b27e884e372c3f7b92f08917865e"; + name = "baloo-5.68.0.tar.xz"; }; }; bluez-qt = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/bluez-qt-5.66.0.tar.xz"; - sha256 = "cc3f3fcc1df87b61480549d658c1a27690661aaa4f22a65552efe3f6bf41c887"; - name = "bluez-qt-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/bluez-qt-5.68.0.tar.xz"; + sha256 = "99889cac874820e83a32bee938b6cc8e25dca6a3013d4a589ac7b8f5d32b4224"; + name = "bluez-qt-5.68.0.tar.xz"; }; }; breeze-icons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/breeze-icons-5.66.0.tar.xz"; - sha256 = "445a77204c7d9ac398e7f1d1594cd93e719665c85c7fb9ef71fde1ce68cb64d7"; - name = "breeze-icons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/breeze-icons-5.68.0.tar.xz"; + sha256 = "750fff6560abfa85a2243187d14f1b8f1d3d1c4097d84cbf8c58d2f48102fe8d"; + name = "breeze-icons-5.68.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/extra-cmake-modules-5.66.0.tar.xz"; - sha256 = "2ff1a4ede28488ea787e742ab37edaacc5f59bf9188476e48f681ce23300b9c4"; - name = "extra-cmake-modules-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/extra-cmake-modules-5.68.0.tar.xz"; + sha256 = "4d60869ca96a323b56f00b40c4728a70dfebe2132bbae040442a6a2ef90e2d6e"; + name = "extra-cmake-modules-5.68.0.tar.xz"; }; }; frameworkintegration = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/frameworkintegration-5.66.0.tar.xz"; - sha256 = "55c01613436781d74652bef19fc594448cdee4c002d5e1713b583473455f54d8"; - name = "frameworkintegration-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/frameworkintegration-5.68.0.tar.xz"; + sha256 = "5bb3c2e56b2c4c41d8a472363f80445fd3fc28656e6a3163d48ed826a133985a"; + name = "frameworkintegration-5.68.0.tar.xz"; }; }; kactivities = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kactivities-5.66.0.tar.xz"; - sha256 = "7c37c8f189cb3c9f0cacbcef606562d8bc596e685d2a47bc9994deae6e69f41f"; - name = "kactivities-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kactivities-5.68.0.tar.xz"; + sha256 = "1853135feb6adfec252e6fab0b1472450422afd5998a9a31d942e8672fbe7111"; + name = "kactivities-5.68.0.tar.xz"; }; }; kactivities-stats = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kactivities-stats-5.66.0.tar.xz"; - sha256 = "567de599a8fd8b6a5304fc1696e24b069b4eaa7bbc643b1e760293d8c1162b73"; - name = "kactivities-stats-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kactivities-stats-5.68.0.tar.xz"; + sha256 = "fb645db4685113dfd98834f48d8941529fee53d5e26ec5e36cfee8a9bfae97ae"; + name = "kactivities-stats-5.68.0.tar.xz"; }; }; kapidox = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kapidox-5.66.0.tar.xz"; - sha256 = "19af4d93adfa22ff4de832185c1e9191d35039394bb032ee60e33efc5cc456db"; - name = "kapidox-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kapidox-5.68.0.tar.xz"; + sha256 = "4f60582cb0771c38733989f192694636b1c93ecae290bfbe551030dd397e976e"; + name = "kapidox-5.68.0.tar.xz"; }; }; karchive = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/karchive-5.66.0.tar.xz"; - sha256 = "434f315af624d315b06a35ba5e71e570f36ca454af891833d6e896e42edf23d8"; - name = "karchive-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/karchive-5.68.0.tar.xz"; + sha256 = "518f07629d87e5778e1d8ce066f5590941472d9fffa7bd74819759be5c6edf0d"; + name = "karchive-5.68.0.tar.xz"; }; }; kauth = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kauth-5.66.0.tar.xz"; - sha256 = "f167ec8f926caf348a161a39e0c0588f517fe3a49ab4f39c1dfa94f47e104414"; - name = "kauth-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kauth-5.68.0.tar.xz"; + sha256 = "b9a7cd724709ea188852f7656fbeda2dc3cc40cc5d09573049c2680c0edbd41f"; + name = "kauth-5.68.0.tar.xz"; }; }; kbookmarks = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kbookmarks-5.66.0.tar.xz"; - sha256 = "b225463ec0fe2424a1f5e70c83b02e3ece6a3ca80832cd2621732d18d7160a43"; - name = "kbookmarks-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kbookmarks-5.68.0.tar.xz"; + sha256 = "80dc06188a5e1d960d46f527bd82d9b79df75a785164fa29a088a7b705abbf84"; + name = "kbookmarks-5.68.0.tar.xz"; }; }; kcalendarcore = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcalendarcore-5.66.0.tar.xz"; - sha256 = "bbdb48c775ccc1e1bdba962b5ccdc0611a2d14523076d33c4507c05db3ab33d3"; - name = "kcalendarcore-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcalendarcore-5.68.0.tar.xz"; + sha256 = "50ffbe4feb9a602c09e130d6f10f0f260fa7625bc266003697895e1d716d6ba9"; + name = "kcalendarcore-5.68.0.tar.xz"; }; }; kcmutils = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcmutils-5.66.0.tar.xz"; - sha256 = "e02dbf996ed93bdc2813a2a64dcb0ddeb54987dd84bbe787bd890b17d57e4a85"; - name = "kcmutils-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcmutils-5.68.0.tar.xz"; + sha256 = "a688d54286fe11b23e11e2100536a513a332d2a7d784fcbebeaccbfb980d83d1"; + name = "kcmutils-5.68.0.tar.xz"; }; }; kcodecs = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcodecs-5.66.0.tar.xz"; - sha256 = "0dcb684ad75374bbab82b90bda20e914cf656bd51a6dff69bbb1bfc650481a05"; - name = "kcodecs-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcodecs-5.68.0.tar.xz"; + sha256 = "5f1e6ae3a51ca817aa0a5082ce4ce5490cb527388ef1888a642fb374c5e2bb48"; + name = "kcodecs-5.68.0.tar.xz"; }; }; kcompletion = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcompletion-5.66.0.tar.xz"; - sha256 = "be5e272e257b9fe5b951d7c596fef7c75b16886e6b1cd5ebff60d87bd6dd495d"; - name = "kcompletion-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcompletion-5.68.0.tar.xz"; + sha256 = "642d68b4c472e11a8861a61238297633be288bfd72c13547707754f1ae2be33a"; + name = "kcompletion-5.68.0.tar.xz"; }; }; kconfig = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kconfig-5.66.0.tar.xz"; - sha256 = "c0df73bde40162a5ffc20604c2ad343e71a6df852c3f7b05e70e1464f5f63256"; - name = "kconfig-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kconfig-5.68.0.tar.xz"; + sha256 = "c3bf138a7a4d002475f2483987baf40a61cda7d491c3cc292dd2c6da726ee898"; + name = "kconfig-5.68.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kconfigwidgets-5.66.0.tar.xz"; - sha256 = "730834528307c65691d67c901f1c186b49d74ee986ef75e171e867e8751bf10a"; - name = "kconfigwidgets-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kconfigwidgets-5.68.0.tar.xz"; + sha256 = "f50421e9dbb6669e8d7c10605f7779ad03f30ea7c9c4451a70a7be66cd9df995"; + name = "kconfigwidgets-5.68.0.tar.xz"; }; }; kcontacts = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcontacts-5.66.0.tar.xz"; - sha256 = "08086f554eb4718e91a9e96d143ba05fc741289928db9bcc21b21ca7125b0017"; - name = "kcontacts-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcontacts-5.68.0.tar.xz"; + sha256 = "532f1e89c7412e971db8c431d627d38144470ddf5c978a7fa9348e418b6cd3c3"; + name = "kcontacts-5.68.0.tar.xz"; }; }; kcoreaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcoreaddons-5.66.0.tar.xz"; - sha256 = "8a8edf566cb08ad83cb17f942eeb8746993249cd0f7679f7eb810201b85e464b"; - name = "kcoreaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcoreaddons-5.68.0.tar.xz"; + sha256 = "c578ae30b4161e45e672d613d2d9c5575a849d21909d9817f90a441044df65d7"; + name = "kcoreaddons-5.68.0.tar.xz"; }; }; kcrash = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcrash-5.66.0.tar.xz"; - sha256 = "5a518059de3f3e85ee7b38a0edf348d097993518ce9b17504470f0d8aad3f2e4"; - name = "kcrash-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcrash-5.68.0.tar.xz"; + sha256 = "60daf2cee87c652619b098b688edce6f993c7960783159cd8be9d9145df29f7f"; + name = "kcrash-5.68.0.tar.xz"; }; }; kdbusaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdbusaddons-5.66.0.tar.xz"; - sha256 = "ee600f15af2fb9a28ad15f7e0689d519211fa63b86f2e6c356bd32530ebdfa46"; - name = "kdbusaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdbusaddons-5.68.0.tar.xz"; + sha256 = "839fe42f9ac8df353f87245110fd7b515a8eb29f0840f54481bd89e5175bf1af"; + name = "kdbusaddons-5.68.0.tar.xz"; }; }; kdeclarative = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdeclarative-5.66.0.tar.xz"; - sha256 = "ed3a334d8bce6d70e68e013d4210bd6e11cb2ebce9ede4c1813f44dada7eca73"; - name = "kdeclarative-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdeclarative-5.68.0.tar.xz"; + sha256 = "96a032bcb360e0ffcfe51d4d2f6153786682c2f967592bffcf15b9e6cd4cd3ae"; + name = "kdeclarative-5.68.0.tar.xz"; }; }; kded = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kded-5.66.0.tar.xz"; - sha256 = "52223e641c4e8e3158220ed7b6c48e4c3f3e67f882603ada0e3757b4136255a4"; - name = "kded-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kded-5.68.0.tar.xz"; + sha256 = "b03afe48fbdbd7d92c46b3b60bdb4b825f77e1a9d00c16a5f236b24a0135e4b7"; + name = "kded-5.68.0.tar.xz"; }; }; kdelibs4support = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kdelibs4support-5.66.0.tar.xz"; - sha256 = "314d0ddb95c024c3d36dd262fcaa9295b462e6430f84b22c82f145029e3b2708"; - name = "kdelibs4support-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kdelibs4support-5.68.0.tar.xz"; + sha256 = "2fca7bf9d31b081e7568631b6b6d2f7847068217261e47ef0dea106470c22df1"; + name = "kdelibs4support-5.68.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kdesignerplugin-5.66.0.tar.xz"; - sha256 = "a7f9c530d8c7d214a176ee381541bd45f3a000a3e86404040b11f1394912d40b"; - name = "kdesignerplugin-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kdesignerplugin-5.68.0.tar.xz"; + sha256 = "ae433e0eeaf0007312b1f32fc4349cf26c34617a5a9951ae4155c5c4e4009b72"; + name = "kdesignerplugin-5.68.0.tar.xz"; }; }; kdesu = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdesu-5.66.0.tar.xz"; - sha256 = "764d30acb0ef1d609c9454ecabb939bd64a814442e01aba769eba0673b56f88a"; - name = "kdesu-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdesu-5.68.0.tar.xz"; + sha256 = "427ba50bcd14308980cbdfdc77a6b7419277942a42d83da72ff3afbc1ec78903"; + name = "kdesu-5.68.0.tar.xz"; }; }; kdewebkit = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kdewebkit-5.66.0.tar.xz"; - sha256 = "f73d2599ce2269eaab45ddc11bdeb49dc887e950ded57454f3fd6499c370a777"; - name = "kdewebkit-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kdewebkit-5.68.0.tar.xz"; + sha256 = "181b14bd80e9f34aa2f896d39aca5be91f65d65bfaaf47660e91fdd98b7f36a2"; + name = "kdewebkit-5.68.0.tar.xz"; }; }; kdnssd = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdnssd-5.66.0.tar.xz"; - sha256 = "e280246212329f2834437ea3e84971fc85f3a3e6824963322e1f5de6aa04709c"; - name = "kdnssd-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdnssd-5.68.0.tar.xz"; + sha256 = "3369da85c0088c375f2123a82132fb84490c46ebc8e9cd1253c795ef45fd4403"; + name = "kdnssd-5.68.0.tar.xz"; }; }; kdoctools = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdoctools-5.66.0.tar.xz"; - sha256 = "41e4ca7aceab17919ef4a82ad99606f520ebfe57f30205597b4184f7a3730a7a"; - name = "kdoctools-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdoctools-5.68.0.tar.xz"; + sha256 = "93f5bee9dfaacacacfbeb3e915b192b5e645c1d01057b0cea4081c9ae5285670"; + name = "kdoctools-5.68.0.tar.xz"; }; }; kemoticons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kemoticons-5.66.0.tar.xz"; - sha256 = "dc307192d883108134da104d1507709a3b80c5b5e9984377840bd42d39a431dd"; - name = "kemoticons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kemoticons-5.68.0.tar.xz"; + sha256 = "e03fe81ad34e107dc5fe61f9bf424ecef7716bf8a62f8abb78fd3f6bd6806f56"; + name = "kemoticons-5.68.0.tar.xz"; }; }; kfilemetadata = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kfilemetadata-5.66.0.tar.xz"; - sha256 = "d78c2128887591229e6c61c60e77af8647e407d570b07892f5f06ab682f807b9"; - name = "kfilemetadata-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kfilemetadata-5.68.0.tar.xz"; + sha256 = "c2a8aee8243efa30fc921b7f50b390b47ee2cf83aa83b125a530a25de6d6fe21"; + name = "kfilemetadata-5.68.0.tar.xz"; }; }; kglobalaccel = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kglobalaccel-5.66.0.tar.xz"; - sha256 = "fae805994f946791525da65ca15f93b65b2001241c7539ad04b3aaef937fb1c3"; - name = "kglobalaccel-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kglobalaccel-5.68.0.tar.xz"; + sha256 = "2eb710a3f29cbc8b7875fb3e8315d7c8e3b5bb93867e0a34cd5cdbac690bcbbf"; + name = "kglobalaccel-5.68.0.tar.xz"; }; }; kguiaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kguiaddons-5.66.0.tar.xz"; - sha256 = "379e5ed87b00d344a13e424e39d97d74d494c503400bcd72df132de74c8cc591"; - name = "kguiaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kguiaddons-5.68.0.tar.xz"; + sha256 = "cdbf694e92b47358c2e2c31917bf5f01382042c2cb99b65faf3bc00a0eb52c64"; + name = "kguiaddons-5.68.0.tar.xz"; }; }; kholidays = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kholidays-5.66.0.tar.xz"; - sha256 = "2d9bb70fbcb3a45208409228b5e5a88b0cb00fe8f2621e2e938bc77c2df11f02"; - name = "kholidays-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kholidays-5.68.0.tar.xz"; + sha256 = "067a544c22f5988cf959a475b66ed62e419b975b3ee22810667a076f3d50dbba"; + name = "kholidays-5.68.0.tar.xz"; }; }; khtml = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/khtml-5.66.0.tar.xz"; - sha256 = "ee34b082760262fb9b5e287960955075ec72179585e51567350a08bf0b4b7a10"; - name = "khtml-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/khtml-5.68.0.tar.xz"; + sha256 = "af97da0a5d877c928d98690c3629a8f9788b29b27f583c9e3e26144a6abb9dcc"; + name = "khtml-5.68.0.tar.xz"; }; }; ki18n = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/ki18n-5.66.0.tar.xz"; - sha256 = "9622337a513fcb8f0b5100c218b9fa85617f92024e5d7feada6d071f58a329e3"; - name = "ki18n-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/ki18n-5.68.0.tar.xz"; + sha256 = "2c59dd55d032c95710e338e376a31bf11d799bceba8ebfdb148c8b77067a1e92"; + name = "ki18n-5.68.0.tar.xz"; }; }; kiconthemes = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kiconthemes-5.66.0.tar.xz"; - sha256 = "93fa9b8d0f951c2c9991f366081f98670086f2b66a740d7be95b64c35dff111d"; - name = "kiconthemes-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kiconthemes-5.68.0.tar.xz"; + sha256 = "ac3f322f2644dd0468cd2b07cc0c7f853f1ac4bc714fe532bbe92e88141f6729"; + name = "kiconthemes-5.68.0.tar.xz"; }; }; kidletime = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kidletime-5.66.0.tar.xz"; - sha256 = "66e891b33ed9026ed6fd211cd1ecf3405255b19d3a58199b87af0b22a40d7185"; - name = "kidletime-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kidletime-5.68.0.tar.xz"; + sha256 = "cd6309d403ea36553abc99af4fa7e4ed3f8b3b2c55d14887ef09d68e5627b3e7"; + name = "kidletime-5.68.0.tar.xz"; }; }; kimageformats = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kimageformats-5.66.0.tar.xz"; - sha256 = "c3b02befbb03f25deca0c7ffafea8c8a5eb79e21d8e2e566bf6fddf4f8afe04d"; - name = "kimageformats-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kimageformats-5.68.0.tar.xz"; + sha256 = "498fab29d19f10f2c91c796134f959b2cf3ce8372087b5eeb62f07e62af85949"; + name = "kimageformats-5.68.0.tar.xz"; }; }; kinit = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kinit-5.66.0.tar.xz"; - sha256 = "6d9b6ea1542ff5529fd42f49240be37bbd8a3dfdfe8c45ac980b3c9b3fee650e"; - name = "kinit-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kinit-5.68.0.tar.xz"; + sha256 = "fa136996eaaa7d2adb5a341c2b7a1abe86d8139c6f18999e0b0dc0220e512559"; + name = "kinit-5.68.0.tar.xz"; }; }; kio = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kio-5.66.0.tar.xz"; - sha256 = "c5350e20474b48c4fc02347186b7e4db24cb7580ba8c0f1e120b302e6b8db17d"; - name = "kio-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kio-5.68.0.tar.xz"; + sha256 = "9cc2fb2da84d6661a90eac81eb12c2e37921a5c34cbc1975f48d613e5a9d9eef"; + name = "kio-5.68.0.tar.xz"; }; }; kirigami2 = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kirigami2-5.66.0.tar.xz"; - sha256 = "4e4abfeaa5e997de52076786dd0d314f178bc883b1b48a8b2cf37dd5979ac41b"; - name = "kirigami2-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kirigami2-5.68.0.tar.xz"; + sha256 = "ad5f78afc916e9cb26f23918a6eb1983d4a57aa7e4f7314a8c23fb81e0fcaf4b"; + name = "kirigami2-5.68.0.tar.xz"; }; }; kitemmodels = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kitemmodels-5.66.0.tar.xz"; - sha256 = "5c8bcc36b9c29868ba7fa1ece9b83385379d7fed04937a92454ac94a356b3854"; - name = "kitemmodels-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kitemmodels-5.68.0.tar.xz"; + sha256 = "4f435db4362832cf63e49896229affd07f125567931fc499751d37ac3bafb149"; + name = "kitemmodels-5.68.0.tar.xz"; }; }; kitemviews = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kitemviews-5.66.0.tar.xz"; - sha256 = "026461fa2e3e0237a56eb18a2817453c788514578f27a4aa0832b85fe98a09ab"; - name = "kitemviews-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kitemviews-5.68.0.tar.xz"; + sha256 = "5196885ac42347d67779df61a03d7f9c54f38053ff91348ef6fdc08439b4742f"; + name = "kitemviews-5.68.0.tar.xz"; }; }; kjobwidgets = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kjobwidgets-5.66.0.tar.xz"; - sha256 = "34501be3ec85f0e71dba22669b3c862b297606e9bbff9aae466667c7075b6f8d"; - name = "kjobwidgets-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kjobwidgets-5.68.0.tar.xz"; + sha256 = "a11ba51ed0ab330f9a921cf0a61e604c27d88c1c2ea477a875bc0a0cd228a292"; + name = "kjobwidgets-5.68.0.tar.xz"; }; }; kjs = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kjs-5.66.0.tar.xz"; - sha256 = "9bed62ebf9fba7d986ff7baabf6c4431f02826c9be70beda15cc62c692fb5f7f"; - name = "kjs-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kjs-5.68.0.tar.xz"; + sha256 = "18e3d7c667aec21e9e4d0d4730ad32a10475b7db5a574a674a8b90a6f9e0cd0e"; + name = "kjs-5.68.0.tar.xz"; }; }; kjsembed = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kjsembed-5.66.0.tar.xz"; - sha256 = "58fe647901b69167b7c66a284c3181c2eda9c3b751548eb43bfe0795d10eb0ce"; - name = "kjsembed-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kjsembed-5.68.0.tar.xz"; + sha256 = "e9b9ac63f06447ffc6870806eb1507f0281281bae907fdbae42ee87a2b926db2"; + name = "kjsembed-5.68.0.tar.xz"; }; }; kmediaplayer = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kmediaplayer-5.66.0.tar.xz"; - sha256 = "7ec1fea10a1017a0f32183fdc3b2cca38c11273240423ac0d393626436fd4230"; - name = "kmediaplayer-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kmediaplayer-5.68.0.tar.xz"; + sha256 = "aa07466ea27b2e042e03d76fe3a23c570ba6521f57a2a51dc0ddf32fc8276db0"; + name = "kmediaplayer-5.68.0.tar.xz"; }; }; knewstuff = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/knewstuff-5.66.0.tar.xz"; - sha256 = "acef94661e3a0e42938224c17b90f835d6686d88a25698fe82980d7e1139b1fe"; - name = "knewstuff-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/knewstuff-5.68.0.tar.xz"; + sha256 = "f7c13b133f8b87ceece2d33d3f69215912b3b8c1dbb92ac39a1a6a0a42b7c93a"; + name = "knewstuff-5.68.0.tar.xz"; }; }; knotifications = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/knotifications-5.66.0.tar.xz"; - sha256 = "aad3697a35109fad49fa286b7837d382599478bac33151cd7991c760866c12c1"; - name = "knotifications-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/knotifications-5.68.0.tar.xz"; + sha256 = "646bd3bac073fbf4f19f9047360325c933751d605cf1311f4c922d7457fbda51"; + name = "knotifications-5.68.0.tar.xz"; }; }; knotifyconfig = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/knotifyconfig-5.66.0.tar.xz"; - sha256 = "fd9e09b099f49896b5afa6f5663ef82266531ec413d4edeb03ebc768314a37d8"; - name = "knotifyconfig-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/knotifyconfig-5.68.0.tar.xz"; + sha256 = "36c7c93964f2b9b584d73de1757f75d6ee8bb29ebe860e8fd6905354d2f10145"; + name = "knotifyconfig-5.68.0.tar.xz"; }; }; kpackage = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kpackage-5.66.0.tar.xz"; - sha256 = "ae848a72e789a80d4a9d0346e90cb1038ebc784da6e7ff645411edd878554ab5"; - name = "kpackage-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kpackage-5.68.0.tar.xz"; + sha256 = "49727d89f1ca7ee504397d6e8b5cd25c26cd0061596b26d8ab2b64e3987d2d16"; + name = "kpackage-5.68.0.tar.xz"; }; }; kparts = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kparts-5.66.0.tar.xz"; - sha256 = "6de2395cd6a9993f216f4dc4718f352bc4cbbd8147734c76be0e1e6149f733d0"; - name = "kparts-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kparts-5.68.0.tar.xz"; + sha256 = "fd17d0b0ff41d66c122530bbd8d1187f3271382207f63237ce72147865bf6d29"; + name = "kparts-5.68.0.tar.xz"; }; }; kpeople = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kpeople-5.66.0.tar.xz"; - sha256 = "2728f08a9417ceb62aa9fc5a3340aed291aeb8a852e5f6f46c5a23fcc34168ab"; - name = "kpeople-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kpeople-5.68.0.tar.xz"; + sha256 = "1cae86d527d650d9fa311f6007cc33b5dcd858bcfe4eb7cae65b5402205c4675"; + name = "kpeople-5.68.0.tar.xz"; }; }; kplotting = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kplotting-5.66.0.tar.xz"; - sha256 = "2a4387f748614f005cf67e549b9466c6eed52589ac58297857ba6a0be92c32ee"; - name = "kplotting-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kplotting-5.68.0.tar.xz"; + sha256 = "ccae7f90c016a1c517db820f352bb962f600678efdc4ac6b12e33d2c48f5c268"; + name = "kplotting-5.68.0.tar.xz"; }; }; kpty = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kpty-5.66.0.tar.xz"; - sha256 = "a7fac6ced7504cec13a6776f0f4ba22db9878e44e2bbf85a219a2590e061c859"; - name = "kpty-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kpty-5.68.0.tar.xz"; + sha256 = "35b838cff80311db52d83e1f61bc365277d54929742ee34265f36a12ce7689e3"; + name = "kpty-5.68.0.tar.xz"; }; }; kquickcharts = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kquickcharts-5.66.0.tar.xz"; - sha256 = "70fae10b2af1c504e3b166beb0a342cdef0e0f8eb42e53ba88f0e3b174331624"; - name = "kquickcharts-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kquickcharts-5.68.0.tar.xz"; + sha256 = "2cfb78bc2a7659a8c4ca6b072ff586c44e6da64e10b84a0fb0c5e3f03c944628"; + name = "kquickcharts-5.68.0.tar.xz"; }; }; kross = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kross-5.66.0.tar.xz"; - sha256 = "109159996da54ec52ec8114ff05f88bdee6428e49ca84515ab73c457e0005ebc"; - name = "kross-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kross-5.68.0.tar.xz"; + sha256 = "2f5a79a2097f84bfd2033ca183abdbf6626f6e5dc2c6f781c312f15c97dace33"; + name = "kross-5.68.0.tar.xz"; }; }; krunner = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/krunner-5.66.0.tar.xz"; - sha256 = "b7d67d61c0b0f96128c143e3d2694dc5ced88a7de73db0f4493f084de9dc9701"; - name = "krunner-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/krunner-5.68.0.tar.xz"; + sha256 = "4575ae1d658d32c15f9d57dc30616073e9d143d1a7f9632556906ef10e82e3b8"; + name = "krunner-5.68.0.tar.xz"; }; }; kservice = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kservice-5.66.0.tar.xz"; - sha256 = "f1174576f6e3e562d7de65494efc2c1c3ac569c656b8301ffbe34576ea623a6a"; - name = "kservice-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kservice-5.68.0.tar.xz"; + sha256 = "c774ce1738081c17e6e105e506aa89c22a9db07e73972d4b18ce733ec8ad0a8a"; + name = "kservice-5.68.0.tar.xz"; }; }; ktexteditor = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/ktexteditor-5.66.0.tar.xz"; - sha256 = "9156e5e554b17d73078e4df09ae524a684f6adff8c2bbd40705b67fd30a6cc0b"; - name = "ktexteditor-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/ktexteditor-5.68.0.tar.xz"; + sha256 = "dad373d4c136d113cca1ee6d700753563b7348813ff3229db670eedc63980cd6"; + name = "ktexteditor-5.68.0.tar.xz"; }; }; ktextwidgets = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/ktextwidgets-5.66.0.tar.xz"; - sha256 = "dcc4595ceeecd3f59236ed303f2a0d61915c88eb36ad040a0562b60fb10cb9a1"; - name = "ktextwidgets-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/ktextwidgets-5.68.0.tar.xz"; + sha256 = "23b354469afed21c840ca36e2bb5b2b383ed5c4ec3690bb009e273c39fbe00c0"; + name = "ktextwidgets-5.68.0.tar.xz"; }; }; kunitconversion = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kunitconversion-5.66.0.tar.xz"; - sha256 = "82db51b59ffdb5b2e69bc5c6ea54521acbc49ee5601baaf4e43cba50d12b418c"; - name = "kunitconversion-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kunitconversion-5.68.0.tar.xz"; + sha256 = "39ec06e2439306ce5b5efe5fe972d201e8c8e5fda634652cdc01c58427574adb"; + name = "kunitconversion-5.68.0.tar.xz"; }; }; kwallet = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwallet-5.66.0.tar.xz"; - sha256 = "6e48070e22a822a4003e1f7a739fe1e335bcf46982cbf4909d23a6e40689a827"; - name = "kwallet-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwallet-5.68.0.tar.xz"; + sha256 = "7524eeffdde3166df182f0dbf0f3f461905547bfd7a06387c7c503cd1ab75ecf"; + name = "kwallet-5.68.0.tar.xz"; }; }; kwayland = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwayland-5.66.0.tar.xz"; - sha256 = "f43231f10a5294f7ac3d43d2b903f1cf9649364782ca55831e0c069a54cc170d"; - name = "kwayland-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwayland-5.68.0.tar.xz"; + sha256 = "7c99bfac8f4bff457a5384c846be776c385649ced76be0f48699c6e12de24e7c"; + name = "kwayland-5.68.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwidgetsaddons-5.66.0.tar.xz"; - sha256 = "311d8274469f03b1938da5a4f7ad17c82e3f96bc79ec28624cb748b13403f451"; - name = "kwidgetsaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwidgetsaddons-5.68.0.tar.xz"; + sha256 = "b4ff96b4ec6365e5f9e4da5e651da99be491799a4e6cfd982d0838dda39844ac"; + name = "kwidgetsaddons-5.68.0.tar.xz"; }; }; kwindowsystem = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwindowsystem-5.66.0.tar.xz"; - sha256 = "416e2ba52a8c95a6b161ca306724525c1971723cb12e7d8ad7fa108e0b820f0c"; - name = "kwindowsystem-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwindowsystem-5.68.0.tar.xz"; + sha256 = "859c930a04c2588f792bfb9a28ed40b226db632b15c2851b186301b70d4c825a"; + name = "kwindowsystem-5.68.0.tar.xz"; }; }; kxmlgui = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kxmlgui-5.66.0.tar.xz"; - sha256 = "a8f9ed354e30ff1f40306e876d96fcd1fa3a26a8e6acfccdeab8f3437d7231bc"; - name = "kxmlgui-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kxmlgui-5.68.0.tar.xz"; + sha256 = "6310e9a725a982d3b70672367c5858727437fe08c8e409458e48b6015c7bf10e"; + name = "kxmlgui-5.68.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kxmlrpcclient-5.66.0.tar.xz"; - sha256 = "6b637c138414d93104477034737c9e866d99e43f883a3dfc45d3220df6c21e6c"; - name = "kxmlrpcclient-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kxmlrpcclient-5.68.0.tar.xz"; + sha256 = "e49f2ab649aafb292e01dacefb7b6f28fc596606764bef61e7ce622b67241324"; + name = "kxmlrpcclient-5.68.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/modemmanager-qt-5.66.0.tar.xz"; - sha256 = "50e24894d0243dbd2fc1a44a1e6368e3bb95a20c1ca56106d26752d5854d8be9"; - name = "modemmanager-qt-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/modemmanager-qt-5.68.0.tar.xz"; + sha256 = "9c0febf18a04b69e47cffdb4563390a79a4a673da856502cbf50d5c7707670ec"; + name = "modemmanager-qt-5.68.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/networkmanager-qt-5.66.0.tar.xz"; - sha256 = "3089951c69845c4f6d1848bbbaf05116a72d4207a9f2d63b063a76c78549bf45"; - name = "networkmanager-qt-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/networkmanager-qt-5.68.0.tar.xz"; + sha256 = "6a9bea5e6d58f5322848114e4e827edadee6b5a890a3549446ff23a568325e2c"; + name = "networkmanager-qt-5.68.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/oxygen-icons5-5.66.0.tar.xz"; - sha256 = "c6275fdcd4883c143adf4f16450a63dcb8651073a205bd14c599ec6ab638e8ef"; - name = "oxygen-icons5-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/oxygen-icons5-5.68.0.tar.xz"; + sha256 = "75a8113e567d8cbba57bda3c8829d116d58ebf6bc5ace88aed7700b28a00c463"; + name = "oxygen-icons5-5.68.0.tar.xz"; }; }; plasma-framework = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/plasma-framework-5.66.0.tar.xz"; - sha256 = "3263ccf95a6fcf8fde087d402d89d64c64c0130d4df62b95b860fada13aad419"; - name = "plasma-framework-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/plasma-framework-5.68.0.tar.xz"; + sha256 = "d27c7a62231784ecad1246f8a81b02fd6db2e9818244a06650fd6c972a69ea74"; + name = "plasma-framework-5.68.0.tar.xz"; }; }; prison = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/prison-5.66.0.tar.xz"; - sha256 = "ff5b4ae32ae44f2aea4b9254afe54af0fc9ea742517116cd2322e1a71a7315ce"; - name = "prison-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/prison-5.68.0.tar.xz"; + sha256 = "22e2b8e9ca06e4fb7ab91afeddbaebe6e2b6792bbcd5ba6c440c6fad0df176b7"; + name = "prison-5.68.0.tar.xz"; }; }; purpose = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/purpose-5.66.0.tar.xz"; - sha256 = "33b8ec6ede6a1deee6c85e45ebe42aca9a3add7884ee68aa8f1a16ed0637b4db"; - name = "purpose-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/purpose-5.68.0.tar.xz"; + sha256 = "c8c8f8244b568e52b4c02b89b71611bb8ba7cd07173645caa022b4bd90b41ab0"; + name = "purpose-5.68.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/qqc2-desktop-style-5.66.0.tar.xz"; - sha256 = "49bb518fc9f3c08cb330b1d82cb5c68d9ea358a562c6e460ea06aaaa13812b87"; - name = "qqc2-desktop-style-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/qqc2-desktop-style-5.68.0.tar.xz"; + sha256 = "0f522861e5757de6a1205c86a2e5f8d2a7375c96eac1ece95d03a35858dc7b03"; + name = "qqc2-desktop-style-5.68.0.tar.xz"; }; }; solid = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/solid-5.66.0.tar.xz"; - sha256 = "78deab8c55c30f2c923795730a9655b4d05a75cd6240bc0caa64104b141a3a39"; - name = "solid-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/solid-5.68.0.tar.xz"; + sha256 = "472c1934b3c9cf917f28ac0e5b0864de442b96852744c301d88d8ab7269d74c3"; + name = "solid-5.68.0.tar.xz"; }; }; sonnet = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/sonnet-5.66.0.tar.xz"; - sha256 = "5ca700e8e9954b380cc5f4cee0f392888ae240ccd2c4d3a37a2f41f8ac9c8294"; - name = "sonnet-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/sonnet-5.68.0.tar.xz"; + sha256 = "079c4f5fcb9fe670e1242b18648e178aaa01eb81dbdfc881805eea1ec585bd67"; + name = "sonnet-5.68.0.tar.xz"; }; }; syndication = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/syndication-5.66.0.tar.xz"; - sha256 = "5e6c90360461b820a48069af2838cffbcbedfe8bcd042535823e1cf1b43cd6b7"; - name = "syndication-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/syndication-5.68.0.tar.xz"; + sha256 = "0715fc1b7312b5081521b781d0878d88cc70dcb77272ee173cecca03cc221fd3"; + name = "syndication-5.68.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/syntax-highlighting-5.66.0.tar.xz"; - sha256 = "e572719cb64524c6abc476eeccca56f54cb0d7352fc747af3036dbe817566c25"; - name = "syntax-highlighting-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/syntax-highlighting-5.68.0.tar.xz"; + sha256 = "a857c743aa60b21eea7e4b986e8b195882aa2c18358412e767e68d93ce35e134"; + name = "syntax-highlighting-5.68.0.tar.xz"; }; }; threadweaver = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/threadweaver-5.66.0.tar.xz"; - sha256 = "a63db1ef8421e68534f5b9891013286fbad2ef8677f28c15ec733f086ae5cee3"; - name = "threadweaver-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/threadweaver-5.68.0.tar.xz"; + sha256 = "e28c0bfff375b3e1e9e4eec72f0a804f3f41c4ec5fd59af9b951708d229eff64"; + name = "threadweaver-5.68.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch b/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch new file mode 100644 index 000000000000..0f33815b6e91 --- /dev/null +++ b/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch @@ -0,0 +1,32 @@ +From cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 Mon Sep 17 00:00:00 2001 +From: TBK <tbk@jjtc.eu> +Date: Wed, 26 Feb 2020 21:12:45 +0100 +Subject: [PATCH] Fix Linux build error with musl libc + +Commit bf5953c549a6d279977df69ffe89b2ba51460eaf caused a build failure +on non-glibc Linux build environments. Change the conditionalization +so that __GLIBC_PREREQ will only be used if it is defined. + +[ghudson@mit.edu: simplified conditionals; rewrote commit message] + +ticket: 8880 (new) +tags: pullup +target_version: 1.18-next +--- + src/util/support/plugins.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c +index 3329db7dc3..1644d16fd0 100644 +--- a/src/util/support/plugins.c ++++ b/src/util/support/plugins.c +@@ -62,8 +62,7 @@ + * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects + * anyway. + */ +-#ifdef __linux__ +-#include <features.h> ++#ifdef __GLIBC__PREREQ + #if ! __GLIBC_PREREQ(2, 25) + #define dlclose(x) + #endif diff --git a/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch b/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch new file mode 100644 index 000000000000..f8718606a7f8 --- /dev/null +++ b/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch @@ -0,0 +1,28 @@ +From b009cca2026b615ef5386faa4c0230bc27c4161d Mon Sep 17 00:00:00 2001 +From: Greg Hudson <ghudson@mit.edu> +Date: Thu, 12 Mar 2020 00:44:10 -0400 +Subject: [PATCH] Fix typo in musl build fix + +Commit cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 checked for +__GLIBC__PREREQ instead of __GLIBC_PREREQ, thus accidentally reverting +the workaround introduced in commit +bf5953c549a6d279977df69ffe89b2ba51460eaf. Fix the typo. + +ticket: 8880 +--- + src/util/support/plugins.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c +index 1644d16fd0..1ff10c354d 100644 +--- a/src/util/support/plugins.c ++++ b/src/util/support/plugins.c +@@ -62,7 +62,7 @@ + * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects + * anyway. + */ +-#ifdef __GLIBC__PREREQ ++#ifdef __GLIBC_PREREQ + #if ! __GLIBC_PREREQ(2, 25) + #define dlclose(x) + #endif diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 42965c0ad07c..5ff3f313dcfd 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -14,7 +14,7 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - majorVersion = "1.18"; + majorVersion = "1.18"; # remove patches below with next upgrade version = majorVersion; src = fetchurl { @@ -22,6 +22,15 @@ stdenv.mkDerivation rec { sha256 = "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk"; }; + patches = optionals stdenv.hostPlatform.isMusl [ + # TODO: Remove with next release > 1.18 + # Patches to fix musl build with 1.18. + # Not using `fetchpatch` for these for now to avoid infinite recursion + # errors in downstream projects (unclear if it's a nixpkgs issue so far). + ./krb5-Fix-Linux-build-error-with-musl-libc.patch + ./krb5-Fix-typo-in-musl-build-fix.patch + ]; + outputs = [ "out" "dev" ]; configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index a57b103b0d91..3704cbb7794c 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, opencl-clhpp, cmake, withTracing ? false }: +{ stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: stdenv.mkDerivation rec { name = "khronos-ocl-icd-loader-${version}"; - version = "6c03f8b"; + version = "2020.03.13"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; - rev = "6c03f8b58fafd9dd693eaac826749a5cfad515f8"; - sha256 = "00icrlc00dpc87prbd2j1350igi9pbgkz27hc3rf73s5994yn86a"; + rev = "v${version}"; + sha256 = "0zk6fyfrklx8a848613rfcx0y4yn0dsxkxzzl9pgdh9i6qdfjj9k"; }; patches = stdenv.lib.lists.optional withTracing ./tracing.patch; nativeBuildInputs = [ cmake ]; - buildInputs = [ opencl-clhpp ]; + buildInputs = [ opencl-headers ]; meta = with stdenv.lib; { description = "Offical Khronos OpenCL ICD Loader"; - homepage = https://github.com/KhronosGroup/OpenCL-ICD-Loader; + homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ davidtwco ]; diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch index 415a1b1dfe49..cef22457e5a1 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch @@ -1,10 +1,10 @@ diff --git a/loader/icd.h b/loader/icd.h -index a1b6969..cf4e272 100644 +index 34751e9..01a33fd 100644 --- a/loader/icd.h +++ b/loader/icd.h -@@ -122,7 +122,7 @@ void khrIcdContextPropertiesGetPlatform( +@@ -123,7 +123,7 @@ void khrIcdContextPropertiesGetPlatform( cl_platform_id *outPlatform); - + // internal tracing macros -#if 0 +#if 1 diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 12f7b176bb7b..7ee869b53c35 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -1,49 +1,62 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, tdb, talloc, tevent -, popt, libxslt, docbook_xsl, docbook_xml_dtd_42, cmocka +{ stdenv +, fetchurl +, python3 +, pkg-config +, readline +, tdb +, talloc +, tevent +, popt +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_42 +, cmocka +, wafHook }: stdenv.mkDerivation rec { - name = "ldb-1.3.3"; + pname = "ldb"; + version = "2.1.1"; src = fetchurl { - url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b" ; + url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; + sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - python readline tdb talloc tevent popt - libxslt docbook_xsl docbook_xml_dtd_42 - cmocka + nativeBuildInputs = [ + pkg-config + python3 + wafHook + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 ]; - patches = [ - # CVE-2019-3824 - # downloading the patch from debian as they have ported the patch from samba to ldb but otherwise is identical to - # https://bugzilla.samba.org/attachment.cgi?id=14857 - (fetchurl { - name = "CVE-2019-3824.patch"; - url = "https://sources.debian.org/data/main/l/ldb/2:1.1.27-1+deb9u1/debian/patches/CVE-2019-3824-master-v4-5-02.patch"; - sha256 = "1idnqckvjh18rh9sbq90rr4sxfviha9nd1ca9pd6lai0y6r6q4yd"; - }) + buildInputs = [ + python3 + readline # required to build python + tdb + talloc + tevent + popt + cmocka ]; - preConfigure = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" + "--without-ldb-lmdb" ]; stripDebugList = "bin lib modules"; meta = with stdenv.lib; { description = "A LDAP-like embedded database"; - homepage = https://ldb.samba.org/; + homepage = "https://ldb.samba.org/"; license = licenses.lgpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 48735c13ed15..1fab7ee28a8a 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { - sha256 = "1kvvqvr0djz4gb770rs5h97zqcymvbzrmsw8kz2icvlmcicm7qd8"; + sha256 = "1kp35gnph9myqxdxzyj1871ay19nfajxglzwai1gvsnh5840xnxy"; rev = version; repo = "leatherman"; owner = "puppetlabs"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/puppetlabs/leatherman/; + homepage = "https://github.com/puppetlabs/leatherman/"; description = "A collection of C++ and CMake utility libraries"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index bda7d560fcde..2b3ef8c99c81 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libaacs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27"; + sha256 = "1zhjdcph8sqx7ak35s22kc736icwq135jlypggkp6vqyyygb3xlk"; }; buildInputs = [ libgcrypt libgpgerror ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc flex ]; meta = with stdenv.lib; { - homepage = https://www.videolan.org/developers/libaacs.html; + homepage = "https://www.videolan.org/developers/libaacs.html"; description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index daa349ca6309..7bfd9a8a2d02 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook +{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk ? null, ant ? null , withAACS ? false, libaacs ? null , withBDplus ? false, libbdplus ? null @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0hhbgkm11fw4pwbrklm76aiy54r6d7hk06yhl2fxq05i74i4bpd3"; + sha256 = "04bcd53ml0zn8b4f9r1grs0yy20rcirji1v3pxzaf4i5zl3flhfd"; }; patches = optional withJava ./BDJ-JARFILE-path.patch; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { ++ optional withJava jdk ++ optional withMetadata libxml2 ++ optional withFonts freetype + ++ optional stdenv.isDarwin DiskArbitration ; propagatedBuildInputs = optional withAACS libaacs; @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { ; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbluray.html; + homepage = "http://www.videolan.org/developers/libbluray.html"; description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 48446d87b8d8..4a9cba826064 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libcroco/default.nix b/pkgs/development/libraries/libcroco/default.nix deleted file mode 100644 index 90ed8c6d985d..000000000000 --- a/pkgs/development/libraries/libcroco/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib, gnome3 }: - -stdenv.mkDerivation rec { - pname = "libcroco"; - version = "0.6.13"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"; - }; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; - - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 glib ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with stdenv.lib; { - description = "GNOME CSS2 parsing and manipulation toolkit"; - homepage = https://gitlab.gnome.org/GNOME/libcroco; - license = licenses.lgpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index baf938944201..4763e5983f95 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; - sha256 = "17j6ca2qsp69a91lm11mwbs4l8q13xqcdz60l94avl5krymrqg47"; + sha256 = "15jysnsmdjs7q4iafb4qzq4b76cfyvmbxgcxnqg4sr0x4bplwfnb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 173ad6d2e853..d77db93ba151 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.34.1"; + version = "3.36.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01cmcrd75b7ns7j2b4p6h7pv68vjhkcl9zbvzzx7pf4vknxir61x"; + sha256 = "0n6r16a07in82cnzw91vl675pbjzbvazkxwbqxq2kihganzipcw2"; }; - nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run ]; + nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; buildInputs = [ glib gtk3 ]; mesonFlags = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = https://wiki.gnome.org/Apps/Builder; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 8cca9091734f..2afc11c60095 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "libdvdnav"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0cv7j8irsv1n2dadlnhr6i1b8pann2ah6xpxic41f04my6ba6rp5"; + sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [libdvdread]; meta = { - homepage = http://dvdnav.mplayerhq.hu/; + homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library that implements DVD navigation features such as DVD menus"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 8266e0f0b6d0..c28ca339a65e 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdvdread"; - version = "6.0.2"; + version = "6.1.0"; src = fetchurl { url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1c7yqqn67m3y3n7nfrgrnzz034zjaw5caijbwbfrq89v46ph257r"; + sha256 = "033mnhq3mx0qz3z85vw01rz5wzmx5ynadl7q1wm2spvx3ryvs6sh"; }; buildInputs = [libdvdcss]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://dvdnav.mplayerhq.hu/; + homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library for reading DVDs"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 59780699fd13..4c17a800c17b 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { description = "Easy Publish and Consume Library"; homepage = https://wiki.gnome.org/Projects/libepc; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/development/libraries/liberio/default.nix new file mode 100644 index 000000000000..b4023d5f36a9 --- /dev/null +++ b/pkgs/development/libraries/liberio/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, systemd +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "liberio"; + version = "unstable-2019-12-11"; + + src = fetchFromGitHub { + owner = "EttusResearch"; + repo = "liberio"; + rev = "81777e500d1c3b88d5048d46643fb5553eb5f786"; + sha256 = "1n40lj5g497mmqh14vahdhy3jwvcry2pkc670p4c9f1pggp6ysgk"; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = [ + systemd + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Ettus Research DMA I/O Library"; + homepage = "https://github.com/EttusResearch/liberio"; + license = licenses.gpl2; + maintainers = [ maintainers.doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 371c0b1d9809..74aa8133a99f 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libev"; - version="4.31"; + version="4.33"; src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz"; - sha256 = "0nkfqv69wfyy2bpga4d53iqydycpik8jp8x6q70353hia8mmv1gd"; + sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh"; }; configureFlags = stdenv.lib.optional (static) "LDFLAGS=-static"; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 1ee03db568b1..9b1184f1c0b1 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17pb5375njb1r05xmk0r57a2j986ihglh2n5nqcylbag4rj8mqg7"; }; - buildInputs = [ python3 ]; + nativeBuildInputs = [ python3 ]; meta = with stdenv.lib; { description = "Wrapper library for evdev devices"; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 9a6db72ae058..cecb2b6750be 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -5,7 +5,7 @@ , pkgconfig , meson , ninja -, libusb +, libusb1 , pixman , glib , nss @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libusb + libusb1 # drop in 2.0 for gusb pixman glib nss diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index a1871f6b2e65..a1e648468f44 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -47,7 +47,7 @@ assert postgresSupport -> postgresql != null; description = "Database access library"; homepage = https://www.gnome-db.org/; license = [ licenses.lgpl2 licenses.gpl2 ]; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index f5cc5efa06a1..43e5e2234801 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { description = "C++ bindings for libgda"; homepage = https://www.gnome-db.org/; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 91bb9869f3c6..162b5d233951 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GData API library"; homepage = "https://wiki.gnome.org/Projects/libgdata"; - maintainers = with maintainers; [ raskin lethalman ] ++ gnome3.maintainers; + maintainers = with maintainers; [ raskin lethalman ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 92c9f214ab46..7623be579d72 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Libgee; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index 70ec222f88fb..cf62e0cabc9d 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "GObject based library for handling and rendering epub documents"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index f3e07b509176..9a05a01bee61 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "A glib wrapper library around the libgit2 git access library"; homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index f35f3f87fbeb..c02fd503eb0d 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Keyboard management library"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 76887347a182..6d77a28d55f3 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.5"; + version = "1.5.1"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "1r337ici2nvi9v2h33nf3b7nisirc4s8p31cpv1cg8jbzn3wi15g"; + sha256 = "14iv8iwyvfznyifhkqz1bjh24dvb03gmpjn8v3fs6h734l93vvw5"; }; buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index 8fc44fb6a8dc..2652546a0fc1 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "Glib abstaction to handle feeds in RSS, Atom and other formats"; homepage = https://wiki.gnome.org/Projects/Libgrss; license = licenses.lgpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index fe7986bf21aa..65f5e2750e51 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that reads information about processes and the running system"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 8023acb75d28..2d3c83e6d17b 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that provides GObject bindings for libudev"; homepage = https://wiki.gnome.org/Projects/libgudev; - maintainers = [ maintainers.eelco ] ++ gnome3.maintainers; + maintainers = [ maintainers.eelco ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 8d480c2d8829..411ae0a33160 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { systemd fuse yajl libvirt gmp readline file hivex numactl xen libapparmor getopt perlPackages.ModuleBuild ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) - ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) + ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) ++ stdenv.lib.optional javaSupport jdk; prePatch = '' diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index e51a10cfe8a3..efbdd7856484 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.34.0"; + version = "3.36.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fgiqswkhiaijanml3mb16ajn5aanrk7x6yiwagp9n9rssam6902"; + sha256 = "0bd30g3facfcgf18y2110xhc7ijly313y49mpwdkvl482z0fxzyj"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A library to access weather information from online services for numerous locations"; homepage = https://wiki.gnome.org/Projects/LibGWeather; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 30e5e247ab2b..1682f123acd4 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "A GObject based library for handling and rendering XPS documents"; homepage = https://wiki.gnome.org/Projects/libgxps; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 6264ff6c1a7c..7c9779cf59bf 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gobject-introspection vala + meson ninja pkgconfig gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ]; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index c58812eca58b..3d7784979e34 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -44,6 +44,6 @@ in stdenv.mkDerivation rec { homepage = https://gitlab.gnome.org/GNOME/libhttpseverywhere; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ sternenseemann ] ++ gnome3.maintainers; + maintainers = with maintainers; [ sternenseemann ] ++ teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 2c84379aa8e5..f2b4b802d8bc 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.2"; + version = "1.15.4"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p"; + sha256 = "1ha5qyak1ka5npy5i6hzqfpii8samkj389mkppj4wdsfv536i2ww"; }; outputs = [ "bin" "out" "dev" ]; @@ -45,12 +45,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkgconfig meson ninja ] - ++ optionals documentationSupport [ doxygen graphviz sphinx-build ] - ++ optionals testsSupport [ valgrind ]; + ++ optionals documentationSupport [ doxygen graphviz sphinx-build ]; - buildInputs = [ libevdev mtdev libwacom (python3.withPackages (pkgs: with pkgs; [ evdev ])) ] - ++ optionals eventGUISupport [ cairo glib gtk3 ] - ++ optionals testsSupport [ check ]; + buildInputs = [ libevdev mtdev libwacom ] + ++ optionals eventGUISupport [ cairo glib gtk3 ]; + + checkInputs = [ (python3.withPackages (pkgs: with pkgs; [ evdev ])) check valgrind ]; propagatedBuildInputs = [ udev ]; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index bf48e88a4ec7..c6bb79064697 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig -, libusb +, libusb1 , readline }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libusb + libusb1 readline ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index f05ac6d521bf..e90516e8694c 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2"; + sha256 = "01ill8bgjyk582wipx7sh7gj2nidylpbzvwhx0wkcm6mxx3qbp9k"; }; patches = @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ vcunat colemickens ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix new file mode 100644 index 000000000000..c6628e9043cd --- /dev/null +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -0,0 +1,150 @@ +{ bcg729 +, bctoolbox +, bcunit +, belcard +, belle-sip +, belr +, bzrtp +, cairo +, cmake +, cyrus_sasl +, doxygen +, fetchFromGitLab +, fetchurl +, ffmpeg +, gdk-pixbuf +, git +, glib +, graphviz +, gtk2 +, intltool +, libexosip +, libmatroska +, libnotify +, libosip +, libsoup +, libupnp +, libX11 +, libxml2 +, lime +, makeWrapper +, mbedtls +, mediastreamer +, mediastreamer-openh264 +, openldap +, ortp +, pango +, pkgconfig +, python +, readline +, soci +, speex +, sqlite +, stdenv +, udev +, xercesc +, xsd +, zlib +}: +let + # Got the following error when building: + # + # Your version of Doxygen (1.8.17) is known to malfunction with some of our + # macro definitions, which causes errors while wrapprers generation. Please + # install an older version of Doxygen (< 1.8.17) or disable documentation + # and wrapper generation. + # + # So, let's then use 1.8.16 version of doxygen in this derivation. Hopefully + # this workaround can be removed with some newer release of liblinphone. + doxygen_1_8_16 = doxygen.overrideAttrs ( + oldAttrs: rec { + name = "doxygen-1.8.16"; + src = fetchurl { + urls = [ + "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. + "http://doxygen.nl/files/${name}.src.tar.gz" + ]; + sha256 = "10iwv8bcz5b5cd85gg8pgn0bmyg04n9hs36xn7ggjjnvynv1z67z"; + }; + buildInputs = oldAttrs.buildInputs ++ [ git ]; + } + ); +in +stdenv.mkDerivation rec { + pname = "liblinphone"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-03-20"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; + rev = "1d762a3e0e304aa579798aed4400d2cee2c1ffa0"; + sha256 = "0ja38payyqbd8z6q5l5w6hi7xarmfj5021gh0qdk0j832br4c6c3"; + }; + + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + + # TODO: Not sure if all these inputs are actually needed. Most of them were + # defined when liblinphone and linphone-desktop weren't separated yet, so some + # of them might not be needed for liblinphone alone. + buildInputs = [ + (python.withPackages (ps: [ ps.pystache ps.six ])) + bcg729 + bctoolbox + belcard + belle-sip + belr + bzrtp + cairo + cyrus_sasl + ffmpeg + gdk-pixbuf + git + glib + gtk2 + libX11 + libexosip + libmatroska + libnotify + libosip + libsoup + libupnp + libxml2 + lime + mbedtls + mediastreamer + openldap + ortp + pango + readline + soci + speex + sqlite + udev + xercesc + xsd + zlib + ]; + + nativeBuildInputs = [ + bcunit + cmake + doxygen_1_8_16 + graphviz + intltool + makeWrapper + pkgconfig + ]; + + meta = with stdenv.lib; { + homepage = "https://www.linphone.org/technical-corner/liblinphone"; + description = "Library for SIP calls and instant messaging"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 2f7f46974b0b..67ee59b61071 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libmanette"; - version = "0.2.3"; + version = "0.2.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60"; + sha256 = "T+Ckvta0w65ySdNBAxwnsy+Nng/7UzfXHLzscWA2LPc="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "A simple GObject game controller library"; homepage = "https://gitlab.gnome.org/aplazas/libmanette"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 20a63fd6eb03..38adebb2a487 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 92fe81c73f40..ab7bb7e6cb9f 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "19.09"; + version = "20.03"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "13j7by2czapzi6qznxj4nmn3hwiyglcf2ypja4n6zgnz96jf21pz"; + sha256 = "0wkzj5s34m8dvy7hif4h8f90q8ncrzd930gij1zzw3h5nw732j38"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library for mediainfo"; - homepage = https://mediaarea.net/; + homepage = "https://mediaarea.net/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index ba77c7806b53..f296883b686d 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -1,54 +1,83 @@ { stdenv +, substituteAll , fetchFromGitHub -, pkgconfig +, fetchpatch +, pkg-config , meson , ninja , gobject-introspection , python3 , libyaml +, rpm +, file , gtk-doc -, docbook_xsl +, docbook-xsl-nons +, help2man , docbook_xml_dtd_412 , glib }: stdenv.mkDerivation rec { pname = "libmodulemd"; - version = "2.6.0"; + version = "2.9.2"; - outputs = [ "out" "devdoc" "py" ]; + outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; src = fetchFromGitHub { owner = "fedora-modularity"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0gizfmzs6jrzb29lwcimm5dq3027935xbzwgkbvbp67zcmjd3y5i"; + sha256 = "dm0uvzM5v1zDQVkonHbrT9l9ICnXZbCSiLRCMZRxhXY="; }; patches = [ - ./pygobject-dir.patch + # Use proper glib devdoc path. + (substituteAll { + src = ./glib-devdoc.patch; + glib_devdoc = glib.devdoc; + }) + + # Install pygobject overrides to our prefix instead of python3 one. + # https://github.com/fedora-modularity/libmodulemd/pull/469 + (fetchpatch { + url = "https://github.com/fedora-modularity/libmodulemd/commit/f72a4bea092f4d84cfc48a3e820eb10270e828d0.patch"; + sha256 = "7/76N9ZQ7qv/DjsaMCL+YWPDzarH1JWW4Sg5HzBJLuc="; + }) + (fetchpatch { + url = "https://github.com/fedora-modularity/libmodulemd/commit/021ab08006b5cf601ce153174fdf403b910b8273.patch"; + sha256 = "JibEmxMiTmu3ShhWLIWfMCtu3c30UcHqXmX9b+2VZXw="; + }) ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gtk-doc - docbook_xsl + docbook-xsl-nons + help2man docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ libyaml + rpm + file # for libmagic glib ]; mesonFlags = [ "-Ddeveloper_build=false" - "-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + "-Dgobject_overrides_dir_py3=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; + postFixup = '' + # Python overrides depend our own typelibs and other packages + mkdir -p "$py/nix-support" + echo "$out ${python3.pkgs.pygobject3} ${python3.pkgs.six}" > "$py/nix-support/propagated-build-inputs" + ''; + meta = with stdenv.lib; { description = "C Library for manipulating module metadata files"; homepage = "https://github.com/fedora-modularity/libmodulemd"; diff --git a/pkgs/development/libraries/libmodulemd/glib-devdoc.patch b/pkgs/development/libraries/libmodulemd/glib-devdoc.patch new file mode 100644 index 000000000000..cde42d8e0b2e --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/glib-devdoc.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index a8b02b4..dd31a76 100644 +--- a/meson.build ++++ b/meson.build +@@ -67,7 +67,7 @@ test = find_program('test') + with_docs = get_option('with_docs') + if with_docs + gtkdoc = dependency('gtk-doc') +- glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') ++ glib_docpath = join_paths('@glib_devdoc@', 'share', 'gtk-doc', 'html') + + ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) + if ret.returncode() != 0 diff --git a/pkgs/development/libraries/libmodulemd/pygobject-dir.patch b/pkgs/development/libraries/libmodulemd/pygobject-dir.patch deleted file mode 100644 index a367872eec65..000000000000 --- a/pkgs/development/libraries/libmodulemd/pygobject-dir.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/bindings/python/meson.build b/bindings/python/meson.build -index 4358b79..61fd5a5 100644 ---- a/bindings/python/meson.build -+++ b/bindings/python/meson.build -@@ -1,3 +1,5 @@ -+pygobject_override_dir = get_option('pygobject_override_dir') -+ - get_overridedir = ''' - import os - import sysconfig -@@ -21,7 +23,7 @@ print(overridedir) - ''' - - # Python 3 --if (get_option('with_py3_overrides')) -+if (get_option('with_py3_overrides')) and pygobject_override_dir == '' - ret = run_command([python3, '-c', get_overridedir]) - - if ret.returncode() != 0 -@@ -34,7 +36,7 @@ if (get_option('with_py3_overrides')) - endif - - # Python 2 --if (get_option('with_py2_overrides')) -+if (get_option('with_py2_overrides')) and pygobject_override_dir == '' - ret2 = run_command([python2, '-c', get_overridedir]) - - if ret2.returncode() != 0 -@@ -45,3 +47,7 @@ if (get_option('with_py2_overrides')) - - install_data('gi/overrides/Modulemd.py', install_dir: pygobject2_override_dir) - endif -+ -+if pygobject_override_dir != '' -+ install_data('gi/overrides/Modulemd.py', install_dir: pygobject_override_dir) -+endif -diff --git a/meson_options.txt b/meson_options.txt -index 147419f..9071a04 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -18,3 +18,4 @@ option('skip_introspection', type : 'boolean', value : false) - option('python_name', type : 'string') - option('with_py2_overrides', type : 'boolean', value : false) - option('with_py3_overrides', type : 'boolean', value : true) -+option('pygobject_override_dir', type : 'string', value : '', description: 'Path to pygobject overrides directory') diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index aacadc5ea0ad..5b8ccb0e301d 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = https://developer.gnome.org/notification-spec/; description = "A library that sends desktop notifications to a notification daemon"; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index a040956f553c..859f39239f36 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,24 +1,59 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, gtk-doc, docbook_xsl -, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, substituteAll +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, meson +, ninja +, gettext +, gobject-introspection +, gtk-doc +, docbook_xsl +, glib +, libsoup +, libxml2 +, libxslt +, check +, curl +, perl +, hwdata +, osinfo-db +, substituteAll , vala ? null }: stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.6.0"; + version = "1.7.1"; src = fetchurl { - url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1iwh35mahch1ls3sgq7wz8kamxrxisrff5ciqzyh2qxlrqf5qf1w"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1s97sv24bybggjx6hgqba2qdqz3ivfpd4cmkh4zm5y59sim109mv"; }; outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig vala gettext gobject-introspection gtk-doc docbook_xsl + pkgconfig + meson + ninja + vala + gettext + gobject-introspection + gtk-doc + docbook_xsl + perl # for pod2man + ]; + buildInputs = [ + glib + libsoup + libxml2 + libxslt + ]; + checkInputs = [ + check + curl + perl ]; - buildInputs = [ glib libsoup libxml2 libxslt ]; - checkInputs = [ check curl perl ]; patches = [ (substituteAll { @@ -27,13 +62,16 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ - "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids" - "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids" - "--enable-gtk-doc" + mesonFlags = [ + "-Dwith-usb-ids-path=${hwdata}/share/hwdata/usb.ids" + "-Dwith-pci-ids-path=${hwdata}/share/hwdata/pci.ids" + "-Denable-gtk-doc=true" ]; - doCheck = true; + # FIXME: fails two new tests added in 1.7.1: + # libosinfo:symbols / check-symfile + # 3/24 libosinfo:symbols / check-symsorting + doCheck = false; meta = with stdenv.lib; { description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index e73f98cd21dc..975445a4847f 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.24.1"; + version = "1.26.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw"; + sha256 = "0xkk9zhkw8f2fm7g9nb4ry4xxig5n27s7rjmx6l7jr2941zdfxm9"; }; nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Libpeas; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index d2012760dcf6..fdc352869f0a 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { pkgconfig python3 valgrind + libxslt ]; buildInputs = [ diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 24b948271223..e69cc04d6f0b 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -2,11 +2,11 @@ pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { - name = "libpst-0.6.74"; + name = "libpst-0.6.75"; src = fetchurl { url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "0dzx8jniz7mczbbp08zfrl46h27hyfrsnjxmka9pi5aawzfdm1zp"; + sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.five-ten-sg.com/libpst/; + homepage = "https://www.five-ten-sg.com/libpst/"; description = "A library to read PST (MS Outlook Personal Folders) files"; license = licenses.gpl2; maintainers = [maintainers.tohl]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 05c81e3c73ef..a8924ca47825 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.32.1"; + version = "2.33.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "1l45hrb3lgjh1kdi4khqhljndc434zf9llzbii6dcv911gxkipjr"; + sha256 = "04macplj3k2sdpf1wdjm6gsghak5dzfhi2pmr47qldh2sy2zz0a3"; }; buildInputs = [ diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index e70ac9a53626..4d23511a3419 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Librest; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 11c7f3fed84e..c6407c309536 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,22 +1,25 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3 +{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2 +, bzip2, libintl, darwin, rustc, cargo, gnome3 , vala, gobject-introspection }: let pname = "librsvg"; - version = "2.46.4"; + version = "2.48.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl"; + sha256 = "19ndf9l99wcrmkwcrk20vd1ggrwgldksfz1kkj786ljcrxv8nd2a"; }; outputs = [ "out" "dev" "installedTests" ]; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ]; + buildInputs = [ libxml2 bzip2 pango libintl ] + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; + + NIX_LDFLAGS = if stdenv.isDarwin then "-lobjc" else null; propagatedBuildInputs = [ glib gdk-pixbuf cairo ]; @@ -79,7 +82,7 @@ stdenv.mkDerivation rec { description = "A small library to render SVG images to Cairo surfaces"; homepage = https://wiki.gnome.org/Projects/LibRsvg; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 02a8abb7c856..d90106f89d81 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "librsync"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "08wdlxsa9zg2pyasz1lwg70d5psi4amv81v4yxwffx67ndzb9yp5"; + sha256 = "18wwfbbggsjrd4w3dczxa2gv3zvx0fqp68b8h1zzvdbyn91f16mz"; }; nativeBuildInputs = [ cmake ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = with stdenv.lib; { - homepage = http://librsync.sourceforge.net/; + homepage = "http://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 2092d72c9f8d..2cb6f245a8ae 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsass"; - version = "3.6.1"; + version = "3.6.3"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - sha256 = "1599j2lbsygy3883x9si7rbad1pkjhl6y72aimaapcv90ga5kxkm"; + sha256 = "1q6lvd8sj5k5an32qir918pa5khhcb8h08dzrg1bcxmw7a23j514"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index e4e87eba8587..a756caea8efc 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl - gobject-introspection vala gtk-doc + gobject-introspection vala gtk-doc glib ]; buildInputs = [ libgcrypt ]; # optional: build docs with gtk-doc? (probably needs a flag as well) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 6925bd2de4b8..a497661725b1 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.68.4"; + version = "2.70.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "151j5dc84gbl6a917pxvd0b372lw5za48n63lyv6llfc48lv2l1d"; + sha256 = "0hjk9lgppc5435my0lyywbpmj7ib5vvcylwfin8ki97g9bvj1c2l"; }; postPatch = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ python3 sqlite libpsl brotli ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ]; + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ]; propagatedBuildInputs = [ glib libxml2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 65de6db3b47b..bf6e0a491f2f 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { - name = "libssh-0.8.7"; + pname = "libssh"; + version = "0.8.8"; src = fetchurl { - url = "https://www.libssh.org/files/0.8/${name}.tar.xz"; - sha256 = "14nmwfnnrhkwcfk5hn7azl905ivbh4wllmsbw5abd80b5yi4qc23"; + url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; + sha256 = "1qk5bm9r6199jbfk54f8w24vkl52051g8s3kmq4z2kdc6vbpy4jb"; }; postPatch = '' @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SSH client library"; + homepage = "https://libssh.org"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ sander ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 26605eb41dbd..f910964a2cac 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.11"; + version = "1.2.5"; formattedVersion = lib.replaceChars ["."] ["_"] version; # Make sure we override python, so the correct version is chosen @@ -17,13 +17,14 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "arvidn"; repo = "libtorrent"; - rev = "libtorrent_${formattedVersion}"; + rev = "libtorrent-${formattedVersion}"; sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l"; }; enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ]; + preConfigure = "./autotool.sh"; postInstall = '' diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index 5d4cc61fe7ac..2e29aafdbdd1 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20190701"; + version = "20200313"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256:034c8clnskvqbwyiq7si4dad1kbngi3jmnrj064i39msqixmpdzb"; + sha256 = "1rs4mrmfcw7864kssnk559ac1sdlpl8yrd10xspxrnfz08ynqxw8"; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/fontforge/libuninameslist/; + homepage = "https://github.com/fontforge/libuninameslist/"; description = "A Library of Unicode names and annotation data"; license = licenses.bsd3; maintainers = with maintainers; [ erictapen ]; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index d6566978a6bb..502fd27ebb6c 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Attic/LibUnique"; description = "A library for writing single instance applications"; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 70e6b698ec5d..f49bebe9b1a9 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, xz }: +{ stdenv, lib, fetchurl, autoreconfHook, xz }: stdenv.mkDerivation rec { pname = "libunwind"; @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { patches = [ ./backtrace-only-with-glibc.patch ]; + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh" + ''; + nativeBuildInputs = [ autoreconfHook ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 681b2eef456c..2830ef284587 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -1,14 +1,22 @@ -{stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1}: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, patchelf +, pkgconfig +, libusb1 +}: stdenv.mkDerivation rec { - name = "libusb-compat-${version}"; + pname = "libusb-compat"; version = "0.1.7"; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure outputBin = "dev"; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - propagatedBuildInputs = [ libusb1 ]; + nativeBuildInputs = [ autoreconfHook patchelf pkgconfig ]; + + buildInputs = [ libusb1 ]; src = fetchFromGitHub { owner = "libusb"; @@ -19,6 +27,12 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; + # without this, libusb-compat is unable to find libusb1 + postFixup = '' + find $out/lib -name \*.so\* -type f -exec \ + patchelf --set-rpath ${lib.makeLibraryPath buildInputs} {} \; + ''; + meta = with stdenv.lib; { homepage = "https://libusb.info/"; repositories.git = "https://github.com/libusb/libusb-compat-0.1"; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 0b9e394559c1..0250b09ce1eb 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.34.2"; + version = "1.35.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "14ax49daz7j86lybi242jiry49jrnnvlyc39k6va700n03py4h9n"; + sha256 = "0pd94h10ay38r8fwj0qqgw908rrj83n768n8mbbpnd5w2c7wy9fz"; }; postPatch = let diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix new file mode 100644 index 000000000000..3a57a91a22ae --- /dev/null +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -0,0 +1,136 @@ +{ stdenv, fetchurl, fetchgit +, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch +, coreutils, libxml2, gnutls, perl, python2, attr +, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext +, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor +, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib +, enableXen ? false, xen ? null +, enableIscsi ? false, openiscsi +, enableCeph ? false, ceph +}: + +with stdenv.lib; + +# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> +let + buildFromTarball = stdenv.isDarwin; +in stdenv.mkDerivation rec { + pname = "libvirt"; + version = "5.9.0"; + + src = + if buildFromTarball then + fetchurl { + url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; + sha256 = "0fc9jxw3v6x5hc10bkd7bbcayn24hbld5adj2gh5s648v7hx55il"; + } + else + fetchgit { + url = git://libvirt.org/libvirt.git; + rev = "v${version}"; + sha256 = "0smm77ag8bg24xkbhl4akqikjrsq2pd3wk31nj0hk1avqnl00gmk"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ + libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib + ] ++ optionals (!buildFromTarball) [ + libtool autoconf automake + ] ++ optionals stdenv.isLinux [ + libpciaccess lvm2 utillinux systemd libnl numad zfs + libapparmor libcap_ng numactl attr parted + ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ + xen + ] ++ optionals enableIscsi [ + openiscsi + ] ++ optionals enableCeph [ + ceph + ] ++ optionals stdenv.isDarwin [ + libiconv gmp + ]; + + preConfigure = '' + ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } + PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + # the path to qemu-kvm will be stored in VM's .xml and .save files + # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations + substituteInPlace src/lxc/lxc_conf.c \ + --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + patchShebangs . # fixes /usr/bin/python references + ''; + + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/var/lib" + "--with-libpcap" + "--with-qemu" + "--with-vmware" + "--with-vbox" + "--with-test" + "--with-esx" + "--with-remote" + ] ++ optionals stdenv.isLinux [ + "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper" + "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper" + "EBTABLES_PATH=${ebtables}/bin/ebtables-legacy" + "--with-attr" + "--with-apparmor" + "--with-secdriver-apparmor" + "--with-numad" + "--with-macvtap" + "--with-virtualport" + "--with-storage-disk" + ] ++ optionals (stdenv.isLinux && zfs != null) [ + "--with-storage-zfs" + ] ++ optionals enableIscsi [ + "--with-storage-iscsi" + ] ++ optionals enableCeph [ + "--with-storage-rbd" + ] ++ optionals stdenv.isDarwin [ + "--with-init-script=none" + ]; + + installFlags = [ + "localstatedir=$(TMPDIR)/var" + "sysconfdir=$(out)/var/lib" + ]; + + + postInstall = let + binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; + in '' + substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \ + --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' + '' + optionalString stdenv.isLinux '' + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} + ''; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + meta = { + homepage = http://libvirt.org/; + repositories.git = git://libvirt.org/libvirt.git; + description = '' + A toolkit to interact with the virtualization capabilities of recent + versions of Linux (and other OSes) + ''; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz globin ]; + }; +} diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 44cdd9edf523..89617b864ac3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit -, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch -, coreutils, libxml2, gnutls, perl, python2, attr +, pkgconfig, makeWrapper, autoreconfHook, fetchpatch +, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -17,52 +17,26 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "5.4.0"; + version = "6.2.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw"; + sha256 = "1c8grqf751blsgs15wx2p05wvankdrady6290vwc85v94cgqij5f"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc"; + sha256 = "1wyihi8bhwsck9b7f3b8yhlz145sjdyyj3ykjiszrqnp0y99xxy2"; fetchSubmodules = true; }; - patches = optionals (!stdenv.isDarwin) [ - (fetchpatch { - name = "5.4.0-CVE-2019-10161.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580"; - sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs"; - }) - ] ++ [ - (fetchpatch { - name = "5.4.0-CVE-2019-10166.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a"; - sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml"; - }) - (fetchpatch { - name = "5.4.0-CVE-2019-10167.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26"; - sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml"; - }) - (fetchpatch { - name = "5.4.0-CVE-2019-10168.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291"; - sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g"; - }) - ]; - - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig docutils ] ++ optionals (!buildFromTarball) [ autoreconfHook ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap - ] ++ optionals (!buildFromTarball) [ - libtool autoconf automake + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib ] ++ optionals stdenv.isLinux [ libpciaccess lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted @@ -77,18 +51,19 @@ in stdenv.mkDerivation rec { ]; preConfigure = '' - ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } - PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH - # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' - patchShebangs . # fixes /usr/bin/python references + mkdir -p build && cd build ''; + configureScript = "../configure"; + + dontAddDisableDepTrack = true; + configureFlags = [ "--localstatedir=/var" "--sysconfdir=/var/lib" @@ -125,7 +100,6 @@ in stdenv.mkDerivation rec { "sysconfdir=$(out)/var/lib" ]; - postInstall = let binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; in '' diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 263fa0a5216d..40d21b58b55f 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch"; sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x"; - name = "CVE-2017-14160"; + name = "CVE-2017-14160+CVE-2018-10393.patch"; }) (fetchpatch { url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaa.diff"; diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix new file mode 100644 index 000000000000..14a6719533bb --- /dev/null +++ b/pkgs/development/libraries/libvpx/1_8.nix @@ -0,0 +1,183 @@ +{ stdenv, fetchFromGitHub, perl, yasm +, vp8DecoderSupport ? true # VP8 decoder +, vp8EncoderSupport ? true # VP8 encoder +, vp9DecoderSupport ? true # VP9 decoder +, vp9EncoderSupport ? true # VP9 encoder +, extraWarningsSupport ? false # emit non-fatal warnings +, werrorSupport ? false # treat warnings as errors (not available with all compilers) +, debugSupport ? false # debug mode +, gprofSupport ? false # gprof profiling instrumentation +, gcovSupport ? false # gcov coverage instrumentation +, sizeLimitSupport ? true # limit max size to allow in the decoder +, optimizationsSupport ? true # compiler optimization flags +, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime +, thumbSupport ? false # build arm assembly in thumb mode +, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) +, debugLibsSupport ? false # include debug version of each library +, postprocSupport ? true # postprocessing +, multithreadSupport ? true # multithreaded decoding & encoding +, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) +, spatialResamplingSupport ? true # spatial sampling (scaling) +, realtimeOnlySupport ? false # build for real-time encoding +, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding +, errorConcealmentSupport ? false # decoder conceals losses +, smallSupport ? false # favor smaller binary over speed +, postprocVisualizerSupport ? false # macro block/block level visualizers +, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests +, webmIOSupport ? true # input from and output to webm container +, libyuvSupport ? true # libyuv +, decodePerfTestsSupport ? false # build decoder perf tests with unit tests +, encodePerfTestsSupport ? false # build encoder perf tests with unit tests +, multiResEncodingSupport ? false # multiple-resolution encoding +, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising +, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range +, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 +# Experimental features +, experimentalSpatialSvcSupport ? false # Spatial scalable video coding +, experimentalFpMbStatsSupport ? false +, experimentalEmulateHardwareSupport ? false +}: + +let + inherit (stdenv) is64bit isMips isDarwin isCygwin; + inherit (stdenv.lib) enableFeature optional optionals; +in + +assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; +assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; +/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors. + Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl, + but is only executed if spatialResamplingSupport is enabled */ +assert spatialResamplingSupport; +assert postprocVisualizerSupport -> postprocSupport; +assert unitTestsSupport -> curl != null && coreutils != null; +assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); +assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; + +stdenv.mkDerivation rec { + pname = "libvpx"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "webmproject"; + repo = "libvpx"; + rev = "v${version}"; + sha256 = "0gyq4fkbd2fv7m1mm9xrvn6rk6f4jsmbv8bnlhingmnrvyncnmnr"; + }; + + patches = [ +# ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch + ]; + + postPatch = ''patchShebangs .''; + + outputs = [ "bin" "dev" "out" ]; + setOutputFlags = false; + + configurePlatforms = []; + configureFlags = [ + (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") + (enableFeature vp8EncoderSupport "vp8-encoder") + (enableFeature vp8DecoderSupport "vp8-decoder") + (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9") + (enableFeature vp9EncoderSupport "vp9-encoder") + (enableFeature vp9DecoderSupport "vp9-decoder") + (enableFeature extraWarningsSupport "extra-warnings") + (enableFeature werrorSupport "werror") + "--disable-install-docs" + (enableFeature examplesSupport "install-bins") + "--enable-install-libs" + "--disable-install-srcs" + (enableFeature debugSupport "debug") + (enableFeature gprofSupport "gprof") + (enableFeature gcovSupport "gcov") + # Required to build shared libraries + (enableFeature (!isCygwin) "pic") + (enableFeature optimizationsSupport "optimizations") + (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect") + (enableFeature thumbSupport "thumb") + "--enable-libs" + (enableFeature examplesSupport "examples") + "--disable-docs" + "--as=yasm" + # Limit default decoder max to WHXGA + (if sizeLimitSupport then "--size-limit=5120x3200" else null) + "--disable-codec-srcs" + (enableFeature debugLibsSupport "debug-libs") + (enableFeature isMips "dequant-tokens") + (enableFeature isMips "dc-recon") + (enableFeature postprocSupport "postproc") + (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") + (enableFeature multithreadSupport "multithread") + (enableFeature internalStatsSupport "internal-stats") + (enableFeature spatialResamplingSupport "spatial-resampling") + (enableFeature realtimeOnlySupport "realtime-only") + (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") + (enableFeature errorConcealmentSupport "error-concealment") + # Shared libraries are only supported on ELF platforms + (if isDarwin || isCygwin then + "--enable-static --disable-shared" + else + "--enable-shared") + (enableFeature smallSupport "small") + (enableFeature postprocVisualizerSupport "postproc-visualizer") + (enableFeature unitTestsSupport "unit-tests") + (enableFeature webmIOSupport "webm-io") + (enableFeature libyuvSupport "libyuv") + (enableFeature decodePerfTestsSupport "decode-perf-tests") + (enableFeature encodePerfTestsSupport "encode-perf-tests") + (enableFeature multiResEncodingSupport "multi-res-encoding") + (enableFeature temporalDenoisingSupport "temporal-denoising") + (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising") + (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking") + (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth") + (enableFeature (experimentalSpatialSvcSupport || + experimentalFpMbStatsSupport || + experimentalEmulateHardwareSupport) "experimental") + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + #"--extra-cflags=" + #"--extra-cxxflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" + # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) + # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure + # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 + "--force-target=${stdenv.hostPlatform.config}${ + if stdenv.hostPlatform.isDarwin then + if stdenv.hostPlatform.osxMinVersion == "10.10" then "14" + else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13" + else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12" + else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11" + else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10" + else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" + else "8" + else ""}-gcc" + (if stdenv.hostPlatform.isCygwin then "--enable-static-msvcrt" else "") + ] # Experimental features + ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" + ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" + ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; + + nativeBuildInputs = [ perl yasm ]; + + buildInputs = [ ] + ++ optionals unitTestsSupport [ coreutils curl ]; + + NIX_LDFLAGS = [ + "-lpthread" # fixes linker errors + ]; + + enableParallelBuilding = true; + + postInstall = ''moveToOutput bin "$bin" ''; + + meta = with stdenv.lib; { + description = "WebM VP8/VP9 codec SDK"; + homepage = https://www.webmproject.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ codyopel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 732a529c21f4..ddafc9bc6594 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -17,6 +17,7 @@ let nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; meta = with stdenv.lib; { description = "Light, portable C library for websockets"; @@ -39,9 +40,12 @@ rec { }; libwebsockets_3_2 = generic { - version = "3.2.0"; - sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8"; + version = "3.2.2"; + sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna"; }; - libwebsockets = libwebsockets_3_2; + libwebsockets_4_0 = generic { + version = "4.0.1"; + sha256 = "1pf7km0w5q7dqlwcwqizdpfqgg10prfq8g2c093f5nghwsfv8mmf"; + }; } diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 29692c41c930..9f60abd4f591 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -21,26 +21,16 @@ stdenv.mkDerivation rec{ pname = "libwnck"; - version = "3.32.0"; + version = "3.36.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1jp3p1lnwnwi6fxl2rz3166cmwzwy9vqz896anpwc3wdy9f875cm"; + sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; }; - patches = [ - # https://gitlab.gnome.org/GNOME/libwnck/issues/139 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/libwnck/commit/0d9ff7db63af568feef8e8c566e249058ccfcb4e.patch; - sha256 = "18f78aayq9jma54v2qz3rm2clmz1cfq5bngxw8p4zba7hplyqsl9"; - }) - # https://gitlab.gnome.org/GNOME/libwnck/merge_requests/12 - ./fix-pc-file.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index 35d45845ce62..1b10ac5fdaab 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libx86emu"; - version = "2.6"; + version = "3.1"; src = fetchFromGitHub { owner = "wfeldt"; repo = "libx86emu"; rev = version; - sha256 = "1a43xrgxyl1bawcyf4qnvasgjrmnl1npzlz07yz90vyg56x5c102"; + sha256 = "104xqc6nj9rpi7knl3dfqvasf087hlz2n5yndb1iycw35a6j509b"; }; nativeBuildInputs = [ perl ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "x86 emulation library"; license = licenses.bsd2; - homepage = https://github.com/wfeldt/libx86emu; + homepage = "https://github.com/wfeldt/libx86emu"; maintainers = with maintainers; [ bobvanderlinden ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index c07a5699f923..9883503414b9 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch"; sha256 = "0klvaxkzakkpyq0m44l9xrpn5kwaii194sqsivfm6zhnb9hhl15l"; }) + (fetchpatch { + name = "CVE-2019-20388.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/commit/6088a74bcf7d0c42e24cff4594d804e1d3c9fbca.patch"; + sha256 = "070s7al2r2k92320h9cdfc2097jy4kk04d0disc98ddc165r80jl"; + }) ]; outputs = [ "bin" "dev" "out" "man" "doc" ] diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 6d12329a7f51..05da09ec5a46 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -3,9 +3,6 @@ , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: -assert pythonSupport -> python != null; -assert pythonSupport -> libxml2.pythonSupport; - with stdenv.lib; stdenv.mkDerivation rec { @@ -53,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.eelco ]; + broken = !(pythonSupport -> libxml2.pythonSupport); # see #73102 for why this is not an assert }; } diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 215535fb8f13..5fc275e6f070 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; homepage = https://wiki.gnome.org/Projects/Zapojit; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index fbbfb5364b0a..80a570dd697f 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.37"; + version = "0.4.38"; pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn"; + sha256 = "1nkygc17sndznpcf71fdrhwpm8z9a3hc9csqlafwswh49axhfkjr"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library for libmediainfo and mediainfo"; - homepage = https://mediaarea.net/; + homepage = "https://mediaarea.net/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 1a23e91848e0..79933d402f7a 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libzip"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; - sha256 = "1zsspz6cbbqah11jkcc894jgxihlm8gicfh54yvny9gc3lsvpi3h"; + sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6"; }; # Fix pkgconfig file paths @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.nih.at/libzip; + homepage = "https://www.nih.at/libzip"; description = "A C library for reading, creating and modifying zip archives"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix new file mode 100644 index 000000000000..3ebcc7ad78a6 --- /dev/null +++ b/pkgs/development/libraries/lime/default.nix @@ -0,0 +1,36 @@ +{ bctoolbox +, belle-sip +, cmake +, fetchFromGitLab +, soci +, sqlite +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "lime"; + version = "4.3.1"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; + rev = version; + sha256 = "1ilpp9ai4sah23ngnxisvmwhrv5jkk5f831yp7smpl225z5nv83g"; + }; + + buildInputs = [ bctoolbox soci belle-sip sqlite ]; + nativeBuildInputs = [ cmake ]; + + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + + meta = with stdenv.lib; { + description = "End-to-end encryption library for instant messaging"; + homepage = "http://www.linphone.org/technical-corner/lime"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/libraries/loadcaffe/default.nix b/pkgs/development/libraries/loadcaffe/default.nix deleted file mode 100644 index c4e55b14407c..000000000000 --- a/pkgs/development/libraries/loadcaffe/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchFromGitHub, cmake, torch, protobuf, protobufc}: -stdenv.mkDerivation rec { - pname = "loadcaffe"; - version = "0.0pre2016.08.01"; - buildInputs = [cmake torch protobuf protobufc]; - src = fetchFromGitHub { - owner = "szagoruyko"; - repo = "loadcaffe"; - rev = "9be65cf6fa08e9333eae3553f68a8082debe9978"; - sha256 = "0b22hvd9nvjsan2h93nl6y34kkkbs36d0k1zr3csjfb5l13xz0lh"; - }; - meta = { - inherit version; - description = ''Torch7 loader for Caffe networks''; - license = stdenv.lib.licenses.bsd2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index 5b39940bb3f7..264c18b09ee4 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -1,29 +1,31 @@ -{ config, stdenv, fetchurl, pkgconfig, autoreconfHook +{ config, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , librdf_raptor2, ladspaH, openssl, zlib , doCheck ? config.doCheckByDefault or false, ladspaPlugins }: stdenv.mkDerivation rec { - version = "0.5.0"; - pname = "liblrdf"; + pname = "lrdf"; + version = "0.6.1"; - src = fetchurl { - url = "https://github.com/swh/LRDF/archive/${version}.tar.gz"; - sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s"; + src = fetchFromGitHub { + owner = "swh"; + repo = "LRDF"; + rev = "v${version}"; + sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4"; }; postPatch = stdenv.lib.optionalString doCheck '' sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c ''; - preAutoreconf = "rm m4/*"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ladspaH openssl zlib ]; propagatedBuildInputs = [ librdf_raptor2 ]; inherit doCheck; + enableParallelBuilding = true; + meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; homepage = https://sourceforge.net/projects/lrdf/; diff --git a/pkgs/development/libraries/malcontent/better-separation.patch b/pkgs/development/libraries/malcontent/better-separation.patch new file mode 100644 index 000000000000..cd91760bff59 --- /dev/null +++ b/pkgs/development/libraries/malcontent/better-separation.patch @@ -0,0 +1,35 @@ +diff --git a/meson.build b/meson.build +index a6c477d..f7b2f0a 100644 +--- a/meson.build ++++ b/meson.build +@@ -125,8 +125,8 @@ test_env = [ + 'LC_ALL=C.UTF-8', + ] + +-subdir('accounts-service') + if not get_option('use_system_libmalcontent') ++ subdir('accounts-service') + subdir('libmalcontent') + else + libmalcontent_api_version = '0' +@@ -137,11 +137,17 @@ endif + if get_option('ui').enabled() + subdir('libmalcontent-ui') + endif +-subdir('malcontent-client') ++if not get_option('use_system_libmalcontent') ++ subdir('malcontent-client') ++endif + if get_option('ui').enabled() + subdir('malcontent-control') + endif +-subdir('pam') ++if not get_option('use_system_libmalcontent') ++ subdir('pam') ++endif + subdir('po') + +-meson.add_install_script('build-aux/meson_post_install.py') ++if get_option('ui').enabled() ++ meson.add_install_script('build-aux/meson_post_install.py') ++endif diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index bd8988390c91..bf2ec7725072 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkgconfig @@ -9,10 +10,7 @@ , coreutils , accountsservice , dbus -, flatpak -, gtk3 , pam -, desktop-file-utils , polkit , glib-testing , python3 @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.6.0"; + version = "0.7.0"; outputs = [ "bin" "out" "dev" "man" "installedTests" ]; @@ -30,16 +28,22 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "COh6N3CmLIcxx6tW4jcP0m6TZv0Z1YJUM/nlG0RzYHQ="; + sha256 = "cP2l6nl6cuBQYwkmBj8APu/vH3jTeScXf3ffcuSfqlM="; }; patches = [ # Allow installing installed tests to a separate output. ./installed-tests-path.patch - # This is unnecessary and breaks when submodules are not available. - # https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/3 - ./use-system-dependencies.patch + # Do not build things that are part of malcontent-ui package + ./better-separation.patch + + # Fix pam installed test + # https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/50 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pwithnall/malcontent/commit/5d102eeb0604e65fc977ca77d4b249e986e634cc.patch"; + sha256 = "5PD/eJBw/8Uqcia7ena9mu45DgREBFj0zUJpcd0vQ+8="; + }) ]; nativeBuildInputs = [ @@ -47,15 +51,12 @@ stdenv.mkDerivation rec { ninja pkgconfig gobject-introspection - desktop-file-utils wrapGAppsHook ]; buildInputs = [ accountsservice dbus - flatpak - gtk3 pam polkit glib-testing @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dinstalled_tests=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Dui=disabled" ]; postPatch = '' diff --git a/pkgs/development/libraries/malcontent/installed-tests-path.patch b/pkgs/development/libraries/malcontent/installed-tests-path.patch index ac87ddf6ccbe..5d26c0f864f8 100644 --- a/pkgs/development/libraries/malcontent/installed-tests-path.patch +++ b/pkgs/development/libraries/malcontent/installed-tests-path.patch @@ -22,12 +22,12 @@ index 610bc35..13e0713 100644 \ No newline at end of file +endforeach diff --git a/meson_options.txt b/meson_options.txt -index 06329d4..72aa505 100644 +index d516c70..583cb94 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -9,3 +9,9 @@ option( - type: 'string', - description: 'directory for PAM modules' +@@ -4,6 +4,12 @@ option( + value: false, + description: 'enable installed tests' ) +option( + 'installed_test_prefix', @@ -35,6 +35,9 @@ index 06329d4..72aa505 100644 + value: '', + description: 'Prefix for installed tests' +) + option( + 'pamlibdir', + type: 'string', diff --git a/pam/tests/meson.build b/pam/tests/meson.build index 0560dcb..a74dab2 100644 --- a/pam/tests/meson.build diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix new file mode 100644 index 000000000000..af1fa6b41387 --- /dev/null +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -0,0 +1,70 @@ +{ stdenv +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook +, glib +, accountsservice +, dbus +, flatpak +, malcontent +, gtk3 +, desktop-file-utils +, polkit +, glib-testing +}: + +stdenv.mkDerivation rec { + pname = "malcontent-ui"; + + inherit (malcontent) version src; + + outputs = [ "bin" "out" "dev" ]; + + patches = [ + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch + + # Do not build things that are part of malcontent package + ./better-separation.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + desktop-file-utils + wrapGAppsHook + ]; + + buildInputs = [ + dbus + polkit + glib-testing + flatpak + ]; + + propagatedBuildInputs = [ + accountsservice + malcontent + glib + gtk3 + ]; + + mesonFlags = [ + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Duse_system_libmalcontent=true" + "-Dui=enabled" + ]; + + meta = with stdenv.lib; { + description = "UI components for parental controls library"; + homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/malcontent/use-system-dependencies.patch b/pkgs/development/libraries/malcontent/use-system-dependencies.patch deleted file mode 100644 index 8920b1f4a999..000000000000 --- a/pkgs/development/libraries/malcontent/use-system-dependencies.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/meson.build b/meson.build -index 3575224..0abea63 100644 ---- a/meson.build -+++ b/meson.build -@@ -40,9 +40,8 @@ polkit_gobject = dependency('polkit-gobject-1') - polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir', - define_variable: ['prefix', prefix]) - --libglib_testing = subproject('libglib-testing') - libglib_testing_dep = dependency( -- 'libglib-testing', -+ 'glib-testing-0', - fallback: ['libglib-testing', 'libglib_testing_dep'], - ) - diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 0204223d127c..5f7daa83b2f5 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,37 +1,97 @@ -{ stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm -, libopus, ffmpeg, libX11, libXv, libGLU, libGL, glew, libtheora, libvpx, SDL, libupnp -, ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen -, python, libXext, libmatroska, fetchpatch +{ alsaLib +, bctoolbox +, bzrtp +, cmake +, doxygen +, fetchFromGitLab +, fetchpatch +, ffmpeg +, glew +, gsm +, intltool +, libGL +, libGLU +, libX11 +, libXext +, libXv +, libmatroska +, libopus +, libpcap +, libpulseaudio +, libtheora +, libupnp +, libv4l +, libvpx +, ortp +, pkgconfig +, python +, SDL +, speex +, srtp +, stdenv }: stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "2.16.1"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-03-20"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; - rev = version; - sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j"; + rev = "c5eecb72cb44376d142949051dd0cb7c982608fb"; + sha256 = "1vp260jxvjlmrmjdl4p23prg4cjln20a7z6zq8dqvfh4iq3ya033"; }; patches = [ - (fetchpatch { - name = "allow-build-without-git.patch"; - url = "https://github.com/BelledonneCommunications/mediastreamer2/commit/de3a24b795d7a78e78eab6b974e7ec5abf2259ac.patch"; - sha256 = "1zqkrab42n4dha0knfsyj4q0wc229ma125gk9grj67ps7r7ipscy"; - }) + # Plugins directory is normally fixed during compile time. This patch makes + # it possible to set the plugins directory run time with an environment + # variable MEDIASTREAMER_PLUGINS_DIR. This makes it possible to construct a + # plugin directory with desired plugins and wrap executables so that the + # environment variable points to that directory. ./plugins_dir.patch ]; - nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ]; + nativeBuildInputs = [ + cmake + doxygen + intltool + pkgconfig + python + ]; propagatedBuildInputs = [ - alsaLib libpulseaudio speex gsm libopus - ffmpeg libX11 libXv libGLU libGL glew libtheora libvpx SDL libupnp - ortp libv4l libpcap srtp bctoolbox libXext libmatroska + alsaLib + bctoolbox + bzrtp + ffmpeg + glew + gsm + libGL + libGLU + libX11 + libXext + libXv + libmatroska + libopus + libpcap + libpulseaudio + libtheora + libupnp + libv4l + libvpx + ortp + SDL + speex + srtp ]; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + NIX_CFLAGS_COMPILE = toString [ "-DGIT_VERSION=\"v${version}\"" "-Wno-error=deprecated-declarations" @@ -43,8 +103,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; - homepage = http://www.linphone.org/technical-corner/mediastreamer2; - license = licenses.gpl2; + homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; + license = licenses.gpl3; platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index f1e9fc301510..45b3c83bfe24 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,31 +1,49 @@ -{ stdenv, autoreconfHook, pkgconfig, mediastreamer, openh264 -, fetchurl, fetchpatch, cmake +{ autoreconfHook +, cmake +, fetchFromGitLab +, fetchpatch +, mediastreamer +, openh264 +, pkgconfig +, stdenv }: stdenv.mkDerivation rec { - pname = "mediastreamer-openh264"; - version = "1.2.1"; + pname = "msopenh264"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-03-03"; - src = fetchurl { - url = "https://www.linphone.org/releases/sources/plugins/msopenh264/msopenh264-${version}.tar.gz"; - sha256 = "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; + rev = "2c3abf52824ad23a4caae7565ef158ef91767704"; + sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr"; }; - patches = [ - (fetchpatch { - name = "msopenh264-build-with-openh264-v2.patch"; - url = "https://git.pld-linux.org/?p=packages/mediastreamer-plugin-msopenh264.git;a=blob_plain;f=mediastreamer-plugin-msopenh264-openh264.patch;hb=344b8af379701a7e58b4ffb3cbac1517eff079fd"; - sha256 = "10c24b0afchx78q28176pd8iz7i1nlf57f6v6lyqxpz60fm5nrcc"; - }) - ]; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; buildInputs = [ mediastreamer openh264 ]; + # Do not build static libraries + cmakeFlags = [ + "-DENABLE_STATIC=NO" + "-DCMAKE_SKIP_INSTALL_RPATH=ON" + ]; + + # CMAKE_INSTALL_PREFIX has no effect so let's install manually. See: + # https://gitlab.linphone.org/BC/public/msopenh264/issues/1 + installPhase = '' + mkdir -p $out/lib/mediastreamer/plugins + cp src/libmsopenh264.so $out/lib/mediastreamer/plugins/ + ''; + meta = with stdenv.lib; { description = "H.264 encoder/decoder plugin for mediastreamer2"; homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/pkgs/development/libraries/mediastreamer/plugins_dir.patch index e64bfc5a43a1..43e398aafee4 100644 --- a/pkgs/development/libraries/mediastreamer/plugins_dir.patch +++ b/pkgs/development/libraries/mediastreamer/plugins_dir.patch @@ -1,24 +1,18 @@ -diff -uNr mediastreamer2/src/base/msfactory.c mediastreamer2-new/src/base/msfactory.c ---- a/src/base/msfactory.c 2015-05-13 16:53:49.801113249 +0200 -+++ b/src/base/msfactory.c 2015-08-26 21:35:44.994724647 +0200 -@@ -630,12 +630,18 @@ +diff --git a/src/base/msfactory.c b/src/base/msfactory.c +index 14f868e3..2e3445a1 100644 +--- a/src/base/msfactory.c ++++ b/src/base/msfactory.c +@@ -770,7 +770,12 @@ void ms_factory_uninit_plugins(MSFactory *factory){ } void ms_factory_init_plugins(MSFactory *obj) { +- if (obj->plugins_dir == NULL) { + char *package_plugins_dir; - if (obj->plugins_dir == NULL) { -+ package_plugins_dir=getenv("MEDIASTREAMER_PLUGINS_DIR"); -+ if (package_plugins_dir!=NULL){ -+ obj->plugins_dir = ms_strdup(package_plugins_dir); -+ } else { - #ifdef PACKAGE_PLUGINS_DIR -- obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR); -+ obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR); - #else -- obj->plugins_dir = ms_strdup(""); -+ obj->plugins_dir = ms_strdup(""); - #endif -+ } - } - if (strlen(obj->plugins_dir) > 0) { - ms_message("Loading ms plugins from [%s]",obj->plugins_dir); ++ // Force plugin dir from environment variable if set ++ package_plugins_dir = getenv("MEDIASTREAMER_PLUGINS_DIR"); ++ if (package_plugins_dir != NULL) { ++ ms_factory_set_plugins_dir(obj, package_plugins_dir); ++ } else if (obj->plugins_dir == NULL) { + #ifdef __APPLE__ + char *dir = getPluginsDir(); + if (dir != NULL) { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 4e95e4771736..7eb18dd31c1b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let - version = "19.3.3"; + version = "20.0.2"; branch = versions.major version; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "02czqdqf64i3az5p1allnxycyjad3x35cj0hz0017mi5pc84ikl1"; + sha256 = "0vz8k07d23qdwy67fnna9y0ynnni0m8lgswcmdm60l4mcv5z2m5a"; }; prePatch = "patchShebangs ."; @@ -191,8 +191,18 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - description = "An open source implementation of OpenGL"; - homepage = https://www.mesa3d.org/; + description = "An open source 3D graphics library"; + longDescription = '' + The Mesa project began as an open-source implementation of the OpenGL + specification - a system for rendering interactive 3D graphics. Over the + years the project has grown to implement more graphics APIs, including + OpenGL ES (versions 1, 2, 3), OpenCL, OpenMAX, VDPAU, VA API, XvMC, and + Vulkan. A variety of device drivers allows the Mesa libraries to be used + in many different environments ranging from software emulation to + complete hardware acceleration for modern GPUs. + ''; + homepage = "https://www.mesa3d.org/"; + changelog = "https://www.mesa3d.org/relnotes/${version}.html"; license = licenses.mit; # X11 variant, in most files platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ vcunat ]; diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index 8ce3473dd32f..acf3d827c562 100644 --- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -1,4 +1,4 @@ -From 6d22383149e4cdc646c68e29238f41d895a4705b Mon Sep 17 00:00:00 2001 +From 46b10f2bc28fd79d561c8c49bbae3aee6a4cf0e6 Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Mon, 6 Aug 2018 15:52:11 -0300 Subject: [PATCH] disk_cache: include dri driver path in cache key @@ -12,10 +12,10 @@ timestamps in /nix/store are zero. 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index 626baf3..579c15b 100644 +index 1a2dd8ebd12..2ac741af5a6 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -341,6 +341,12 @@ option( +@@ -348,6 +348,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -29,10 +29,10 @@ index 626baf3..579c15b 100644 'I-love-half-baked-turnips', type : 'boolean', diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index 0cd92ca..fc1c173 100644 +index d1f14736725..2ed328f292e 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -395,8 +395,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -402,8 +402,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -43,7 +43,7 @@ index 0cd92ca..fc1c173 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -417,6 +419,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -424,6 +426,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -52,13 +52,13 @@ index 0cd92ca..fc1c173 100644 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build -index f69ebe9..e2bd8e2 100644 +index 9da29cc7390..5f549bb1d99 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -158,7 +158,12 @@ _libmesa_util = static_library( - [files_mesa_util, format_srgb], +@@ -170,7 +170,12 @@ _libmesa_util = static_library( include_directories : inc_common, dependencies : deps_for_libmesa_util, + link_with: libmesa_format, - c_args : [c_msvc_compat_args, c_vis_args], + c_args : [ + c_msvc_compat_args, c_vis_args, @@ -70,5 +70,4 @@ index f69ebe9..e2bd8e2 100644 ) -- -2.24.1 - +2.25.1 diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch index 18e7d5437b15..9685a1619a58 100644 --- a/pkgs/development/libraries/mesa/missing-includes.patch +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -9,17 +9,6 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 -+++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 -@@ -24,6 +24,8 @@ - #ifndef _THREADPOOL_H_ - #define _THREADPOOL_H_ - -+#include <pthread.h> -+ - #define MAXTHREADS 1 - - struct threadpool { --- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 +++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 @@ -23,7 +23,9 @@ diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 9a789a58ccac..890ab6fca11c 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtkmm.org"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index ffefc8e51c4d..c9a2621f4400 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.30.2"; + version = "0.31.0"; pname = "neon"; src = fetchurl { url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; - sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv"; + sha256 = "19dx4rsqrck9jl59y4ad9jf115hzh6pz1hcl2dnlfc84hc86ymc0"; }; patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; - homepage = http://www.webdav.org/neon/; + homepage = "http://www.webdav.org/neon/"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 57ed58912751..eae4563cf80e 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -9,14 +9,16 @@ , enableGetAssets ? false, libxml2 ? null , enableJemalloc ? false, jemalloc ? null , enableApp ? !stdenv.hostPlatform.isWindows +, enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null }: assert enableHpack -> jansson != null; assert enableAsioLib -> boost != null; assert enableGetAssets -> libxml2 != null; assert enableJemalloc -> jemalloc != null; +assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null; -let inherit (stdenv.lib) optional; in +let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "nghttp2"; @@ -27,7 +29,8 @@ stdenv.mkDerivation rec { sha256 = "0kyrgd4s2pq51ps5z385kw1hn62m8qp7c4h6im0g4ibrf89qwxc2"; }; - outputs = [ "bin" "out" "dev" "lib" ]; + outputs = [ "bin" "out" "dev" "lib" ] + ++ optional enablePython "python"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] @@ -37,16 +40,31 @@ stdenv.mkDerivation rec { ++ optional enableHpack jansson ++ optional enableAsioLib boost ++ optional enableGetAssets libxml2 - ++ optional enableJemalloc jemalloc; + ++ optional enableJemalloc jemalloc + ++ optionals enablePython [ python ncurses setuptools ]; enableParallelBuilding = true; configureFlags = [ "--with-spdylay=no" "--disable-examples" - "--disable-python-bindings" (stdenv.lib.enableFeature enableApp "app") - ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; + ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib" + ++ (if enablePython then [ + "--with-cython=${cython}/bin/cython" + ] else [ + "--disable-python-bindings" + ]); + + preInstall = optionalString enablePython '' + mkdir -p $out/${python.sitePackages} + # convince installer it's ok to install here + export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}" + ''; + postInstall = optionalString enablePython '' + mkdir -p $python/${python.sitePackages} + mv $out/${python.sitePackages}/* $python/${python.sitePackages} + ''; #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index dec4e61a7bc8..c03b09447789 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "nss_wrapper-1.1.8"; + name = "nss_wrapper-1.1.11"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1cnzhnz68ywx1jwj6xaxv8hg8hpm63ssxmrlhsz3sfgjhfkmw95l"; + sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix index 5c8bf8dedc1e..3e3530215bf8 100644 --- a/pkgs/development/libraries/nsss/default.nix +++ b/pkgs/development/libraries/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.0.2.1"; - sha256 = "1arzl4492wv42rvv6xs8h5d3qpy9nwxv5l84inzabs6s9f9nlxax"; + version = "0.0.2.2"; + sha256 = "0am195wabv63n545ykqnch9gs8cs1g5zw35k2ddxb9dnamhxfi9k"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index a310d2f27802..de0db887d4bf 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -1,32 +1,48 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, gettext, libxslt -, docbook_xsl, docbook_xml_dtd_42 +{ stdenv +, fetchurl +, python3 +, pkg-config +, readline +, gettext +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_42 +, wafHook }: stdenv.mkDerivation rec { - name = "ntdb-1.0"; + pname = "ntdb"; + version = "1.0"; src = fetchurl { - url = "mirror://samba/tdb/${name}.tar.gz"; + url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkg-config + gettext + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 + wafHook + ]; + buildInputs = [ - python readline gettext libxslt docbook_xsl docbook_xml_dtd_42 + python3 + readline # required to build python ]; - preConfigure = '' - patchShebangs buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace,ccan" ]; meta = with stdenv.lib; { description = "The not-so trivial database"; - homepage = https://tdb.samba.org/; + homepage = "https://tdb.samba.org/"; license = licenses.lgpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index c1f354a1ac98..0cda3d6ac9a2 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "1cyvvf5f92a777qgh00ja43z43j5nhc9dw5l3wvw9j6j9bqc4i8p"; + sha256 = "19mwjg5mz645i4ijhx93rqbcim14ca6nczymr20p0z0pn5mx5p18"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index ace08ef018a3..7d0a9342aa7b 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "0chbn2wkl1w3msw0zscajinzlaaahg4w3lrpb2l8xgqdwbln0ckj"; + sha256 = "1alhb7nvlxrr9yf757gs4hkzksbk3mxyv5zcmmpl82ibl65vh55k"; # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc. # submodules increase src size and compile times significantly # not currently feasible due to how integrated cmake build is with git diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix index 5ed2dd5e23d2..cb8d9c788ca9 100644 --- a/pkgs/development/libraries/opencl-clhpp/default.nix +++ b/pkgs/development/libraries/opencl-clhpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opencl-clhpp"; - version = "2.0.10"; + version = "2.0.11"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-CLHPP"; rev = "v${version}"; - sha256 = "0h5kpg5cl8wzfnqmv6i26aig2apv06ffm9p3rh35938n9r8rladm"; + sha256 = "0a0n0f1lb86cwfm0ndzykcn965vz1v0n9n3rfmkiwrzkdhc9iy2y"; }; nativeBuildInputs = [ cmake python ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenCL Host API C++ bindings"; - homepage = http://github.khronos.org/OpenCL-CLHPP/; + homepage = "http://github.khronos.org/OpenCL-CLHPP/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index d0cc6396b8d8..682a547d8f33 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub -, version # "12" for "1.2", "22" for "2.2" and so on }: -stdenv.mkDerivation { - name = "opencl-headers-${version}-2017-07-18"; +stdenv.mkDerivation rec { + name = "opencl-headers-${version}"; + version = "2020.03.13"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; - rev = "f039db6764d52388658ef15c30b2237bbda49803"; - sha256 = "0z04i330zr8czak2624q71aajdcq7ly8mb5bgala5m235qjpsrh7"; + rev = "v${version}"; + sha256 = "1d9ibiwicaj17757h9yyjc9i2hny8d8npn4spbjscins8972z3hw"; }; installPhase = '' mkdir -p $out/include/CL - cp opencl${version}/CL/* $out/include/CL + cp CL/* $out/include/CL ''; meta = with stdenv.lib; { description = "Khronos OpenCL headers version ${version}"; - homepage = https://www.khronos.org/registry/cl/; + homepage = "https://www.khronos.org/registry/cl/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 6bf5ea6023e0..2abad0f705fa 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -1,26 +1,27 @@ { stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig -, nettle, gnutls, msgpack, readline, libargon2 +, cmake, pkg-config +, asio, nettle, gnutls, msgpack, readline, libargon2 }: stdenv.mkDerivation rec { pname = "opendht"; - version = "1.8.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "1mj3zsywxphh9wcazyqsldwwn14r77xv9cjsmc0nmcybsl2bwnpl"; + sha256 = "1q1fwk8wwk9r6bp0indpr60ql668lsk16ykslacyhrh7kg97kvhr"; }; nativeBuildInputs = - [ autoreconfHook - pkgconfig + [ cmake + pkg-config ]; buildInputs = - [ nettle + [ asio + nettle gnutls msgpack readline diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 4c2052ae7915..cc9e44d990dd 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.openldap.org/; + homepage = "https://www.openldap.org/"; description = "An open source implementation of the Lightweight Directory Access Protocol"; license = licenses.openldap; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index a2a0c68c316e..87c4452b9110 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -153,8 +153,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1d"; - sha256 = "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy"; + version = "1.1.1f"; + sha256 = "186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 1c30277df120..5ba6c38f7c1d 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0zvp3x9hhpww2ym1inc0z8cwmfqhgqgl2g7csmj6ipp2fqwl6dlj"; + sha256 = "0p5i4360hc5y8rqhgpvg1f1yaxl7kay471868vfzkp44g8dybkvm"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 68e890e33682..53636f05b789 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,16 +1,27 @@ -{ stdenv, cmake, fetchFromGitHub, bctoolbox }: +{ bctoolbox +, cmake +, fetchFromGitLab +, stdenv +}: stdenv.mkDerivation rec { pname = "ortp"; - version = "1.0.2"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-03-17"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; - rev = version; - sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv"; + rev = "804dfc4f90d1a4301127c7af10a74fd2935dd5d8"; + sha256 = "1yr8j8am68spyy5d9vna8zcq3qn039mi16cv9jf5n4chs9rxf7xx"; }; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; buildInputs = [ bctoolbox ]; @@ -18,8 +29,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Real-Time Transport Protocol (RFC3550) stack"; - homepage = https://linphone.org/technical-corner/ortp; - license = licenses.gpl2Plus; + homepage = "https://linphone.org/technical-corner/ortp"; + license = licenses.gpl3; platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index b0c7ac3cab6b..4482a9cd312d 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv -, Security +, lib }: buildGoModule rec { @@ -17,11 +16,9 @@ buildGoModule rec { subPackages = [ "packr" "v2/packr2" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv"; - meta = with stdenv.lib; { + meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; homepage = "https://github.com/gobuffalo/packr"; license = licenses.mit; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ecb0f16c72c5..f37a6972c25e 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -23,6 +23,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja + glib # for glib-mkenum pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index ba903d27ab7f..81da7332d0f4 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.10.0"; + name = "pcl-1.10.1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "1dbfkdk9mgwzadkw9jx3f5vzrcj88qcyv745kjxld7gcv8by9g6g"; + sha256 = "1i4zfcikvdl5z1s3lh0n46fgi42s9vbki4hfmy7656hamajfai0v"; }; enableParallelBuilding = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://pointclouds.org/; + homepage = "http://pointclouds.org/"; description = "Open project for 2D/3D image and point cloud processing"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index d8aff555e556..a07c3c19a1bb 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -1,28 +1,41 @@ -{ stdenv, fetchurl, cmake, coreutils, root }: +{ stdenv, fetchurl, cmake, coreutils, python, root }: + +let + pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}"; + withPython = python != null; +in stdenv.mkDerivation rec { pname = "hepmc3"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; - sha256 = "1izcldnjbyn6myr7nv7b4jivf2vmdi64ng9gk1vjh998755hfcs1"; + sha256 = "1z491x3blqs0a2jxmhzhmh4kqdw3ddcbvw69gidg4w6icdvkhcpi"; }; - buildInputs = [ cmake root ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ root ] + ++ stdenv.lib.optional withPython python; + + cmakeFlags = [ + "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" + ] ++ stdenv.lib.optionals withPython [ + "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}" + "-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}" + ]; postInstall = '' substituteInPlace "$out"/bin/HepMC3-config \ - --replace 'greadlink' '${coreutils}/bin/readlink' + --replace 'greadlink' '${coreutils}/bin/readlink' \ + --replace 'readlink' '${coreutils}/bin/readlink' ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; - license = licenses.gpl3; - homepage = http://hepmc.web.cern.ch/hepmc/; - platforms = platforms.unix; + license = licenses.gpl3; + homepage = "http://hepmc.web.cern.ch/hepmc/"; + platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/pipewire/2.nix b/pkgs/development/libraries/pipewire/2.nix new file mode 100644 index 000000000000..3efbea97c5e9 --- /dev/null +++ b/pkgs/development/libraries/pipewire/2.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind +, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg +, sbc, SDL2, makeFontsConf +}: + +let + fontsConf = makeFontsConf { + fontDirectories = [ ]; + }; +in stdenv.mkDerivation rec { + pname = "pipewire"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "PipeWire"; + repo = "pipewire"; + rev = version; + sha256 = "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc"; + }; + + outputs = [ "out" "lib" "dev" "doc" ]; + + nativeBuildInputs = [ + meson ninja pkgconfig doxygen graphviz valgrind + ]; + buildInputs = [ + glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer + alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 + ]; + + mesonFlags = [ + "-Ddocs=true" + "-Dgstreamer=enabled" + ]; + + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + + doCheck = true; + + meta = with stdenv.lib; { + description = "Server and user space API to deal with multimedia pipelines"; + homepage = https://pipewire.org/; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 094e90fd500d..b37bbd273e2e 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitHub +, fetchFromGitLab , meson , ninja , pkgconfig @@ -17,6 +17,11 @@ , xorg , sbc , SDL2 +, libsndfile +, bluez +, vulkan-headers +, vulkan-loader +, libpulseaudio , makeFontsConf }: @@ -27,15 +32,16 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.2.7"; + version = "0.3.2"; outputs = [ "out" "lib" "dev" "doc" ]; - src = fetchFromGitHub { - owner = "PipeWire"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc"; + sha256 = "U7lqvn2vMIxARNplzNX9H3Ztlfv1IH8LozJsq7JSEKs="; }; nativeBuildInputs = [ @@ -50,25 +56,29 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsaLib + bluez dbus ffmpeg glib gst_all_1.gst-plugins-base gst_all_1.gstreamer libjack2 + libpulseaudio + libsndfile libva sbc udev + vulkan-headers + vulkan-loader xorg.libX11 ]; mesonFlags = [ "-Ddocs=true" - "-Dgstreamer=enabled" + "-Dman=false" # we don't have xmltoman + "-Dgstreamer=true" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file doCheck = true; @@ -76,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Server and user space API to deal with multimedia pipelines"; homepage = https://pipewire.org/; - license = licenses.lgpl21; + license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ jtojnar ]; }; diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index ecd20d545d58..1f43be20cfb6 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Cross-platform C++ libraries with a network/internet focus"; license = licenses.boost; maintainers = with maintainers; [ orivej ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 592a1f1470a4..b04a2242ab7a 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "popt-1.16"; + pname = "popt"; + version = "1.16"; src = fetchurl { - url = "http://rpm5.org/files/popt/${name}.tar.gz"; + url = "mirror://debian/pool/main/p/popt/popt_${version}.orig.tar.gz"; sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; }; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index ea89dbee0f61..fc0f1cf67a56 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }: stdenv.mkDerivation rec { - name = "proj"; - version = "6.1.1"; + pname = "proj"; + version = "6.3.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - sha256 = "0w2v2l22kv0xzq5hwl7n8ki6an8vfsr0lg0cdbkwcl4xv889ysma"; + sha256 = "1ildcp57qsa01kvv2qxd05nqw5mg0wfkksiv9l138dbhp0s7rkxp"; }; outputs = [ "out" "dev"]; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 66a395801b27..b616b898a6e0 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -1,18 +1,18 @@ -{ fetchFromGitHub, stdenv, autoreconfHook }: +{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.8.4"; + version = "1.12.0"; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1daml02z4rs9cxls95p2v24jvwcsp43a0gqv06s84ay5yn6r47wx"; + sha256 = "17jhbzx8khz5vbl0lhcipjzgg897p1k2lp5wcc3hiddcfyh05pdj"; }; outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 3626e15cfc75..93b9b9634de3 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -1,4 +1,16 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake, qtx11extras, pantheon }: +{ mkDerivation +, lib +, fetchFromGitHub +, pkgconfig +, gtk3 +, glib +, qtbase +, qmake +, qtx11extras +, pantheon +, substituteAll +, gsettings-desktop-schemas +}: mkDerivation rec { pname = "qgnomeplatform"; @@ -11,12 +23,21 @@ mkDerivation rec { sha256 = "0fb1mzs6sx76bl7f0z2xhc0jq6y1c55jrw1v3na8577is6g5ji0a"; }; + patches = [ + # Hardcode GSettings schema path to avoid crashes from missing schemas + (substituteAll { + src = ./hardcode-gsettings.patch; + gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas; + }) + ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ + glib gtk3 qtbase qtx11extras diff --git a/pkgs/development/libraries/qgnomeplatform/hardcode-gsettings.patch b/pkgs/development/libraries/qgnomeplatform/hardcode-gsettings.patch new file mode 100644 index 000000000000..9b342d7cf832 --- /dev/null +++ b/pkgs/development/libraries/qgnomeplatform/hardcode-gsettings.patch @@ -0,0 +1,24 @@ +diff --git a/common/gnomehintssettings.cpp b/common/gnomehintssettings.cpp +index 9860e57..40fa6ec 100644 +--- a/common/gnomehintssettings.cpp ++++ b/common/gnomehintssettings.cpp +@@ -80,9 +80,17 @@ void gtkMessageHandler(const gchar *log_domain, + GnomeHintsSettings::GnomeHintsSettings() + : QObject(0) + , m_usePortal(checkUsePortalSupport()) +- , m_gnomeDesktopSettings(g_settings_new("org.gnome.desktop.wm.preferences")) +- , m_settings(g_settings_new("org.gnome.desktop.interface")) + { ++ g_autoptr(GSettingsSchemaSource) schemaSource = nullptr; ++ g_autoptr(GSettingsSchema) gnomeDesktopSchema = nullptr; ++ g_autoptr(GSettingsSchema) settingsSchema = nullptr; ++ ++ schemaSource = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", g_settings_schema_source_get_default(), true, nullptr); ++ gnomeDesktopSchema = g_settings_schema_source_lookup(schemaSource, "org.gnome.desktop.wm.preferences", false); ++ m_gnomeDesktopSettings = g_settings_new_full(gnomeDesktopSchema, nullptr, nullptr); ++ settingsSchema = g_settings_schema_source_lookup(schemaSource, "org.gnome.desktop.interface", false); ++ m_settings = g_settings_new_full(settingsSchema, nullptr, nullptr); ++ + gtk_init(nullptr, nullptr); + + // Set log handler to suppress false GtkDialog warnings diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index c0bba5e5c010..78d711e969b5 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -74,6 +74,11 @@ let url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915"; sha256 = "1gpcbdpyazdxnmldvhsf3pfwr2gjvi08x3j6rxf543rq01bp6cpx"; }) + (fetchpatch { + name = "QTBUG-78937.patch"; + url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=67a9c600ad14ee44501a6df3509daa8234b97606"; + sha256 = "1jiky1w9j8rka78r4q0yabb8w2l5j6csdjysynz7gs1ry4xjfdxd"; + }) ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; @@ -150,6 +155,7 @@ let qtserialport = callPackage ../modules/qtserialport.nix {}; qtspeech = callPackage ../modules/qtspeech.nix {}; qtsvg = callPackage ../modules/qtsvg.nix {}; + qtscxml = callPackage ../modules/qtscxml.nix {}; qttools = callPackage ../modules/qttools.nix {}; qttranslations = callPackage ../modules/qttranslations.nix {}; qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtscxml.nix b/pkgs/development/libraries/qt-5/modules/qtscxml.nix new file mode 100644 index 000000000000..62b428b08933 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtscxml.nix @@ -0,0 +1,7 @@ +{ qtModule, qtbase, qtdeclarative }: + +qtModule { + name = "qtscxml"; + qtInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; +} diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 3f0dc18f157b..66a7b95e334f 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.0.4"; + version = "6.0.5"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0cp7sbj20z0vl99qhs3hi5bd6akjd9l7lqdky0p6la4c9y9w5n1w"; + sha256 = "1f2nir1qb0d6r1ndpsg7vpskdw08szq82mqvbwm5bi160xkrqhjf"; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 6e0fa53aa828..9568a63f691c 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { - name = "qwt-6.1.2"; + name = "qwt-6.1.4"; src = fetchurl { url = "mirror://sourceforge/qwt/${name}.tar.bz2"; - sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b"; + sha256 = "1navkcnmn0qz8kzsyqmk32d929zl72l0b580w1ica7z5559j2a8m"; }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index bd79e3628a14..6feb896911b9 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -18,7 +18,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; @@ -26,7 +25,7 @@ in stdenv.mkDerivation rec { description = "Documentation metadata library based on the proposed Freedesktop.org spec"; homepage = https://rarian.freedesktop.org/; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index e221c82edeca..168b82eec160 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "resolv_wrapper-1.1.5"; + name = "resolv_wrapper-1.1.6"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0v5hw5ipq2rrpraf4ck4r9w9xihmgwzkpf5wgppz7gc52fmgv2g9"; + sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index c9ba339ae0ea..29233a1ad3f5 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw -, vampSDK, ladspaH }: +, vamp-plugin-sdk, ladspaH }: stdenv.mkDerivation { name = "rubberband-1.8.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsamplerate libsndfile fftw vampSDK ladspaH ]; + buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 604413c96d8a..82109b4ba342 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -7,17 +7,18 @@ let # Release notes and download URLs are here: # https://registrationcenter.intel.com/en/products/ version = "${year}.${spot}.${rel}"; - year = "2019"; # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 - spot = if stdenvNoCC.isDarwin then "3" else "5"; - rel = if stdenvNoCC.isDarwin then "199" else "281"; + year = if stdenvNoCC.isDarwin then "2019" else "2020"; + spot = if stdenvNoCC.isDarwin then "3" else "0"; + rel = if stdenvNoCC.isDarwin then "199" else "166"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; # Intel openmp uses its own versioning, but shares the spot release patch. - openmp-ver = "19.0.${spot}-${rel}-19.0.${spot}-${rel}"; + openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1"; + openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}"; in stdenvNoCC.mkDerivation { pname = "mkl"; @@ -31,8 +32,8 @@ in stdenvNoCC.mkDerivation { }) else (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15816/l_mkl_${version}.tgz"; - sha256 = "0zkk4rrq7g44acxaxhpd2053r66w169mww6917an0lxhd52fm5cr"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16318/l_mkl_${version}.tgz"; + sha256 = "1q4ab87qzraksn8mm4117vj7l3sgpdi2qszj7nx122zi7zmjvngn"; }); nativeBuildInputs = if stdenvNoCC.isDarwin @@ -136,7 +137,7 @@ in stdenvNoCC.mkDerivation { choice of compilers, languages, operating systems, and linking and threading models. ''; - homepage = https://software.intel.com/en-us/mkl; + homepage = "https://software.intel.com/en-us/mkl"; license = licenses.issl; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 38ad31cc6257..efad842bd357 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -3,6 +3,14 @@ # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). , blas64 ? null +# Multi-threaded applications must not call a threaded OpenBLAS +# (the only exception is when an application uses OpenMP as its +# *only* form of multi-threading). See +# https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded +# https://github.com/xianyi/OpenBLAS/issues/2543 +# This flag builds a single-threaded OpenBLAS using the flags +# stated in thre. +, singleThreaded ? false , buildPackages # Select a specific optimization target (other than the default) # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt @@ -146,7 +154,12 @@ stdenv.mkDerivation rec { NO_BINARY_MODE = if stdenv.isx86_64 then toString (stdenv.hostPlatform != stdenv.buildPlatform) else stdenv.hostPlatform != stdenv.buildPlatform; - }); + } // (stdenv.lib.optionalAttrs singleThreaded { + # As described on https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded + USE_THREAD = false; + USE_LOCKING = true; # available with openblas >= 0.3.7 + USE_OPENMP = false; # openblas will refuse building with both USE_OPENMP=1 and USE_THREAD=0 + })); doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 492ad63f27b6..911f0a1cf898 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.12.4"; + version = "3.13.0"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1hw4f12v2xwrs37gjh83dbixhg0yxandqx7s7k5vlfx91l9l3aan"; + sha256 = "0943bydmsq3sjwj3rxhb8hx58b1fm8vymny731557fs10g5zfbyz"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlagsArray=( $configureFlagsArray "--CC=$CC" - "--with-cxx=g++" + "--with-cxx=$CXX" "--with-fc=0" "--with-mpi=0" "--with-blas-lib=[${blas}/lib/libblas.a,${gfortran.cc.lib}/lib/libgfortran.a]" diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 3fd47125bcb3..2742ba1577b3 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - nativeBuildInputs = [ pkgconfig scons ]; + nativeBuildInputs = [ pkgconfig scons.py2 ]; buildInputs = [ apr openssl aprutil zlib libiconv ] ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 6b1c4ca97ba6..564c32bf10db 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, freetype, cmake, python }: stdenv.mkDerivation rec { - version = "1.3.13"; + version = "1.3.14"; pname = "graphite2"; src = fetchurl { url = "https://github.com/silnrsi/graphite/releases/download/" + "${version}/graphite2-${version}.tgz"; - sha256 = "01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx"; + sha256 = "1790ajyhk0ax8xxamnrk176gc9gvhadzy78qia4rd8jzm89ir7gr"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index e5443c5d53a0..d7e0f8313850 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.9.1.0"; - sha256 = "19c6s3f7vxi96l2yqzjk9x9i4xkfg4fdzxhn1jg6bfb2qjph9cnk"; + version = "2.9.2.0"; + sha256 = "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4"; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix new file mode 100644 index 000000000000..1f9b77cc3c92 --- /dev/null +++ b/pkgs/development/libraries/soci/default.nix @@ -0,0 +1,31 @@ +{ cmake +, fetchFromGitHub +, sqlite +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "soci"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "SOCI"; + repo = pname; + rev = version; + sha256 = "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb"; + }; + + # Do not build static libraries + cmakeFlags = [ "-DSOCI_STATIC=OFF" ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ sqlite ]; + + meta = with stdenv.lib; { + description = "Database access library for C++"; + homepage = "http://soci.sourceforge.net/"; + license = licenses.boost; + platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 2903e79f8910..e6095ca82c53 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.2.3"; + name = "socket_wrapper-1.2.4"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1jprm8f7xb91b3yrapdbf51l36j6g038n379akz7ds0dicjh0fh7"; + sha256 = "07m0g5sxjl15h8h95ppf42mkilp9h1xc9camryg8l9bw8b2v8m4a"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 2113d7bd49b4..746054e5939c 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig python3 wafHook ]; - buildInputs = [ serd pcre ]; + buildInputs = [ pcre ]; + propagatedBuildInputs = [ serd ]; meta = with stdenv.lib; { homepage = http://drobilla.net/software/sord; diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index 9a5f4db2debb..bf3b6a9ffd13 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "subunit"; - version = "1.1.0"; + version = "1.4.0"; src = fetchurl { url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8"; + sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80"; }; nativeBuildInputs = [ pkgconfig ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A streaming protocol for test results"; - homepage = https://launchpad.net/subunit; + homepage = "https://launchpad.net/subunit"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index c8c60c1f8ea6..8d49f79814e5 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "swiften"; version = "4.0.2"; - nativeBuildInputs = [ scons]; + nativeBuildInputs = [ scons.py2 ]; buildInputs = [ python ]; propagatedBuildInputs = [ openssl boost ]; @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.twey ]; + broken = true; # Broken since 2019-11-20 (https://hydra.nixos.org/build/114681755) }; } diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 9e9bc1c804bb..f464364e8a0a 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames +{ stdenv +, fetchurl +, python +, pkg-config +, readline +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_42 +, fixDarwinDylibNames , wafHook }: @@ -12,9 +19,19 @@ stdenv.mkDerivation rec { sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g"; }; - nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook - docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ readline libxslt ]; + nativeBuildInputs = [ + pkg-config + fixDarwinDylibNames + python + wafHook + docbook-xsl-nons + docbook_xml_dtd_42 + ]; + + buildInputs = [ + readline + libxslt + ]; wafPath = "buildtools/bin/waf"; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 9e90e3d3be43..b8e6552bc7b5 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,18 +1,34 @@ -{ stdenv, fetchurl, wafHook, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42 +{ stdenv +, fetchurl +, pkg-config +, wafHook +, python3 +, readline +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "tdb-1.3.18"; + pname = "tdb"; + version = "1.4.3"; src = fetchurl { - url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "1drnsdh1w0px35r0y7l7g59yvyr67mvcsdrli4wab0mwi07b8mn1"; + url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; + sha256 = "06waz0k50c7v3chd08mzp2rv7w4k4q9isbxx3vhlfpx1vy9q61f8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ + pkg-config + wafHook + libxslt + docbook-xsl-nons + docbook_xml_dtd_45 + ]; + buildInputs = [ - readline libxslt docbook_xsl docbook_xml_dtd_42 + python3 + readline # required to build python ]; wafPath = "buildtools/bin/waf"; @@ -30,7 +46,7 @@ stdenv.mkDerivation rec { and uses locking internally to keep writers from trampling on each other. TDB is also extremely small. ''; - homepage = https://tdb.samba.org/; + homepage = "https://tdb.samba.org/"; license = licenses.lgpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 070953d0bbcf..86a4a9cd903c 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { description = "A library for template expansion which supports calling into GObject Introspection from templates"; homepage = https://gitlab.gnome.org/GNOME/template-glib; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 997b874ac5b8..b2c47166153d 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl , amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }: let - version = "4.3.1"; + version = "4.4.0"; pname = "tepl"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08y6vss29b65pqzv708cyqmbszgxsqqgw7g0vh6f1389ayi2lvs0"; + sha256 = "0mm2z849hnni7597an05mrv0dckrxjngpf2xfa0g5s17i8x6gxp6"; }; nativeBuildInputs = [ @@ -16,8 +16,11 @@ in stdenv.mkDerivation { ]; buildInputs = [ - amtk libxml2 + ]; + + propagatedBuildInputs = [ + amtk gtksourceview4 libuchardet gtk3 diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 9f94f4f7217d..66d65e639510 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -1,32 +1,51 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, talloc -, libxslt, docbook_xsl, docbook_xml_dtd_42 +{ stdenv +, fetchurl +, python3 +, pkg-config +, readline +, talloc +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_42 +, which +, wafHook }: stdenv.mkDerivation rec { - name = "tevent-0.9.37"; + pname = "tevent"; + version = "0.10.2"; src = fetchurl { - url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn"; + url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; + sha256 = "+EJ4IuWyh4+4so1vUNloSHNPPzEwYS+1dP3S0hSKZpY="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkg-config + which + python3 + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 + wafHook + ]; + buildInputs = [ - python readline talloc libxslt docbook_xsl docbook_xml_dtd_42 + python3 + readline # required to build python + talloc ]; - preConfigure = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" ]; meta = with stdenv.lib; { description = "An event system based on the talloc memory management library"; - homepage = https://tevent.samba.org/; + homepage = "https://tevent.samba.org/"; license = licenses.lgpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index a20e4383278b..3ebfd4ea919b 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "0khxd1w5piqkxjiibnfvxcpk9lb8pi5x95zll5qs7vpbznn56b18"; + sha256 = "0vpbyxi8k29c7sjpk86y5w3yyp5fn62q5xvbw061wgp7vrprf8bm"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/torch-hdf5/default.nix b/pkgs/development/libraries/torch-hdf5/default.nix deleted file mode 100644 index 6dd519441114..000000000000 --- a/pkgs/development/libraries/torch-hdf5/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchFromGitHub, torch, cmake, hdf5}: -stdenv.mkDerivation rec { - pname = "torch-hdf5"; - version = "0.0pre2016-07-01"; - buildInputs = [cmake torch hdf5]; - src = fetchFromGitHub { - owner = "deepmind"; - repo = "torch-hdf5"; - rev = "639bb4e62417ac392bf31a53cdd495d19337642b"; - sha256 = "0x1si2c30d95vmw0xqyq242wghfih3m5i43785vwahlzm7h6n6xz"; - }; - meta = { - inherit version; - description = ''HDF5 format support for Torch''; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix deleted file mode 100644 index b5cb0f76e9ff..000000000000 --- a/pkgs/development/libraries/torch/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchgit, luajit, openblas, imagemagick, cmake, curl, fftw, gnuplot - , libjpeg, zeromq3, ncurses, openssl, libpng, qt4, readline, unzip - , pkgconfig, zlib, libX11, which - }: -stdenv.mkDerivation rec{ - version = "0.0pre20160820"; - pname = "torch"; - buildInputs = [ - luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4 - libjpeg zeromq3 ncurses openssl libpng readline pkgconfig - zlib libX11 which - ]; - - src = fetchgit { - url = "https://github.com/torch/distro"; - rev = "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f"; - sha256 = "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy"; - fetchSubmodules = true; - }; - - buildPhase = '' - cd .. - export PREFIX=$out - - mkdir "$out" - sh install.sh -s - ''; - installPhase = '' - ''; - meta = { - inherit version; - description = ''A scientific computing framework with wide support for machine learning algorithms''; - license = stdenv.lib.licenses.bsd3 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index 08a2df3c02de..39a4f8c52085 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "totem-pl-parser"; - version = "3.26.4"; + version = "3.26.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w34hdr09v3wy1cfvzhcmxc6b5p9ngcabgix59iv7hk739anymy1"; + sha256 = "132jihnf51zs98yjkc6jxyqib4f3dawpjm17g4bj4j78y93dww2k"; }; passthru = { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index a9d02f0629fd..5278aeeb50ce 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kizavw9gbdjkw4wykgv0fcl2y6fj788nycx9p4byn6ylb1277h6"; + sha256 = "dHKqKNeGJiDTyiu+w7ED31R9cxnBLpWn96qfn23uSxk="; }; nativeBuildInputs = [ @@ -125,7 +125,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; @@ -133,7 +132,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index b34c03d95197..7ea690c602dd 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "2.3.2"; + version = "2.3.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nzbnvwwsk6kv6kqbxwlz8vk70l9ai6b4r9qypw51vp4qy72ny54"; + sha256 = "V3lSJEq5d8eLC4ji9jxBl+q6FuTWa/9pK39YmT4GUW0="; }; nativeBuildInputs = [ @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; @@ -60,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 91bf7e393784..13a9855b62e2 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34"; + sha256 = "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix index 073674f8571f..16b4cd563b2b 100644 --- a/pkgs/development/libraries/utmps/default.nix +++ b/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.0.3.1"; - sha256 = "1h4hgjdrai51qkalgcx2ff60drpnw0ich66z90p8wk74am0vgc0h"; + version = "0.0.3.2"; + sha256 = "0zri5pqnva48bm8za4ic5mx0ymv70y4ga16bjh4i5pscs40sj5dh"; description = "A secure utmpx and wtmp implementation"; @@ -29,4 +29,3 @@ buildPackage { mv examples $doc/share/doc/utmps/examples ''; } - diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 5c508f133e14..8951ed4b002a 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; - sha256 = "0ac39mplmy6lmcd6cljmfsrfby7m6ac3dzvmnn5pv200drl415l4"; + sha256 = "07vfzg99wq92yg2phza9jc0zvps34yy9gc8v4hibqchdl77fmspx"; }; buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; - homepage = https://virgil3d.github.io/; + homepage = "https://virgil3d.github.io/"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.xeji ]; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index d786bc271ccf..63b9189a4aec 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -18,17 +18,19 @@ , pcre2 , fribidi , zlib +, icu +, systemd }: stdenv.mkDerivation rec { pname = "vte"; - version = "0.58.3"; + version = "0.60.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12"; + sha256 = "1i7h1jvsg115l5djn29n06xsqvygpfagczxy0i9f39zq6dr809ay"; }; passthru = { @@ -51,6 +53,8 @@ stdenv.mkDerivation rec { gnutls pcre2 zlib + icu + systemd ]; propagatedBuildInputs = [ @@ -88,7 +92,7 @@ stdenv.mkDerivation rec { the system's terminfo database. ''; license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ] ++ gnome3.maintainers; + maintainers = with maintainers; [ astsmtl antono lethalman ] ++ teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index aa3d874979f2..ea339309ace8 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -50,7 +50,7 @@ , libseccomp , xdg-dbus-proxy , substituteAll -, gnome3 +, glib }: assert enableGeoLocation -> geoclue2 != null; @@ -61,13 +61,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.26.4"; + version = "2.28.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0gqi9f9njrdn8vad1zvr59b25arwc8r0n8bp25sgkbfz2c3r11j3"; + sha256 = "12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn"; }; patches = optionals stdenv.isLinux [ @@ -78,6 +78,14 @@ stdenv.mkDerivation rec { ./libglvnd-headers.patch ]; + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # Ignore gettext in cmake_prefix_path so that find_program doesn't + # pick up the wrong gettext. TODO: Find a better solution for + # this, maybe make cmake not look up executables in + # CMAKE_PREFIX_PATH. + cmakeFlags+=" -DCMAKE_IGNORE_PATH=${getBin gettext}/bin" + ''; + nativeBuildInputs = [ bison cmake @@ -89,6 +97,8 @@ stdenv.mkDerivation rec { pkgconfig python3 ruby + glib # for gdbus-codegen + wayland # for wayland-scanner ]; buildInputs = [ @@ -169,6 +179,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.linux; hydraPlatforms = []; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch b/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch index 17264f3b5886..8d7f2477b55a 100644 --- a/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch +++ b/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch @@ -1,577 +1,3 @@ -diff --git a/Source/ThirdParty/ANGLE/scripts/generate_loader.py b/Source/ThirdParty/ANGLE/scripts/generate_loader.py -index a408dac4..92ddca90 100644 ---- a/Source/ThirdParty/ANGLE/scripts/generate_loader.py -+++ b/Source/ThirdParty/ANGLE/scripts/generate_loader.py -@@ -201,6 +201,8 @@ def main(): - - libegl_preamble = """#include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> -+#include <EGL/eglmesaext.h> - """ - - util_gles_preamble = """#if defined(GL_GLES_PROTOTYPES) && GL_GLES_PROTOTYPES -@@ -215,6 +217,8 @@ util_egl_preamble = """#include "util/util_export.h" - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> -+#include <EGL/eglmesaext.h> - """ - - util_wgl_preamble = """ -diff --git a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h -index 68c65d8b..0dc9c8e3 100644 ---- a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h -+++ b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h -@@ -14,6 +14,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <angle_gl.h> - - #include <cstdint> -diff --git a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h -index cd651150..17719bc2 100644 ---- a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h -+++ b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h -@@ -14,6 +14,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <angle_gl.h> - - #include <cstdint> -diff --git a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py -index 2f77e725..5ea54f1f 100644 ---- a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py -+++ b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py -@@ -71,6 +71,7 @@ header_template = """// GENERATED FILE - DO NOT EDIT. - #include <angle_gl.h> - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <cstdint> - -diff --git a/Source/ThirdParty/ANGLE/src/common/utilities.h b/Source/ThirdParty/ANGLE/src/common/utilities.h -index 7a1429a4..dd20bcca 100644 ---- a/Source/ThirdParty/ANGLE/src/common/utilities.h -+++ b/Source/ThirdParty/ANGLE/src/common/utilities.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <math.h> - #include <string> -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp -index 4134226d..5dd1065f 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp -@@ -15,6 +15,7 @@ - #include <vector> - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include "angle_gl.h" - - #include "common/debug.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp -index 13ae4e61..b964b755 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp -@@ -12,6 +12,7 @@ - #include <iterator> - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <platform/Platform.h> - - #include "common/debug.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp -index 21064073..a46628bd 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp -@@ -17,6 +17,7 @@ - #include <vector> - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <platform/Platform.h> - - #include "common/debug.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h -index 37df5b0c..b2e3885b 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include "angle_gl.h" - #include "common/angleutils.h" - #include "common/debug.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp -index b7bc84c8..538cb3e0 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp -@@ -10,6 +10,7 @@ - #include "libANGLE/Stream.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <platform/Platform.h> - - #include "common/debug.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h -index 9157aa51..d8e58f2d 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h -@@ -14,6 +14,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "common/angleutils.h" - #include "libANGLE/AttributeMap.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp -index 6daec4f6..941f34ca 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp -@@ -11,6 +11,7 @@ - #include "libANGLE/Surface.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "libANGLE/Config.h" - #include "libANGLE/Context.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h -index ea1a0510..db7cf0c8 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "common/angleutils.h" - #include "libANGLE/Error.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp -index ba5cf532..43304da5 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp -@@ -13,6 +13,7 @@ - #include "libANGLE/Display.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace rx - { -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp -index de60dfff..93b5bdf8 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/d3d/DisplayD3D.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "libANGLE/Config.h" - #include "libANGLE/Context.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp -index a7255d0d..a7e37777 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp -@@ -20,6 +20,7 @@ - #include "libANGLE/renderer/d3d/TextureStorage.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace rx - { -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp -index 61dc8ffa..87276514 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp -@@ -19,6 +19,7 @@ - #include "libANGLE/renderer/d3d/d3d11/formatutils11.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <tchar.h> - #include <algorithm> - -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h -index 443cadd6..e64bdfc4 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h -@@ -12,6 +12,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <GLES2/gl2.h> - - #include "common/angleutils.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp -index 33dfa6b0..eb3393d2 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/d3d/d3d11/Renderer11.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <versionhelpers.h> - #include <sstream> - -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp -index fe4def6e..2550b52c 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/d3d/d3d11/SwapChain11.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "libANGLE/features.h" - #include "libANGLE/renderer/d3d/DisplayD3D.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp -index f4a4ce43..0cad5540 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/d3d/d3d9/Renderer9.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <sstream> - - #include "common/utilities.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp -index a89e1365..0fe4fa98 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp -@@ -18,6 +18,7 @@ - #include "libANGLE/renderer/gl/SurfaceGL.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace rx - { -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp -index 10b15594..7ae1ac6b 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/gl/RendererGL.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "common/debug.h" - #include "libANGLE/AttributeMap.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h -index 115a7afb..abb200e6 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <string> - #include <vector> -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp -index 47ed6ce0..9d11560c 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp -@@ -14,6 +14,7 @@ - #include <unistd.h> - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <drm_fourcc.h> - #include <gbm.h> -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp -index 23b4a5c5..daeb5789 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/gl/glx/DisplayGLX.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <algorithm> - #include <cstring> - #include <fstream> -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp -index 698b51e2..32e6126f 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp -@@ -27,6 +27,7 @@ - #include "libANGLE/renderer/gl/formatutilsgl.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <algorithm> - #include <sstream> - -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp -index 5b686321..16ae890f 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp -@@ -18,6 +18,7 @@ - #include "libANGLE/renderer/gl/wgl/FunctionsWGL.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace rx - { -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp -index 12679ba7..93503812 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp -@@ -28,6 +28,7 @@ - #include "platform/Platform.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <sstream> - #include <string> - -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp -index df900f4d..4385be88 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp -@@ -13,6 +13,7 @@ - #include "libANGLE/renderer/vulkan/vk_utils.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "common/debug.h" - #include "common/platform.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp -index 1c0b25f4..64e96f73 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp -@@ -22,6 +22,7 @@ - #include "libANGLE/formatutils.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace egl - { -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h -index a671bb0d..248f0ae8 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h -@@ -15,6 +15,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace gl - { -diff --git a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h -index ae4a427c..a802b65d 100644 ---- a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h -+++ b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h -@@ -13,6 +13,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - extern PFNEGLCHOOSECONFIGPROC EGL_ChooseConfig; - extern PFNEGLCOPYBUFFERSPROC EGL_CopyBuffers; -diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h -index 3c64b290..96201b31 100644 ---- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h -+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <export.h> - - extern "C" { -diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp -index 777b09e1..dbb0bd2f 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp -+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp -@@ -24,6 +24,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "deClock.h" - #include "deMemory.h" -diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp -index 6b4a25bf..1c4ac864 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp -+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp -@@ -22,6 +22,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "egluGLContextFactory.hpp" - #include "tcuANGLENativeDisplayFactory.h" -diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp -index 90abb931..aea4e153 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp -+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp -@@ -10,6 +10,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <X11/Xlib.h> - - #include "test_utils/ANGLETest.h" -diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h -index e888a239..71606b8c 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h -+++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <string> - -diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp -index 7fdddcc6..e40b8905 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp -+++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp -@@ -10,6 +10,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <map> - #include <string> -diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h -index 7bc7a027..ebb2827b 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h -+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h -@@ -16,6 +16,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "GLSLANG/ShaderLang.h" - #include "angle_test_instantiate.h" -diff --git a/Source/ThirdParty/ANGLE/util/OSPixmap.h b/Source/ThirdParty/ANGLE/util/OSPixmap.h -index ba6ccf4a..563d2578 100644 ---- a/Source/ThirdParty/ANGLE/util/OSPixmap.h -+++ b/Source/ThirdParty/ANGLE/util/OSPixmap.h -@@ -13,6 +13,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "util/Event.h" - #include "util/util_export.h" -diff --git a/Source/ThirdParty/ANGLE/util/OSWindow.h b/Source/ThirdParty/ANGLE/util/OSWindow.h -index 3cdb458c..3178fa44 100644 ---- a/Source/ThirdParty/ANGLE/util/OSWindow.h -+++ b/Source/ThirdParty/ANGLE/util/OSWindow.h -@@ -15,6 +15,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "util/Event.h" - #include "util/util_export.h" -diff --git a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h -index 5fbec82f..77a30330 100644 ---- a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h -+++ b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h -@@ -15,6 +15,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - ANGLE_UTIL_EXPORT extern PFNEGLCHOOSECONFIGPROC eglChooseConfig; - ANGLE_UTIL_EXPORT extern PFNEGLCOPYBUFFERSPROC eglCopyBuffers; -diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp -index a8a82d70..050893a9 100644 ---- a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp -+++ b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp -@@ -29,6 +29,7 @@ - #else - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #endif - - #if USE(CAIRO) -diff --git a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp -index 05f92c22..636df34a 100644 ---- a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp -+++ b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp -@@ -35,6 +35,7 @@ - #include <wayland-egl.h> - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <wtf/Assertions.h> - - namespace WebCore { -diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -index 8c81119b..bf9ed4bd 100644 ---- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -@@ -38,6 +38,7 @@ - #if USE(EGL) - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #endif - - namespace WebCore { -diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp -index 973b3168..5586236a 100644 ---- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp -+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp -@@ -35,6 +35,7 @@ - #include <gdk/gdkwayland.h> - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <WebCore/CairoUtilities.h> - #include <WebCore/GLContext.h> - diff --git a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp b/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp index 8d848ce4..46d42c11 100644 --- a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 1049ce3201a4..02c039b8eaba 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -6,7 +6,7 @@ , pkgconfig , libxml2 , glib -, pipewire +, pipewire_0_2 , fontconfig , flatpak , gsettings-desktop-schemas @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - pipewire + pipewire_0_2 fontconfig flatpak acl diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index ee07133b7aa0..b7787650e7cc 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.5"; + version = "1.1.6"; outputs = [ "out" "lib" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "zchunk"; repo = pname; rev = version; - sha256 = "13sqjslk634mkklnmzdlzk9l9rc6g6migig5rln3irdnjrxvjf69"; + sha256 = "1j05f26xppwbkxrm11895blm75i1a6p9q23x7wlkqw198mpnpbbv"; }; nativeBuildInputs = [ diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 33946b7213aa..edc09421baf7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1326,11 +1326,11 @@ luuid = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.34.1-1"; + version = "1.30.0-0"; src = fetchurl { - url = https://luarocks.org/luv-1.34.1-1.src.rock; - sha256 = "044cyp25xn35nj5qp1hx04lfkzrpa6adhqjshq2g7wvbga77p1q0"; + url = https://luarocks.org/luv-1.30.0-0.src.rock; + sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index fb548bf3f9f2..f98547011bde 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -1,10 +1,10 @@ {requireFile, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: { toolsVersion ? "25.2.5" -, platformToolsVersion ? "28.0.1" +, platformToolsVersion ? "29.0.6" , buildToolsVersions ? [ "28.0.3" ] , includeEmulator ? false -, emulatorVersion ? "28.0.14" +, emulatorVersion ? "30.0.3" , platformVersions ? [] , includeSources ? false , includeDocs ? false diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index fa9a56fadbad..6273d75cc380 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -8,6 +8,7 @@ let sdkArgs = { + toolsVersion = "26.1.1"; platformVersions = [ platformVersion ]; includeEmulator = true; includeSystemImages = true; @@ -67,12 +68,12 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" # Create a virtual android device for testing if it does not exists - ${sdk}/libexec/android-sdk/tools/android list targets + ${sdk}/libexec/android-sdk/tools/bin/avdmanager list target if [ "$(${sdk}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] then # Create a virtual android device - yes "" | ${sdk}/libexec/android-sdk/tools/android create avd -n device -t 1 --abi ${systemImageType}/${abiVersion} $NIX_ANDROID_AVD_FLAGS + yes "" | ${sdk}/libexec/android-sdk/tools/bin/avdmanager create avd -n device -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" $NIX_ANDROID_AVD_FLAGS ${lib.optionalString enableGPU '' # Enable GPU acceleration diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 7ba74eb900fe..2402d5433ed2 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -1,13 +1,39 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}: +{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686 }: deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libXfixes pkgs.xlibs.libxcb pkgs.libGL pkgs.libpulseaudio pkgs.zlib pkgs.ncurses5 pkgs.stdenv.cc.cc pkgs_i686.glibc ]; + ++ lib.optional (os == "linux") [ + pkgs.glibc + pkgs.xlibs.libX11 + pkgs.xlibs.libXext + pkgs.xlibs.libXdamage + pkgs.xlibs.libXfixes + pkgs.xlibs.libxcb + pkgs.xlibs.libXcomposite + pkgs.xlibs.libXcursor + pkgs.xlibs.libXi + pkgs.xlibs.libXrender + pkgs.xlibs.libXtst + pkgs.libcxx + pkgs.libGL + pkgs.libpulseaudio + pkgs.zlib + pkgs.ncurses5 + pkgs.stdenv.cc.cc + pkgs_i686.glibc + pkgs.expat + pkgs.freetype + pkgs.nss + pkgs.nspr + pkgs.alsaLib + ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib addAutoPatchelfSearchPath $packageBaseDir/lib64 addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib + # autoPatchelf is not detecting libuuid :( + addAutoPatchelfSearchPath ${pkgs.libuuid.out}/lib autoPatchelf $out # Wrap emulator so that it can load libdbus-1.so at runtime and it no longer complains about XKB keymaps diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/pkgs/development/mobile/androidenv/generated/addons.nix index d902b1116658..a1807b990540 100644 --- a/pkgs/development/mobile/androidenv/generated/addons.nix +++ b/pkgs/development/mobile/androidenv/generated/addons.nix @@ -423,6 +423,17 @@ }; + "extras;google;Android_Emulator_Hypervisor_Driver" = { + name = "extras-google-Android_Emulator_Hypervisor_Driver"; + path = "extras/google/Android_Emulator_Hypervisor_Driver"; + revision = "1.4.0"; + displayName = "Android Emulator Hypervisor Driver for AMD Processors (installer)"; + archives = { + + }; + }; + + "extras;google;admob_ads_sdk" = { name = "extras-google-admob_ads_sdk"; path = "extras/google/admob_ads_sdk"; @@ -525,13 +536,13 @@ "extras;google;instantapps" = { name = "extras-google-instantapps"; path = "extras/google/instantapps"; - revision = "1.5.0"; + revision = "1.9.0"; displayName = "Google Play Instant Development SDK"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip; - sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4"; + url = https://dl.google.com/android/repository/iasdk-1.9.0-1566514721.zip; + sha1 = "c498367dcd7db30154b3e70c4ddbb1b0ea4b8d20"; }; }; @@ -605,7 +616,7 @@ "extras;google;usb_driver" = { name = "extras-google-usb_driver"; path = "extras/google/usb_driver"; - revision = "11"; + revision = "12"; displayName = "Google USB Driver"; archives = { @@ -645,38 +656,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha2" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha2"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha2"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha2"; - archives = { - - all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha2.zip; - sha1 = "2e7fd5d8d158f4517ba52af824f84466ffede879"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha3" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha3"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha3"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha3"; - archives = { - - all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha3.zip; - sha1 = "cd1cbbb2621c9034b835e9b69243dc558cdee4dc"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; @@ -693,48 +672,48 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha5" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha5"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha5"; + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha5"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha5.zip; - sha1 = "7ba6c82c7645ac023cf45c1e27a6ae3added308a"; + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip; + sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; }; }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha6" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha6"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha6"; + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha6"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha6.zip; - sha1 = "b7e390f940704f4f78e1eaa5f5a5dba3bc3e81ad"; + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip; + sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; }; }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha7" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha7"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha7"; + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha7"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha7.zip; - sha1 = "f08be3c306bf878de31c465e46a266c52014a13f"; + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip; + sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; }; @@ -757,16 +736,16 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha9" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha9"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha9"; + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha9"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha8"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha9.zip; - sha1 = "2c52ddd883d83230a17042b8f4ba03669f0f5f40"; + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip; + sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; }; }; @@ -901,38 +880,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha2" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha2"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha2"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha2"; - archives = { - - all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha2.zip; - sha1 = "2edb4fc33745cc9d69d985f29fd48fefcd0aa9f0"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha3" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha3"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha3"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha3"; - archives = { - - all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha3.zip; - sha1 = "1a26fb79d98421f315ead7ad15be167727533026"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; @@ -949,48 +896,48 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha5" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha5"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha5"; + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha5"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha5.zip; - sha1 = "24f78daf491dcad74bcb2acfa79ea2d8e906f53b"; + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip; + sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; }; }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha6" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha6"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha6"; + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha6"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha6.zip; - sha1 = "cb60e9ad4f6d3cc3c5b1b98cd3610c8d3204e651"; + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip; + sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; }; }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha7" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha7"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha7"; + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha7"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha7.zip; - sha1 = "17ac210c85d24d7e8ace62847f05e4e45b640b73"; + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip; + sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; }; @@ -1013,16 +960,16 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha9" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha9"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha9"; + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha9"; + displayName = "ConstraintLayout for Android 1.0.0-alpha8"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha9.zip; - sha1 = "89c2bbc005d4731c7a830a4d5aa98dae121a46a4"; + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip; + sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; }; }; diff --git a/pkgs/development/mobile/androidenv/generated/packages.nix b/pkgs/development/mobile/androidenv/generated/packages.nix index fc9f50e13164..a63a18c4b51f 100644 --- a/pkgs/development/mobile/androidenv/generated/packages.nix +++ b/pkgs/development/mobile/androidenv/generated/packages.nix @@ -877,6 +877,158 @@ }; }; + "build-tools"."29.0.0" = { + + name = "build-tools"; + path = "build-tools/29.0.0"; + revision = "29.0.0"; + displayName = "Android SDK Build-Tools 29"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29-linux.zip; + sha1 = "ad314caf1802209c4b00a5f3517af5ceb0d48eae"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29-macosx.zip; + sha1 = "35dc6bc7a53bd9d206847e72f02cab21cfdaa869"; + }; + + }; + }; + + "build-tools"."29.0.0-rc1" = { + + name = "build-tools"; + path = "build-tools/29.0.0-rc1"; + revision = "29.0.0-rc1"; + displayName = "Android SDK Build-Tools 29-rc1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29-rc1-linux.zip; + sha1 = "1c897f5885ac5468613e40e1ea598c21c05d345d"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29-rc1-macosx.zip; + sha1 = "f066c0d9ea2f0d8a0a9cc7b2ca0a467a570ab034"; + }; + + }; + }; + + "build-tools"."29.0.0-rc2" = { + + name = "build-tools"; + path = "build-tools/29.0.0-rc2"; + revision = "29.0.0-rc2"; + displayName = "Android SDK Build-Tools 29-rc2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29-rc2-linux.zip; + sha1 = "b4b41d429c35b42db07b6c65d4aa998ba8c4093c"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29-rc2-macosx.zip; + sha1 = "7a960367999169ccac5dbc60817e5f1725c4c738"; + }; + + }; + }; + + "build-tools"."29.0.0-rc3" = { + + name = "build-tools"; + path = "build-tools/29.0.0-rc3"; + revision = "29.0.0-rc3"; + displayName = "Android SDK Build-Tools 29-rc3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29-rc3-linux.zip; + sha1 = "8b7177f198e8b92da8f9537aaf859f6edf222b01"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29-rc3-macosx.zip; + sha1 = "643e8d76625f6e2cfcd5494e50bae5e14725ec0c"; + }; + + }; + }; + + "build-tools"."29.0.1" = { + + name = "build-tools"; + path = "build-tools/29.0.1"; + revision = "29.0.1"; + displayName = "Android SDK Build-Tools 29.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29.0.1-linux.zip; + sha1 = "fc209e5d91ab2daeac24345a5cb17261940547e4"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29.0.1-macosx.zip; + sha1 = "46ae9b1d1e2a67241d7da9c2cd8eae42f24cc6cd"; + }; + + }; + }; + + "build-tools"."29.0.2" = { + + name = "build-tools"; + path = "build-tools/29.0.2"; + revision = "29.0.2"; + displayName = "Android SDK Build-Tools 29.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29.0.2-linux.zip; + sha1 = "c0fc7e5c37ac96bfd0c611802e8ab36d0e71b398"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29.0.2-macosx.zip; + sha1 = "f781d9e03d5c2debcf51fed3792ee7a9d066723f"; + }; + + }; + }; + + "build-tools"."29.0.3" = { + + name = "build-tools"; + path = "build-tools/29.0.3"; + revision = "29.0.3"; + displayName = "Android SDK Build-Tools 29.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip; + sha1 = "64efff52165cda5e31848acafa46a05e3f3b4651"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r29.0.3-macosx.zip; + sha1 = "76520eb7712fb0bb4c023b55c6f65588ee268289"; + }; + + }; + }; + + "build-tools"."30.0.0-rc1" = { + + name = "build-tools"; + path = "build-tools/30.0.0-rc1"; + revision = "30.0.0-rc1"; + displayName = "Android SDK Build-Tools 30-rc1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r30-rc1-linux.zip; + sha1 = "afcb370bb6956bbf9e90557230088a3e1417e8a8"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r30-rc1-macosx.zip; + sha1 = "2761a0ea9466685aaaf93e85bf8bd47575bc91b8"; + }; + + }; + }; + "cmake"."3.10.2" = { name = "cmake"; @@ -915,6 +1067,25 @@ }; }; + "cmdline-tools"."1.0" = { + + name = "cmdline-tools"; + path = "cmdline-tools/1.0"; + revision = "1.0"; + displayName = "Android SDK Command-line Tools"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip; + sha1 = "6ffc5bd72db2c755f9b374ed829202262a6d8aaf"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip; + sha1 = "23f803c07e392bb769507c88b23c2c7868cc7a6f"; + }; + + }; + }; + "docs"."1" = { name = "docs"; @@ -931,88 +1102,66 @@ }; }; - "emulator"."27.3.10".linux = { - - name = "emulator"; - path = "emulator"; - revision = "27.3.10"; - displayName = "Android Emulator"; - archives = { - linux = fetchurl { - url = https://dl.google.com/android/repository/emulator-linux-4969155.zip; - sha1 = "5b037b25bc6567fda3071457f0009c057670d9e8"; - }; - - }; - }; - - "emulator"."27.3.10".macosx = { + "emulator"."30.0.0".macosx = { name = "emulator"; path = "emulator"; - revision = "27.3.10"; + revision = "30.0.0"; displayName = "Android Emulator"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/emulator-darwin-4969155.zip; - sha1 = "28d2b51ee5c84bc544deee433419f33dc9e05b66"; + url = https://dl.google.com/android/repository/emulator-darwin-6203977.zip; + sha1 = "3bb965869577be4e62dec053de34c279f5024a12"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/emulator-linux-6203977.zip; + sha1 = "356cac370c03460ca82166464de7ecd7da1f4a49"; }; }; }; - "emulator"."27.3.10".windows = { + "emulator"."28.0.25".windows = { name = "emulator"; path = "emulator"; - revision = "27.3.10"; + revision = "28.0.25"; displayName = "Android Emulator"; archives = { }; }; - "emulator"."28.0.14".linux = { + "emulator"."30.0.3".linux = { name = "emulator"; path = "emulator"; - revision = "28.0.14"; + revision = "30.0.3"; displayName = "Android Emulator"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/emulator-linux-5092175.zip; - sha1 = "062ef9a1f6759481de897d6c5602d9d66e958a0b"; + url = https://dl.google.com/android/repository/emulator-linux-6258612.zip; + sha1 = "a891e1532443a55c3ce9986b484effdabd842f8e"; }; }; }; - "emulator"."28.0.14".macosx = { + "emulator"."30.0.2".macosx = { name = "emulator"; path = "emulator"; - revision = "28.0.14"; + revision = "30.0.2"; displayName = "Android Emulator"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/emulator-darwin-5092175.zip; - sha1 = "6dc13599bddd5c2acdb559b25201c92a801d157c"; + url = https://dl.google.com/android/repository/emulator-darwin-6237347.zip; + sha1 = "702b6a050a230b3b45f667867f6fc99b3f973d9a"; }; }; }; - "emulator"."28.0.14".windows = { - - name = "emulator"; - path = "emulator"; - revision = "28.0.14"; - displayName = "Android Emulator"; - archives = { - - }; - }; - "lldb"."2.0.2558144" = { name = "lldb"; @@ -1127,6 +1276,177 @@ }; }; + "ndk-bundle"."21.1.6210238-rc1" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "21.1.6210238-rc1"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip; + sha1 = "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip; + sha1 = "cf06ed408663c11c8f4824f9370c7a900ec074dd"; + }; + + }; + }; + + "ndk-bundle"."21.0.6113669" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "21.0.6113669"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip; + sha1 = "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip; + sha1 = "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c"; + }; + + }; + }; + + "ndk-bundle"."21.0.6011959-rc2" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "21.0.6011959-rc2"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip; + sha1 = "34a46c3867c9d87a80895c0b8a098256052536d2"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip; + sha1 = "335f30302bee700a9a5fdfe3ae533a4963499c44"; + }; + + }; + }; + + "ndk-bundle"."20.1.5948944" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "20.1.5948944"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip; + sha1 = "b51290ab69cb89de1f0ba108702277bc333b38be"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip; + sha1 = "d903fdf077039ad9331fb6c3bee78aa46d45527b"; + }; + + }; + }; + + "ndk-bundle"."20.0.5594570" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "20.0.5594570"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip; + sha1 = "96d5f1c50452596912d1982439c514194b5751e6"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip; + sha1 = "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"; + }; + + }; + }; + + "ndk-bundle"."20.0.5471264-rc3" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "20.0.5471264-rc3"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip; + sha1 = "665a035cadb0dd03e6502ba25c18643f6e4ede24"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip; + sha1 = "674d8fb0e0df8e8be1c31fa321eb176548a19ba3"; + }; + + }; + }; + + "ndk-bundle"."20.0.5392854-rc2" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "20.0.5392854-rc2"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip; + sha1 = "cd94191ace6b31ec9af1cc370173e16934e1cb8b"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip; + sha1 = "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02"; + }; + + }; + }; + + "ndk-bundle"."19.2.5345600" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "19.2.5345600"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip; + sha1 = "f46b8193109bba8a58e0461c1a48f4534051fb25"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip; + sha1 = "fd94d0be6017c6acbd193eb95e09cf4b6f61b834"; + }; + + }; + }; + + "ndk-bundle"."19.0.5232133" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "19.0.5232133"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip; + sha1 = "86c1a962601b23b8a6d3d535c93b4b0bc4f29249"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip; + sha1 = "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac"; + }; + + }; + }; + "ndk-bundle"."18.1.5063045" = { name = "ndk-bundle"; @@ -1146,6 +1466,272 @@ }; }; + "ndk-bundle"."17.2.4988734" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "17.2.4988734"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip; + sha1 = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip; + sha1 = "12cacc70c3fd2f40574015631c00f41fb8a39048"; + }; + + }; + }; + + "ndk-bundle"."16.1.4479499" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "16.1.4479499"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip; + sha1 = "e51e615449b98c716cf912057e2682e75d55e2de"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip; + sha1 = "42aa43aae89a50d1c66c3f9fdecd676936da6128"; + }; + + }; + }; + + "ndk"."16.1.4479499" = { + + name = "ndk"; + path = "ndk/16.1.4479499"; + revision = "16.1.4479499"; + displayName = "NDK (Side by side) 16.1.4479499"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip; + sha1 = "e51e615449b98c716cf912057e2682e75d55e2de"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip; + sha1 = "42aa43aae89a50d1c66c3f9fdecd676936da6128"; + }; + + }; + }; + + "ndk"."17.2.4988734" = { + + name = "ndk"; + path = "ndk/17.2.4988734"; + revision = "17.2.4988734"; + displayName = "NDK (Side by side) 17.2.4988734"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip; + sha1 = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip; + sha1 = "12cacc70c3fd2f40574015631c00f41fb8a39048"; + }; + + }; + }; + + "ndk"."18.1.5063045" = { + + name = "ndk"; + path = "ndk/18.1.5063045"; + revision = "18.1.5063045"; + displayName = "NDK (Side by side) 18.1.5063045"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip; + sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip; + sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; + }; + + }; + }; + + "ndk"."19.0.5232133" = { + + name = "ndk"; + path = "ndk/19.0.5232133"; + revision = "19.0.5232133"; + displayName = "NDK (Side by side) 19.0.5232133"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip; + sha1 = "86c1a962601b23b8a6d3d535c93b4b0bc4f29249"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip; + sha1 = "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac"; + }; + + }; + }; + + "ndk"."19.2.5345600" = { + + name = "ndk"; + path = "ndk/19.2.5345600"; + revision = "19.2.5345600"; + displayName = "NDK (Side by side) 19.2.5345600"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip; + sha1 = "f46b8193109bba8a58e0461c1a48f4534051fb25"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip; + sha1 = "fd94d0be6017c6acbd193eb95e09cf4b6f61b834"; + }; + + }; + }; + + "ndk"."20.0.5392854-rc2" = { + + name = "ndk"; + path = "ndk/20.0.5392854"; + revision = "20.0.5392854-rc2"; + displayName = "NDK (Side by side) 20.0.5392854"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip; + sha1 = "cd94191ace6b31ec9af1cc370173e16934e1cb8b"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip; + sha1 = "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02"; + }; + + }; + }; + + "ndk"."20.0.5471264-rc3" = { + + name = "ndk"; + path = "ndk/20.0.5471264"; + revision = "20.0.5471264-rc3"; + displayName = "NDK (Side by side) 20.0.5471264"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip; + sha1 = "665a035cadb0dd03e6502ba25c18643f6e4ede24"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip; + sha1 = "674d8fb0e0df8e8be1c31fa321eb176548a19ba3"; + }; + + }; + }; + + "ndk"."20.0.5594570" = { + + name = "ndk"; + path = "ndk/20.0.5594570"; + revision = "20.0.5594570"; + displayName = "NDK (Side by side) 20.0.5594570"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip; + sha1 = "96d5f1c50452596912d1982439c514194b5751e6"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip; + sha1 = "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"; + }; + + }; + }; + + "ndk"."20.1.5948944" = { + + name = "ndk"; + path = "ndk/20.1.5948944"; + revision = "20.1.5948944"; + displayName = "NDK (Side by side) 20.1.5948944"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip; + sha1 = "b51290ab69cb89de1f0ba108702277bc333b38be"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip; + sha1 = "d903fdf077039ad9331fb6c3bee78aa46d45527b"; + }; + + }; + }; + + "ndk"."21.0.6011959-rc2" = { + + name = "ndk"; + path = "ndk/21.0.6011959"; + revision = "21.0.6011959-rc2"; + displayName = "NDK (Side by side) 21.0.6011959"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip; + sha1 = "34a46c3867c9d87a80895c0b8a098256052536d2"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip; + sha1 = "335f30302bee700a9a5fdfe3ae533a4963499c44"; + }; + + }; + }; + + "ndk"."21.0.6113669" = { + + name = "ndk"; + path = "ndk/21.0.6113669"; + revision = "21.0.6113669"; + displayName = "NDK (Side by side) 21.0.6113669"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip; + sha1 = "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip; + sha1 = "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c"; + }; + + }; + }; + + "ndk"."21.1.6210238-rc1" = { + + name = "ndk"; + path = "ndk/21.1.6210238"; + revision = "21.1.6210238-rc1"; + displayName = "NDK (Side by side) 21.1.6210238"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip; + sha1 = "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip; + sha1 = "cf06ed408663c11c8f4824f9370c7a900ec074dd"; + }; + + }; + }; + "patcher"."1" = { name = "patcher"; @@ -1155,27 +1741,27 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip.bak; + url = https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip; sha1 = "046699c5e2716ae11d77e0bad814f7f33fab261e"; }; }; }; - "platform-tools"."28.0.1" = { + "platform-tools"."29.0.6" = { name = "platform-tools"; path = "platform-tools"; - revision = "28.0.1"; + revision = "29.0.6"; displayName = "Android SDK Platform-Tools"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/platform-tools_r28.0.1-darwin.zip; - sha1 = "ed1edad4a48c27655ce98d0a5821e7296e9de145"; + url = https://dl.google.com/android/repository/platform-tools_r29.0.6-darwin.zip; + sha1 = "3232179dce22d8a6332018729026ed39f5d5cd0b"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/platform-tools_r28.0.1-linux.zip; - sha1 = "74ff83bc203f01c4f04bd9316ab5a2573f023fd1"; + url = https://dl.google.com/android/repository/platform-tools_r29.0.6-linux.zip; + sha1 = "e95ed28330406705d47fe96bafb589be6c1f2f23"; }; }; @@ -1513,14 +2099,13 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-29_r03.zip; - sha1 = "670e2e104333dae90e16ea3b615f0b63da5883ae"; + url = https://dl.google.com/android/repository/platform-29_r04.zip; + sha1 = "8d644c39902038e0bd529165d5ba4f5a8607daea"; }; }; }; - - + "platforms"."3" = { name = "platforms"; @@ -1645,6 +2230,41 @@ }; }; + "platforms"."R" = { + + name = "platforms"; + path = "platforms/android-R"; + revision = "R"; + displayName = "Android SDK Platform R"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-R_r01.zip; + sha1 = "f6ce3ef0ec8526550fc3b517bdb29051275bcd1a"; + }; + + }; + }; + + "skiaparser"."1-rc02" = { + + name = "skiaparser"; + path = "skiaparser/1"; + revision = "1-rc02"; + displayName = "Skia Parser Server"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/skiaparser-6172737-linux.zip; + sha1 = "d2eac6deff2c257d47853251bda5528c96a41720"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/skiaparser-6172737-mac.zip; + sha1 = "1e3b8da7a4f5e9887479b4e4186db3cb22422c82"; + }; + + }; + }; + "sources"."14" = { name = "sources"; @@ -1885,6 +2505,22 @@ }; }; + "sources"."29" = { + + name = "sources"; + path = "sources/android-29"; + revision = "29"; + displayName = "Sources for Android 29"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-29_r01.zip; + sha1 = "d0ad249e152b3a8fe3cb7c4a329453a048be29e4"; + }; + + }; + }; + "tools"."25.2.5" = { name = "tools"; diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix index 1aa49545254d..d700a546a246 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix @@ -1,157 +1,114 @@ - {fetchurl}: { - - - "21".android-tv."x86" = { - name = "system-image-21-android-tv-x86"; - path = "system-images/android-21/android-tv/x86"; - revision = "21-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip; - sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8"; - - }; + "21".android-tv."x86" = { + name = "system-image-21-android-tv-x86"; + path = "system-images/android-21/android-tv/x86"; + revision = "21-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip; + sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8"; + }; }; - - - "21".android-tv."armeabi-v7a" = { - name = "system-image-21-android-tv-armeabi-v7a"; - path = "system-images/android-21/android-tv/armeabi-v7a"; - revision = "21-android-tv-armeabi-v7a"; - displayName = "Android TV ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip; - sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331"; - - }; + "21".android-tv."armeabi-v7a" = { + name = "system-image-21-android-tv-armeabi-v7a"; + path = "system-images/android-21/android-tv/armeabi-v7a"; + revision = "21-android-tv-armeabi-v7a"; + displayName = "Android TV ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip; + sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331"; + }; }; - - - "22".android-tv."x86" = { - name = "system-image-22-android-tv-x86"; - path = "system-images/android-22/android-tv/x86"; - revision = "22-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip; - sha1 = "c78efd5a155622eb490be9d326f5783993375c35"; - - }; + "22".android-tv."x86" = { + name = "system-image-22-android-tv-x86"; + path = "system-images/android-22/android-tv/x86"; + revision = "22-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip; + sha1 = "c78efd5a155622eb490be9d326f5783993375c35"; + }; }; - - - "23".android-tv."x86" = { - name = "system-image-23-android-tv-x86"; - path = "system-images/android-23/android-tv/x86"; - revision = "23-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r17.zip; - sha1 = "6d42eb8f07e1c49c000e530fdb7de894144ea19b"; - - }; + "23".android-tv."x86" = { + name = "system-image-23-android-tv-x86"; + path = "system-images/android-23/android-tv/x86"; + revision = "23-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r19.zip; + sha1 = "47e8d6b08a337a0672f0f105bf907d39ed9457ec"; + }; }; - - - "23".android-tv."armeabi-v7a" = { - name = "system-image-23-android-tv-armeabi-v7a"; - path = "system-images/android-23/android-tv/armeabi-v7a"; - revision = "23-android-tv-armeabi-v7a"; - displayName = "Android TV ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip; - sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52"; - - }; + "23".android-tv."armeabi-v7a" = { + name = "system-image-23-android-tv-armeabi-v7a"; + path = "system-images/android-23/android-tv/armeabi-v7a"; + revision = "23-android-tv-armeabi-v7a"; + displayName = "Android TV ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip; + sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52"; + }; }; - - - "24".android-tv."x86" = { - name = "system-image-24-android-tv-x86"; - path = "system-images/android-24/android-tv/x86"; - revision = "24-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r19.zip; - sha1 = "478e7073f9fcd588bcce89946aa632fbf302ac6a"; - - }; + "24".android-tv."x86" = { + name = "system-image-24-android-tv-x86"; + path = "system-images/android-24/android-tv/x86"; + revision = "24-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r20.zip; + sha1 = "0b8cd98dec9ebd04376ce4f6e270193ceae8acea"; + }; }; - - - "25".android-tv."x86" = { - name = "system-image-25-android-tv-x86"; - path = "system-images/android-25/android-tv/x86"; - revision = "25-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r13.zip; - sha1 = "fda1743a87331b43b1ff35cd70f3276ae0b1836d"; - - }; + "25".android-tv."x86" = { + name = "system-image-25-android-tv-x86"; + path = "system-images/android-25/android-tv/x86"; + revision = "25-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r14.zip; + sha1 = "1c88f11683375c059803c3a7be8e880cc23a6f9a"; + }; }; - - - "26".android-tv."x86" = { - name = "system-image-26-android-tv-x86"; - path = "system-images/android-26/android-tv/x86"; - revision = "26-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r11.zip; - sha1 = "5c4b0b3c0b9d04a3364956a7ba31d30c33ea57e7"; - - }; + "26".android-tv."x86" = { + name = "system-image-26-android-tv-x86"; + path = "system-images/android-26/android-tv/x86"; + revision = "26-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r12.zip; + sha1 = "d8b12e543925a0454403d2a854996a76410ec374"; + }; }; - - - "27".android-tv."x86" = { - name = "system-image-27-android-tv-x86"; - path = "system-images/android-27/android-tv/x86"; - revision = "27-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r06.zip; - sha1 = "6b69f1e95a3db3d973e19a95ab5da1adc7750d54"; - - }; + "27".android-tv."x86" = { + name = "system-image-27-android-tv-x86"; + path = "system-images/android-27/android-tv/x86"; + revision = "27-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r07.zip; + sha1 = "5ed40e568c0d8d023c5b6c76634b22a477ed54aa"; + }; }; - - - "28".android-tv."x86" = { - name = "system-image-28-android-tv-x86"; - path = "system-images/android-28/android-tv/x86"; - revision = "28-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r07.zip; - sha1 = "3ed7e51036957cf350db7fa128cb485b61cbd061"; - - }; + "28".android-tv."x86" = { + name = "system-image-28-android-tv-x86"; + path = "system-images/android-28/android-tv/x86"; + revision = "28-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r08.zip; + sha1 = "f5f8f296dfaca7945434992761c8d47d50257c21"; + }; + }; + "Q".android-tv."x86" = { + name = "system-image-Q-android-tv-x86"; + path = "system-images/android-Q/android-tv/x86"; + revision = "Q-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-tv/x86-Q_r01.zip; + sha1 = "80c66ddce0dbe53fe6fedcade230d518112fffb1"; + }; }; - -} - \ No newline at end of file +} \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix index 372a751f41cb..52fcc24bf88e 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix @@ -1,67 +1,44 @@ - {fetchurl}: { - - - "25".android-wear."armeabi-v7a" = { - name = "system-image-25-android-wear-armeabi-v7a"; - path = "system-images/android-25/android-wear-cn/armeabi-v7a"; - revision = "25-android-wear-armeabi-v7a"; - displayName = "China version of Android Wear ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip; - sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41"; - - }; + "25".android-wear."armeabi-v7a" = { + name = "system-image-25-android-wear-armeabi-v7a"; + path = "system-images/android-25/android-wear-cn/armeabi-v7a"; + revision = "25-android-wear-armeabi-v7a"; + displayName = "China version of Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip; + sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41"; + }; }; - - - "25".android-wear."x86" = { - name = "system-image-25-android-wear-x86"; - path = "system-images/android-25/android-wear-cn/x86"; - revision = "25-android-wear-x86"; - displayName = "China version of Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip; - sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d"; - - }; + "25".android-wear."x86" = { + name = "system-image-25-android-wear-x86"; + path = "system-images/android-25/android-wear-cn/x86"; + revision = "25-android-wear-x86"; + displayName = "China version of Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip; + sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d"; + }; }; - - - "26".android-wear."x86" = { - name = "system-image-26-android-wear-x86"; - path = "system-images/android-26/android-wear-cn/x86"; - revision = "26-android-wear-x86"; - displayName = "China version of Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip; - sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096"; - - }; + "26".android-wear."x86" = { + name = "system-image-26-android-wear-x86"; + path = "system-images/android-26/android-wear-cn/x86"; + revision = "26-android-wear-x86"; + displayName = "China version of Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip; + sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096"; + }; }; - - - "28".android-wear."x86" = { - name = "system-image-28-android-wear-x86"; - path = "system-images/android-P/android-wear-cn/x86"; - revision = "28-android-wear-x86"; - displayName = "China version of Wear OS Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-P_r02.zip; - sha1 = "a61a2e453a11f77ab15b3e0bf1e017e0bb9d1bcc"; - - }; + "28".android-wear."x86" = { + name = "system-image-28-android-wear-x86"; + path = "system-images/android-28/android-wear-cn/x86"; + revision = "28-android-wear-x86"; + displayName = "China version of Wear OS Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-28_r03.zip; + sha1 = "2099d87709c5e064273925dbf2cf1fd081bf0262"; + }; }; - -} - \ No newline at end of file +} \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix index 0c45a1162fef..a2a1490d4aea 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix @@ -1,97 +1,64 @@ - {fetchurl}: { - - - "23".android-wear."armeabi-v7a" = { - name = "system-image-23-android-wear-armeabi-v7a"; - path = "system-images/android-23/android-wear/armeabi-v7a"; - revision = "23-android-wear-armeabi-v7a"; - displayName = "Android Wear ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip; - sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71"; - - }; + "23".android-wear."armeabi-v7a" = { + name = "system-image-23-android-wear-armeabi-v7a"; + path = "system-images/android-23/android-wear/armeabi-v7a"; + revision = "23-android-wear-armeabi-v7a"; + displayName = "Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip; + sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71"; + }; }; - - - "23".android-wear."x86" = { - name = "system-image-23-android-wear-x86"; - path = "system-images/android-23/android-wear/x86"; - revision = "23-android-wear-x86"; - displayName = "Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip; - sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e"; - - }; + "23".android-wear."x86" = { + name = "system-image-23-android-wear-x86"; + path = "system-images/android-23/android-wear/x86"; + revision = "23-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip; + sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e"; + }; }; - - - "25".android-wear."armeabi-v7a" = { - name = "system-image-25-android-wear-armeabi-v7a"; - path = "system-images/android-25/android-wear/armeabi-v7a"; - revision = "25-android-wear-armeabi-v7a"; - displayName = "Android Wear ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip; - sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c"; - - }; + "25".android-wear."armeabi-v7a" = { + name = "system-image-25-android-wear-armeabi-v7a"; + path = "system-images/android-25/android-wear/armeabi-v7a"; + revision = "25-android-wear-armeabi-v7a"; + displayName = "Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip; + sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c"; + }; }; - - - "25".android-wear."x86" = { - name = "system-image-25-android-wear-x86"; - path = "system-images/android-25/android-wear/x86"; - revision = "25-android-wear-x86"; - displayName = "Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip; - sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6"; - - }; + "25".android-wear."x86" = { + name = "system-image-25-android-wear-x86"; + path = "system-images/android-25/android-wear/x86"; + revision = "25-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip; + sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6"; + }; }; - - - "26".android-wear."x86" = { - name = "system-image-26-android-wear-x86"; - path = "system-images/android-26/android-wear/x86"; - revision = "26-android-wear-x86"; - displayName = "Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip; - sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c"; - - }; + "26".android-wear."x86" = { + name = "system-image-26-android-wear-x86"; + path = "system-images/android-26/android-wear/x86"; + revision = "26-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip; + sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c"; + }; }; - - - "28".android-wear."x86" = { - name = "system-image-28-android-wear-x86"; - path = "system-images/android-P/android-wear/x86"; - revision = "28-android-wear-x86"; - displayName = "Wear OS Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/x86-P_r02.zip; - sha1 = "cd0d3a56e114dbb0a2a77d58942d344db464b514"; - - }; + "28".android-wear."x86" = { + name = "system-image-28-android-wear-x86"; + path = "system-images/android-28/android-wear/x86"; + revision = "28-android-wear-x86"; + displayName = "Wear OS Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android-wear/x86-28_r03.zip; + sha1 = "b80bd53ab69f19441714bff2e4d55931e6d3f7be"; + }; }; - -} - \ No newline at end of file +} \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android.nix b/pkgs/development/mobile/androidenv/generated/system-images-android.nix index 915cceec5469..043529cb2380 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android.nix @@ -1,547 +1,364 @@ - {fetchurl}: { - - - "10".default."armeabi-v7a" = { - name = "system-image-10-default-armeabi-v7a"; - path = "system-images/android-10/default/armeabi-v7a"; - revision = "10-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip; - sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69"; - - }; - }; - - - "14".default."armeabi-v7a" = { - name = "system-image-14-default-armeabi-v7a"; - path = "system-images/android-14/default/armeabi-v7a"; - revision = "14-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip; - sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; - - }; - }; - - - "15".default."armeabi-v7a" = { - name = "system-image-15-default-armeabi-v7a"; - path = "system-images/android-15/default/armeabi-v7a"; - revision = "15-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip; - sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1"; - - }; - }; - - - "16".default."armeabi-v7a" = { - name = "system-image-16-default-armeabi-v7a"; - path = "system-images/android-16/default/armeabi-v7a"; - revision = "16-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip; - sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f"; - - }; - }; - - - "17".default."armeabi-v7a" = { - name = "system-image-17-default-armeabi-v7a"; - path = "system-images/android-17/default/armeabi-v7a"; - revision = "17-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip; - sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9"; - - }; - }; - - - "18".default."armeabi-v7a" = { - name = "system-image-18-default-armeabi-v7a"; - path = "system-images/android-18/default/armeabi-v7a"; - revision = "18-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip; - sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642"; - - }; - }; - - - "19".default."armeabi-v7a" = { - name = "system-image-19-default-armeabi-v7a"; - path = "system-images/android-19/default/armeabi-v7a"; - revision = "19-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip; - sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; - - }; - }; - - - "21".default."armeabi-v7a" = { - name = "system-image-21-default-armeabi-v7a"; - path = "system-images/android-21/default/armeabi-v7a"; - revision = "21-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip; - sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; - - }; - }; - - - "22".default."armeabi-v7a" = { - name = "system-image-22-default-armeabi-v7a"; - path = "system-images/android-22/default/armeabi-v7a"; - revision = "22-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip; - sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; - - }; - }; - - - "23".default."armeabi-v7a" = { - name = "system-image-23-default-armeabi-v7a"; - path = "system-images/android-23/default/armeabi-v7a"; - revision = "23-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip; - sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; - - }; - }; - - - "24".default."armeabi-v7a" = { - name = "system-image-24-default-armeabi-v7a"; - path = "system-images/android-24/default/armeabi-v7a"; - revision = "24-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; - sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; - - }; - }; - - - "24".default."arm64-v8a" = { - name = "system-image-24-default-arm64-v8a"; - path = "system-images/android-24/default/arm64-v8a"; - revision = "24-default-arm64-v8a"; - displayName = "ARM 64 v8a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; - sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; - - }; - }; - - - "16".default."mips" = { - name = "system-image-16-default-mips"; - path = "system-images/android-16/default/mips"; - revision = "16-default-mips"; - displayName = "MIPS System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip; - sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; - - }; - }; - - - "17".default."mips" = { - name = "system-image-17-default-mips"; - path = "system-images/android-17/default/mips"; - revision = "17-default-mips"; - displayName = "MIPS System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip; - sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; - - }; - }; - - - "10".default."x86" = { - name = "system-image-10-default-x86"; - path = "system-images/android-10/default/x86"; - revision = "10-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip; - sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb"; - - }; - }; - - - "15".default."x86" = { - name = "system-image-15-default-x86"; - path = "system-images/android-15/default/x86"; - revision = "15-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip; - sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1"; - - }; - }; - - - "16".default."x86" = { - name = "system-image-16-default-x86"; - path = "system-images/android-16/default/x86"; - revision = "16-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip; - sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd"; - - }; - }; - - - "17".default."x86" = { - name = "system-image-17-default-x86"; - path = "system-images/android-17/default/x86"; - revision = "17-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip; - sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec"; - - }; - }; - - - "18".default."x86" = { - name = "system-image-18-default-x86"; - path = "system-images/android-18/default/x86"; - revision = "18-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip; - sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458"; - - }; - }; - - - "19".default."x86" = { - name = "system-image-19-default-x86"; - path = "system-images/android-19/default/x86"; - revision = "19-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; - sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; - - }; - }; - - - "21".default."x86" = { - name = "system-image-21-default-x86"; - path = "system-images/android-21/default/x86"; - revision = "21-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; - sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; - - }; - }; - - - "22".default."x86" = { - name = "system-image-22-default-x86"; - path = "system-images/android-22/default/x86"; - revision = "22-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; - sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; - - }; - }; - - - "23".default."x86" = { - name = "system-image-23-default-x86"; - path = "system-images/android-23/default/x86"; - revision = "23-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; - sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; - - }; - }; - - - "24".default."x86" = { - name = "system-image-24-default-x86"; - path = "system-images/android-24/default/x86"; - revision = "24-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; - sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; - - }; - }; - - - "25".default."x86" = { - name = "system-image-25-default-x86"; - path = "system-images/android-25/default/x86"; - revision = "25-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip; - sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f"; - - }; - }; - - - "26".default."x86" = { - name = "system-image-26-default-x86"; - path = "system-images/android-26/default/x86"; - revision = "26-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip; - sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90"; - - }; - }; - - - "27".default."x86" = { - name = "system-image-27-default-x86"; - path = "system-images/android-27/default/x86"; - revision = "27-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip; - sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582"; - - }; - }; - - - "28".default."x86" = { - name = "system-image-28-default-x86"; - path = "system-images/android-28/default/x86"; - revision = "28-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip; - sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780"; - - }; - }; - - - "21".default."x86_64" = { - name = "system-image-21-default-x86_64"; - path = "system-images/android-21/default/x86_64"; - revision = "21-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; - sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; - - }; - }; - - - "22".default."x86_64" = { - name = "system-image-22-default-x86_64"; - path = "system-images/android-22/default/x86_64"; - revision = "22-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; - sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; - - }; - }; - - - "23".default."x86_64" = { - name = "system-image-23-default-x86_64"; - path = "system-images/android-23/default/x86_64"; - revision = "23-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; - sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; - - }; - }; - - - "24".default."x86_64" = { - name = "system-image-24-default-x86_64"; - path = "system-images/android-24/default/x86_64"; - revision = "24-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; - sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; - - }; - }; - - - "25".default."x86_64" = { - name = "system-image-25-default-x86_64"; - path = "system-images/android-25/default/x86_64"; - revision = "25-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip; - sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37"; - - }; - }; - - - "26".default."x86_64" = { - name = "system-image-26-default-x86_64"; - path = "system-images/android-26/default/x86_64"; - revision = "26-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip; - sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3"; - - }; - }; - - - "27".default."x86_64" = { - name = "system-image-27-default-x86_64"; - path = "system-images/android-27/default/x86_64"; - revision = "27-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip; - sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60"; - - }; - }; - - - "28".default."x86_64" = { - name = "system-image-28-default-x86_64"; - path = "system-images/android-28/default/x86_64"; - revision = "28-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip; - sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0"; - - }; - }; - + "10".default."armeabi-v7a" = { + name = "system-image-10-default-armeabi-v7a"; + path = "system-images/android-10/default/armeabi-v7a"; + revision = "10-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-10_r05.zip; + sha1 = "8537616a7add47cce24c60f18bc2429e3dc90ae3"; + }; + }; + "14".default."armeabi-v7a" = { + name = "system-image-14-default-armeabi-v7a"; + path = "system-images/android-14/default/armeabi-v7a"; + revision = "14-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip; + sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; + }; + }; + "15".default."armeabi-v7a" = { + name = "system-image-15-default-armeabi-v7a"; + path = "system-images/android-15/default/armeabi-v7a"; + revision = "15-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r05.zip; + sha1 = "03d7ed95a9d3b107e3f2e5b166d017ea12529e70"; + }; + }; + "16".default."armeabi-v7a" = { + name = "system-image-16-default-armeabi-v7a"; + path = "system-images/android-16/default/armeabi-v7a"; + revision = "16-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-16_r06.zip; + sha1 = "69b944b0d5a18c8563fa80d7d229af64890f724e"; + }; + }; + "17".default."armeabi-v7a" = { + name = "system-image-17-default-armeabi-v7a"; + path = "system-images/android-17/default/armeabi-v7a"; + revision = "17-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r06.zip; + sha1 = "a18a3fd0958ec4ef52507f58e414fc5c7dfd59d6"; + }; + }; + "18".default."armeabi-v7a" = { + name = "system-image-18-default-armeabi-v7a"; + path = "system-images/android-18/default/armeabi-v7a"; + revision = "18-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r05.zip; + sha1 = "580b583720f7de671040d5917c8c9db0c7aa03fd"; + }; + }; + "19".default."armeabi-v7a" = { + name = "system-image-19-default-armeabi-v7a"; + path = "system-images/android-19/default/armeabi-v7a"; + revision = "19-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip; + sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; + }; + }; + "21".default."armeabi-v7a" = { + name = "system-image-21-default-armeabi-v7a"; + path = "system-images/android-21/default/armeabi-v7a"; + revision = "21-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip; + sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; + }; + }; + "22".default."armeabi-v7a" = { + name = "system-image-22-default-armeabi-v7a"; + path = "system-images/android-22/default/armeabi-v7a"; + revision = "22-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip; + sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; + }; + }; + "23".default."armeabi-v7a" = { + name = "system-image-23-default-armeabi-v7a"; + path = "system-images/android-23/default/armeabi-v7a"; + revision = "23-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip; + sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; + }; + }; + "24".default."armeabi-v7a" = { + name = "system-image-24-default-armeabi-v7a"; + path = "system-images/android-24/default/armeabi-v7a"; + revision = "24-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; + sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; + }; + }; + "24".default."arm64-v8a" = { + name = "system-image-24-default-arm64-v8a"; + path = "system-images/android-24/default/arm64-v8a"; + revision = "24-default-arm64-v8a"; + displayName = "ARM 64 v8a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; + sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; + }; + }; + "16".default."mips" = { + name = "system-image-16-default-mips"; + path = "system-images/android-16/default/mips"; + revision = "16-default-mips"; + displayName = "MIPS System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip; + sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; + }; + }; + "17".default."mips" = { + name = "system-image-17-default-mips"; + path = "system-images/android-17/default/mips"; + revision = "17-default-mips"; + displayName = "MIPS System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip; + sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; + }; + }; + "10".default."x86" = { + name = "system-image-10-default-x86"; + path = "system-images/android-10/default/x86"; + revision = "10-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-10_r05.zip; + sha1 = "a166d5ccbb165e1dd5464fbfeec30a61f77790d8"; + }; + }; + "15".default."x86" = { + name = "system-image-15-default-x86"; + path = "system-images/android-15/default/x86"; + revision = "15-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-15_r05.zip; + sha1 = "c387e0efed2cdc610e5944eea67b7b692d03760c"; + }; + }; + "16".default."x86" = { + name = "system-image-16-default-x86"; + path = "system-images/android-16/default/x86"; + revision = "16-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip; + sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd"; + }; + }; + "17".default."x86" = { + name = "system-image-17-default-x86"; + path = "system-images/android-17/default/x86"; + revision = "17-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip; + sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec"; + }; + }; + "18".default."x86" = { + name = "system-image-18-default-x86"; + path = "system-images/android-18/default/x86"; + revision = "18-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-18_r04.zip; + sha1 = "7a4ced4d9b0ab48047825491b4072dc2eb9b610e"; + }; + }; + "19".default."x86" = { + name = "system-image-19-default-x86"; + path = "system-images/android-19/default/x86"; + revision = "19-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; + sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; + }; + }; + "21".default."x86" = { + name = "system-image-21-default-x86"; + path = "system-images/android-21/default/x86"; + revision = "21-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; + sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; + }; + }; + "22".default."x86" = { + name = "system-image-22-default-x86"; + path = "system-images/android-22/default/x86"; + revision = "22-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; + sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; + }; + }; + "23".default."x86" = { + name = "system-image-23-default-x86"; + path = "system-images/android-23/default/x86"; + revision = "23-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; + sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; + }; + }; + "24".default."x86" = { + name = "system-image-24-default-x86"; + path = "system-images/android-24/default/x86"; + revision = "24-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; + sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; + }; + }; + "25".default."x86" = { + name = "system-image-25-default-x86"; + path = "system-images/android-25/default/x86"; + revision = "25-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip; + sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f"; + }; + }; + "26".default."x86" = { + name = "system-image-26-default-x86"; + path = "system-images/android-26/default/x86"; + revision = "26-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip; + sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90"; + }; + }; + "27".default."x86" = { + name = "system-image-27-default-x86"; + path = "system-images/android-27/default/x86"; + revision = "27-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip; + sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582"; + }; + }; + "28".default."x86" = { + name = "system-image-28-default-x86"; + path = "system-images/android-28/default/x86"; + revision = "28-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip; + sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780"; + }; + }; + "21".default."x86_64" = { + name = "system-image-21-default-x86_64"; + path = "system-images/android-21/default/x86_64"; + revision = "21-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; + sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; + }; + }; + "22".default."x86_64" = { + name = "system-image-22-default-x86_64"; + path = "system-images/android-22/default/x86_64"; + revision = "22-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; + sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; + }; + }; + "23".default."x86_64" = { + name = "system-image-23-default-x86_64"; + path = "system-images/android-23/default/x86_64"; + revision = "23-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; + sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; + }; + }; + "24".default."x86_64" = { + name = "system-image-24-default-x86_64"; + path = "system-images/android-24/default/x86_64"; + revision = "24-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; + sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; + }; + }; + "25".default."x86_64" = { + name = "system-image-25-default-x86_64"; + path = "system-images/android-25/default/x86_64"; + revision = "25-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip; + sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37"; + }; + }; + "26".default."x86_64" = { + name = "system-image-26-default-x86_64"; + path = "system-images/android-26/default/x86_64"; + revision = "26-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip; + sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3"; + }; + }; + "27".default."x86_64" = { + name = "system-image-27-default-x86_64"; + path = "system-images/android-27/default/x86_64"; + revision = "27-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip; + sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60"; + }; + }; + "28".default."x86_64" = { + name = "system-image-28-default-x86_64"; + path = "system-images/android-28/default/x86_64"; + revision = "28-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip; + sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0"; + }; + }; } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix index 3b0303b86b4b..68af1ea56895 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix @@ -1,502 +1,384 @@ - {fetchurl}: { - - - "10".google_apis."armeabi-v7a" = { - name = "system-image-10-google_apis-armeabi-v7a"; - path = "system-images/android-10/google_apis/armeabi-v7a"; - revision = "10-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r05.zip; - sha1 = "cb60221d4ff6686ae96560970d48d9aa60e80b3f"; - - }; - }; - - - "10".google_apis."x86" = { - name = "system-image-10-google_apis-x86"; - path = "system-images/android-10/google_apis/x86"; - revision = "10-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r05.zip; - sha1 = "b8e8a4ab26890c4a395fb796bf9cb7ceb51c880e"; - - }; - }; - - - "15".google_apis."armeabi-v7a" = { - name = "system-image-15-google_apis-armeabi-v7a"; - path = "system-images/android-15/google_apis/armeabi-v7a"; - revision = "15-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r05.zip; - sha1 = "1ec4e6f9014fcbe694511280f5b497aaf7dd750f"; - - }; - }; - - - "15".google_apis."x86" = { - name = "system-image-15-google_apis-x86"; - path = "system-images/android-15/google_apis/x86"; - revision = "15-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r05.zip; - sha1 = "f2b98baaf847ff5b82b82fdc6c396b229067307b"; - - }; - }; - - - "16".google_apis."x86" = { - name = "system-image-16-google_apis-x86"; - path = "system-images/android-16/google_apis/x86"; - revision = "16-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r05.zip; - sha1 = "7edc5c0836fa32f8d453788c002ca0ee1bc5a0a2"; - - }; - }; - - - "17".google_apis."armeabi-v7a" = { - name = "system-image-17-google_apis-armeabi-v7a"; - path = "system-images/android-17/google_apis/armeabi-v7a"; - revision = "17-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r05.zip; - sha1 = "c990f2a81c24a61f9f1da5d5d205f2924ce548ae"; - - }; - }; - - - "17".google_apis."x86" = { - name = "system-image-17-google_apis-x86"; - path = "system-images/android-17/google_apis/x86"; - revision = "17-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip; - sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6"; - - }; - }; - - - "18".google_apis."armeabi-v7a" = { - name = "system-image-18-google_apis-armeabi-v7a"; - path = "system-images/android-18/google_apis/armeabi-v7a"; - revision = "18-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r05.zip; - sha1 = "c4e69a96d4584f7e311e358fe4ad0e5d1bf1605b"; - - }; - }; - - - "18".google_apis."x86" = { - name = "system-image-18-google_apis-x86"; - path = "system-images/android-18/google_apis/x86"; - revision = "18-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r05.zip; - sha1 = "2b34741693eba9419cb6bf1a467596783234d37a"; - - }; - }; - - - "19".google_apis."x86" = { - name = "system-image-19-google_apis-x86"; - path = "system-images/android-19/google_apis/x86"; - revision = "19-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r37.zip; - sha1 = "f02473420a166b3df7821d8ae5a623524058b4b8"; - - }; - }; - - - "19".google_apis."armeabi-v7a" = { - name = "system-image-19-google_apis-armeabi-v7a"; - path = "system-images/android-19/google_apis/armeabi-v7a"; - revision = "19-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r37.zip; - sha1 = "b388072493ed010fe2ddf607c8c4239f54ce1a0b"; - - }; - }; - - - "21".google_apis."x86" = { - name = "system-image-21-google_apis-x86"; - path = "system-images/android-21/google_apis/x86"; - revision = "21-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r29.zip; - sha1 = "1f5ac49e0ae603b0bfeda0c94cd7e0b850b9b50e"; - - }; - }; - - - "21".google_apis."x86_64" = { - name = "system-image-21-google_apis-x86_64"; - path = "system-images/android-21/google_apis/x86_64"; - revision = "21-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r29.zip; - sha1 = "74ac387aec286fcee01259dcccd4762cbdb4b517"; - - }; - }; - - - "21".google_apis."armeabi-v7a" = { - name = "system-image-21-google_apis-armeabi-v7a"; - path = "system-images/android-21/google_apis/armeabi-v7a"; - revision = "21-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r29.zip; - sha1 = "1d0c428ac7f5eb49c7389ad0beb09f07cb989b45"; - - }; - }; - - - "22".google_apis."x86" = { - name = "system-image-22-google_apis-x86"; - path = "system-images/android-22/google_apis/x86"; - revision = "22-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r23.zip; - sha1 = "4ceda9ffd69d5b827a8cc2f56ccac62e72982b33"; - - }; - }; - - - "22".google_apis."armeabi-v7a" = { - name = "system-image-22-google_apis-armeabi-v7a"; - path = "system-images/android-22/google_apis/armeabi-v7a"; - revision = "22-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r23.zip; - sha1 = "0a11bdffa6132303baf87e4a531987a74d5f0792"; - - }; - }; - - - "22".google_apis."x86_64" = { - name = "system-image-22-google_apis-x86_64"; - path = "system-images/android-22/google_apis/x86_64"; - revision = "22-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r23.zip; - sha1 = "1dfee1c382574c18e3aa2bc2047793169f3ab125"; - - }; - }; - - - "23".google_apis."x86" = { - name = "system-image-23-google_apis-x86"; - path = "system-images/android-23/google_apis/x86"; - revision = "23-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r30.zip; - sha1 = "1b8fd61e7e7c76d8c05a41b19370edfb015ed240"; - - }; - }; - - - "23".google_apis."x86_64" = { - name = "system-image-23-google_apis-x86_64"; - path = "system-images/android-23/google_apis/x86_64"; - revision = "23-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r30.zip; - sha1 = "69a17c23c4e05e81a2820fe49884807fcebba546"; - - }; - }; - - - "23".google_apis."armeabi-v7a" = { - name = "system-image-23-google_apis-armeabi-v7a"; - path = "system-images/android-23/google_apis/armeabi-v7a"; - revision = "23-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r30.zip; - sha1 = "c3966e3a25623a915902d879f90f6d9253dbb619"; - - }; - }; - - - "24".google_apis."x86" = { - name = "system-image-24-google_apis-x86"; - path = "system-images/android-24/google_apis/x86"; - revision = "24-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r24.zip; - sha1 = "7a1adb4aa13946830763644d014fc9c6cc1f921d"; - - }; - }; - - - "24".google_apis."x86_64" = { - name = "system-image-24-google_apis-x86_64"; - path = "system-images/android-24/google_apis/x86_64"; - revision = "24-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r24.zip; - sha1 = "53b26e8868c7cd27dda31c71ee2bcf999d6b9ce2"; - - }; - }; - - - "24".google_apis."armeabi-v7a" = { - name = "system-image-24-google_apis-armeabi-v7a"; - path = "system-images/android-24/google_apis/armeabi-v7a"; - revision = "24-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r24.zip; - sha1 = "85068d55673bbf9417db8d70107ceed0952b5a28"; - - }; - }; - - - "24".google_apis."arm64-v8a" = { - name = "system-image-24-google_apis-arm64-v8a"; - path = "system-images/android-24/google_apis/arm64-v8a"; - revision = "24-google_apis-arm64-v8a"; - displayName = "Google APIs ARM 64 v8a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r24.zip; - sha1 = "93ab33d90fcdbb30ca2e927cd3eea447e933dfd9"; - - }; - }; - - - "25".google_apis."x86" = { - name = "system-image-25-google_apis-x86"; - path = "system-images/android-25/google_apis/x86"; - revision = "25-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r15.zip; - sha1 = "5948473077341265a0b21a53a7e0afc2f980187c"; - - }; - }; - - - "25".google_apis."x86_64" = { - name = "system-image-25-google_apis-x86_64"; - path = "system-images/android-25/google_apis/x86_64"; - revision = "25-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r15.zip; - sha1 = "5a81fc218a7fe82cc6af01f7fae54a8000900443"; - - }; - }; - - - "25".google_apis."armeabi-v7a" = { - name = "system-image-25-google_apis-armeabi-v7a"; - path = "system-images/android-25/google_apis/armeabi-v7a"; - revision = "25-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r15.zip; - sha1 = "813e25f9a5f6d775670ed6c5e67a39bffa1411bf"; - - }; - }; - - - "25".google_apis."arm64-v8a" = { - name = "system-image-25-google_apis-arm64-v8a"; - path = "system-images/android-25/google_apis/arm64-v8a"; - revision = "25-google_apis-arm64-v8a"; - displayName = "Google APIs ARM 64 v8a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r15.zip; - sha1 = "c3049e32f031140757f71acb5b8f0179e6f27303"; - - }; - }; - - - "26".google_apis."x86" = { - name = "system-image-26-google_apis-x86"; - path = "system-images/android-26/google_apis/x86"; - revision = "26-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r12.zip; - sha1 = "167c83bcfd87127c7376ce986b34701f74fe87ff"; - - }; - }; - - - "26".google_apis."x86_64" = { - name = "system-image-26-google_apis-x86_64"; - path = "system-images/android-26/google_apis/x86_64"; - revision = "26-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r12.zip; - sha1 = "fcd46121c3486e2a759d0707c015e0b12bbab9db"; - - }; - }; - - - "27".google_apis."x86" = { - name = "system-image-27-google_apis-x86"; - path = "system-images/android-27/google_apis/x86"; - revision = "27-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r08.zip; - sha1 = "623ee2638713b7dfde8044c91280c2afad5a1ade"; - - }; - }; - - - "28".google_apis."x86" = { - name = "system-image-28-google_apis-x86"; - path = "system-images/android-28/google_apis/x86"; - revision = "28-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r07.zip; - sha1 = "fe5d58355545ae82b0e6a55adc1d41573ac7dec1"; - - }; - }; - - - "28".google_apis."x86_64" = { - name = "system-image-28-google_apis-x86_64"; - path = "system-images/android-28/google_apis/x86_64"; - revision = "28-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r07.zip; - sha1 = "068468683a56725326f741f75b6913ee1e7955ff"; - - }; - }; - -} - \ No newline at end of file + "10".google_apis."armeabi-v7a" = { + name = "system-image-10-google_apis-armeabi-v7a"; + path = "system-images/android-10/google_apis/armeabi-v7a"; + revision = "10-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip; + sha1 = "970abf3a2a9937a43576afd9bb56e4a8191947f8"; + }; + }; + "10".google_apis."x86" = { + name = "system-image-10-google_apis-x86"; + path = "system-images/android-10/google_apis/x86"; + revision = "10-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip; + sha1 = "070a9552e3d358d8e72e8b2042e539e2b7a1b035"; + }; + }; + "15".google_apis."x86" = { + name = "system-image-15-google_apis-x86"; + path = "system-images/android-15/google_apis/x86"; + revision = "15-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r06.zip; + sha1 = "a7deb32c12396b6c4fd60ad14a62e19f8bdcae20"; + }; + }; + "15".google_apis."armeabi-v7a" = { + name = "system-image-15-google_apis-armeabi-v7a"; + path = "system-images/android-15/google_apis/armeabi-v7a"; + revision = "15-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip; + sha1 = "6deb76cf34760a6037cb18d89772c9e986d07497"; + }; + }; + "16".google_apis."armeabi-v7a" = { + name = "system-image-16-google_apis-armeabi-v7a"; + path = "system-images/android-16/google_apis/armeabi-v7a"; + revision = "16-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip; + sha1 = "5a5ff097680c6dae473c8719296ce6d7b70edb2d"; + }; + }; + "16".google_apis."x86" = { + name = "system-image-16-google_apis-x86"; + path = "system-images/android-16/google_apis/x86"; + revision = "16-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r06.zip; + sha1 = "b57adef2f43dd176b8c02c980c16a796021b2071"; + }; + }; + "17".google_apis."armeabi-v7a" = { + name = "system-image-17-google_apis-armeabi-v7a"; + path = "system-images/android-17/google_apis/armeabi-v7a"; + revision = "17-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip; + sha1 = "a59f26cb5707da97e869a27d87b83477204ac594"; + }; + }; + "17".google_apis."x86" = { + name = "system-image-17-google_apis-x86"; + path = "system-images/android-17/google_apis/x86"; + revision = "17-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip; + sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6"; + }; + }; + "18".google_apis."armeabi-v7a" = { + name = "system-image-18-google_apis-armeabi-v7a"; + path = "system-images/android-18/google_apis/armeabi-v7a"; + revision = "18-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip; + sha1 = "7faaccabbcc5f08e410436d3f63eea42521ea974"; + }; + }; + "18".google_apis."x86" = { + name = "system-image-18-google_apis-x86"; + path = "system-images/android-18/google_apis/x86"; + revision = "18-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip; + sha1 = "dd674d719cad61602702be4b3d98edccfbfea53e"; + }; + }; + "19".google_apis."x86" = { + name = "system-image-19-google_apis-x86"; + path = "system-images/android-19/google_apis/x86"; + revision = "19-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r38.zip; + sha1 = "928e4ec82876c61ef53451425d10ccb840cdd0f2"; + }; + }; + "19".google_apis."armeabi-v7a" = { + name = "system-image-19-google_apis-armeabi-v7a"; + path = "system-images/android-19/google_apis/armeabi-v7a"; + revision = "19-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r38.zip; + sha1 = "434edd2ddc39d1ca083a5fa9721c0db8ab804737"; + }; + }; + "21".google_apis."x86" = { + name = "system-image-21-google_apis-x86"; + path = "system-images/android-21/google_apis/x86"; + revision = "21-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r30.zip; + sha1 = "37548caae9e2897fb1d2b15f7fcf624c714cb610"; + }; + }; + "21".google_apis."x86_64" = { + name = "system-image-21-google_apis-x86_64"; + path = "system-images/android-21/google_apis/x86_64"; + revision = "21-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r30.zip; + sha1 = "82d34fdaae2916bd4d48a4f144db51e4e5719aa4"; + }; + }; + "21".google_apis."armeabi-v7a" = { + name = "system-image-21-google_apis-armeabi-v7a"; + path = "system-images/android-21/google_apis/armeabi-v7a"; + revision = "21-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r30.zip; + sha1 = "bbdbbb3c4387752a8f28718a3190d901c0378058"; + }; + }; + "22".google_apis."x86" = { + name = "system-image-22-google_apis-x86"; + path = "system-images/android-22/google_apis/x86"; + revision = "22-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r24.zip; + sha1 = "e4cd95b1c0837fc12d6544742e82d8ef344c8758"; + }; + }; + "22".google_apis."armeabi-v7a" = { + name = "system-image-22-google_apis-armeabi-v7a"; + path = "system-images/android-22/google_apis/armeabi-v7a"; + revision = "22-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r24.zip; + sha1 = "d2b7ca5f8259c6e4b3cfa5a0d77e4a088899cfb0"; + }; + }; + "22".google_apis."x86_64" = { + name = "system-image-22-google_apis-x86_64"; + path = "system-images/android-22/google_apis/x86_64"; + revision = "22-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r24.zip; + sha1 = "cde738f9353606af69ad7b4e625c957a4d603f27"; + }; + }; + "23".google_apis."x86" = { + name = "system-image-23-google_apis-x86"; + path = "system-images/android-23/google_apis/x86"; + revision = "23-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r31.zip; + sha1 = "877cf79f5198fa53351eab08ba9ce162dc84f7ba"; + }; + }; + "23".google_apis."x86_64" = { + name = "system-image-23-google_apis-x86_64"; + path = "system-images/android-23/google_apis/x86_64"; + revision = "23-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r31.zip; + sha1 = "342c39df061804ee0d5bc671147e90dead3d6665"; + }; + }; + "23".google_apis."armeabi-v7a" = { + name = "system-image-23-google_apis-armeabi-v7a"; + path = "system-images/android-23/google_apis/armeabi-v7a"; + revision = "23-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r31.zip; + sha1 = "da0a07800b4eec53fcdb2e5c3b69a9a5d7a6b8a6"; + }; + }; + "24".google_apis."x86" = { + name = "system-image-24-google_apis-x86"; + path = "system-images/android-24/google_apis/x86"; + revision = "24-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r25.zip; + sha1 = "53dba25eed8359aba394a1be1c7ccb741a459ec0"; + }; + }; + "24".google_apis."x86_64" = { + name = "system-image-24-google_apis-x86_64"; + path = "system-images/android-24/google_apis/x86_64"; + revision = "24-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r25.zip; + sha1 = "d757dd13ad9b0ba4dd872660e31b6506f60dcf32"; + }; + }; + "24".google_apis."armeabi-v7a" = { + name = "system-image-24-google_apis-armeabi-v7a"; + path = "system-images/android-24/google_apis/armeabi-v7a"; + revision = "24-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r25.zip; + sha1 = "9a0ec5e9a239a7a6889364e44e9fa4fcd0052c6b"; + }; + }; + "24".google_apis."arm64-v8a" = { + name = "system-image-24-google_apis-arm64-v8a"; + path = "system-images/android-24/google_apis/arm64-v8a"; + revision = "24-google_apis-arm64-v8a"; + displayName = "Google APIs ARM 64 v8a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r25.zip; + sha1 = "5ff407d439e3c595ce9221f445a31dcc35df5a86"; + }; + }; + "25".google_apis."x86" = { + name = "system-image-25-google_apis-x86"; + path = "system-images/android-25/google_apis/x86"; + revision = "25-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r16.zip; + sha1 = "562e3335c6334b8d1947bb9efb90f8d82f2d3e4d"; + }; + }; + "25".google_apis."x86_64" = { + name = "system-image-25-google_apis-x86_64"; + path = "system-images/android-25/google_apis/x86_64"; + revision = "25-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r16.zip; + sha1 = "e08b94903631d58964467b0b310c93642d85df6c"; + }; + }; + "25".google_apis."armeabi-v7a" = { + name = "system-image-25-google_apis-armeabi-v7a"; + path = "system-images/android-25/google_apis/armeabi-v7a"; + revision = "25-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r16.zip; + sha1 = "4c49e0edb845b0bf1f231cb0e8598b1a9f9aa9c8"; + }; + }; + "25".google_apis."arm64-v8a" = { + name = "system-image-25-google_apis-arm64-v8a"; + path = "system-images/android-25/google_apis/arm64-v8a"; + revision = "25-google_apis-arm64-v8a"; + displayName = "Google APIs ARM 64 v8a System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r16.zip; + sha1 = "33ffbd335d9a6dc8d9843469d0963091566b3167"; + }; + }; + "26".google_apis."x86" = { + name = "system-image-26-google_apis-x86"; + path = "system-images/android-26/google_apis/x86"; + revision = "26-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r14.zip; + sha1 = "935da6794d5f64f7ae20a1f352929cb7e3b20cba"; + }; + }; + "26".google_apis."x86_64" = { + name = "system-image-26-google_apis-x86_64"; + path = "system-images/android-26/google_apis/x86_64"; + revision = "26-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r14.zip; + sha1 = "965631f0554ca9027ac465ba147baa6a6a22fcce"; + }; + }; + "27".google_apis."x86" = { + name = "system-image-27-google_apis-x86"; + path = "system-images/android-27/google_apis/x86"; + revision = "27-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r09.zip; + sha1 = "ab009fc1308ded01539af4f8233b252d411145bc"; + }; + }; + "28".google_apis."x86" = { + name = "system-image-28-google_apis-x86"; + path = "system-images/android-28/google_apis/x86"; + revision = "28-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r09.zip; + sha1 = "7c84ba5cbc009132ce38df52830c17b9bffc54bb"; + }; + }; + "28".google_apis."x86_64" = { + name = "system-image-28-google_apis-x86_64"; + path = "system-images/android-28/google_apis/x86_64"; + revision = "28-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r09.zip; + sha1 = "eeb066346d29194e5b9387a0c0dd0f9e2a570b70"; + }; + }; + "29".google_apis."x86" = { + name = "system-image-29-google_apis-x86"; + path = "system-images/android-29/google_apis/x86"; + revision = "29-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r09.zip; + sha1 = "33d71d17138ea322dec2dea6d8198aebf4767ab3"; + }; + }; + "29".google_apis."x86_64" = { + name = "system-image-29-google_apis-x86_64"; + path = "system-images/android-29/google_apis/x86_64"; + revision = "29-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r09.zip; + sha1 = "0aa76b20a7ad30f2e41bc21b897b848d82533d26"; + }; + }; + "R".google_apis."x86" = { + name = "system-image-R-google_apis-x86"; + path = "system-images/android-R/google_apis/x86"; + revision = "R-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-R_r01.zip; + sha1 = "4e260bef94760eecba3224b68c1a4fed0fb89485"; + }; + }; + "R".google_apis."x86_64" = { + name = "system-image-R-google_apis-x86_64"; + path = "system-images/android-R/google_apis/x86_64"; + revision = "R-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis/x86_64-R_r01.zip; + sha1 = "ae12e1c3e1b36043a299359850e9315f47262f81"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix index a8bea61ff548..edc22ac2d7b6 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix @@ -1,97 +1,64 @@ - {fetchurl}: { - - - "24".google_apis_playstore."x86" = { - name = "system-image-24-google_apis_playstore-x86"; - path = "system-images/android-24/google_apis_playstore/x86"; - revision = "24-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip; - sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22"; - - }; + "24".google_apis_playstore."x86" = { + name = "system-image-24-google_apis_playstore-x86"; + path = "system-images/android-24/google_apis_playstore/x86"; + revision = "24-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip; + sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22"; + }; }; - - - "25".google_apis_playstore."x86" = { - name = "system-image-25-google_apis_playstore-x86"; - path = "system-images/android-25/google_apis_playstore/x86"; - revision = "25-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip; - sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c"; - - }; + "25".google_apis_playstore."x86" = { + name = "system-image-25-google_apis_playstore-x86"; + path = "system-images/android-25/google_apis_playstore/x86"; + revision = "25-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip; + sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c"; + }; }; - - - "26".google_apis_playstore."x86" = { - name = "system-image-26-google_apis_playstore-x86"; - path = "system-images/android-26/google_apis_playstore/x86"; - revision = "26-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip; - sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19"; - - }; + "26".google_apis_playstore."x86" = { + name = "system-image-26-google_apis_playstore-x86"; + path = "system-images/android-26/google_apis_playstore/x86"; + revision = "26-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip; + sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19"; + }; }; - - - "27".google_apis_playstore."x86" = { - name = "system-image-27-google_apis_playstore-x86"; - path = "system-images/android-27/google_apis_playstore/x86"; - revision = "27-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip; - sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d"; - - }; + "27".google_apis_playstore."x86" = { + name = "system-image-27-google_apis_playstore-x86"; + path = "system-images/android-27/google_apis_playstore/x86"; + revision = "27-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip; + sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d"; + }; }; - - - "28".google_apis_playstore."x86" = { - name = "system-image-28-google_apis_playstore-x86"; - path = "system-images/android-28/google_apis_playstore/x86"; - revision = "28-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r05.zip; - sha1 = "4c570d259e93b0b27f97bad1aca2ac47f1e9b51a"; - - }; + "28".google_apis_playstore."x86" = { + name = "system-image-28-google_apis_playstore-x86"; + path = "system-images/android-28/google_apis_playstore/x86"; + revision = "28-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r08.zip; + sha1 = "5381f9d52a3bf1967c9c92a25b20012cd68764c8"; + }; }; - - - "28".google_apis_playstore."x86_64" = { - name = "system-image-28-google_apis_playstore-x86_64"; - path = "system-images/android-28/google_apis_playstore/x86_64"; - revision = "28-google_apis_playstore-x86_64"; - displayName = "Google Play Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r05.zip; - sha1 = "5f6b238e4c7de41fd2a1c66841093bcf517255a1"; - - }; + "28".google_apis_playstore."x86_64" = { + name = "system-image-28-google_apis_playstore-x86_64"; + path = "system-images/android-28/google_apis_playstore/x86_64"; + revision = "28-google_apis_playstore-x86_64"; + displayName = "Google Play Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip; + sha1 = "a767da996fdea7a1f5632a9206fa5c009d6e580c"; + }; }; - } - \ No newline at end of file diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 9aa7dfbf2301..b8db94ca06af 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -87,4 +87,4 @@ DEPENDENCIES cocoapods! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index 534f42e37d7c..ecb9e5413237 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.nix @@ -14,4 +14,4 @@ in import ./node-packages-v10.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix index 3f4fbb7f7cb5..a3a7bc256772 100644 --- a/pkgs/development/node-packages/composition-v12.nix +++ b/pkgs/development/node-packages/composition-v12.nix @@ -14,4 +14,4 @@ in import ./node-packages-v12.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/composition-v13.nix b/pkgs/development/node-packages/composition-v13.nix index 7100e8d74742..6eddeb468dbb 100644 --- a/pkgs/development/node-packages/composition-v13.nix +++ b/pkgs/development/node-packages/composition-v13.nix @@ -14,4 +14,4 @@ in import ./node-packages-v13.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 3b1626f9afb3..d25671b1a6df 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -1,15 +1,11 @@ -#!/usr/bin/env nix-shell -#! nix-shell shell-generate.nix -i bash +#!/usr/bin/env bash set -eu -o pipefail -cd "$NODE_NIXPKGS_PATH/pkgs/development/node-packages" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix) + +cd ${DIR} rm -f ./node-env.nix for version in 10 12 13; do - tmpdir=$(mktemp -d) - node2nix --nodejs-$version -i node-packages-v$version.json -o $tmpdir/node-packages-v$version.nix -c $tmpdir/composition-v$version.nix - if [ $? -eq 0 ]; then - mv $tmpdir/node-packages-v$version.nix . - mv $tmpdir/composition-v$version.nix . - fi + "${node2nix}/bin/node2nix" --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix done -cd - diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 9c812bf9a733..d70b133fd405 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -22,31 +22,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.900.6" = { + "@angular-devkit/architect-0.900.7" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.900.6"; + version = "0.900.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.6.tgz"; - sha512 = "WK8e09DgNP1NHP1gqVQ9w+9rlRMVDJxAh4qZGJRjZBXd3LY7y84WWRmTpfuhOSu+82fR3/n76+urxraU3ZVphw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.7.tgz"; + sha512 = "hfiTVYc72kzbXrzK4tea6jnTDnSKpE1D+vEptBXN2tdXEVNEAQI5Qm5L1zVDtt16UdqoUTUypIgUc9jcNH1mUQ=="; }; }; - "@angular-devkit/core-9.0.6" = { + "@angular-devkit/core-9.0.7" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.6.tgz"; - sha512 = "hCZJbnqLEm1F5Bx+ILcdd3LPgQTn4WFWpfUqMEGGj7UirRInWcz+6UpYotKGTJw85/mV01LrIbtWIkAUXbkkhg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.7.tgz"; + sha512 = "tMrz36sM1xrwvFf9Qm59GwALscVlMP7rQBjtd0fIR/QbsiOAIX4AQbV+vN6Vtwnzo5NIRZY1IXJUhesWms+h5w=="; }; }; - "@angular-devkit/schematics-9.0.6" = { + "@angular-devkit/schematics-9.0.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.6.tgz"; - sha512 = "X7qZDJVrFcPUn+jNUeOH7Bx1D7YTpTFr0d3DBIsQzseReSGu7ugWziQPS4gc5Xm5K0nb8vx6DYtyW0FaIvX0ZA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.7.tgz"; + sha512 = "ryPC+l24f3gX5DFMTLkDM/q2Kp6LPzBn6400k7j4qVdb1cIrZx+JUQd7F4iAksTTkX15EQPanptQXeztUrl9Ng=="; }; }; "@antora/asciidoc-loader-2.2.0" = { @@ -256,22 +256,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/compat-data-7.8.6" = { + "@babel/compat-data-7.9.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.8.6"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz"; - sha512 = "CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz"; + sha512 = "zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g=="; }; }; - "@babel/core-7.8.7" = { + "@babel/core-7.9.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.8.7"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz"; - sha512 = "rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz"; + sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -292,13 +292,13 @@ let sha512 = "4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg=="; }; }; - "@babel/generator-7.8.8" = { + "@babel/generator-7.9.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.8.8"; + version = "7.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz"; - sha512 = "HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz"; + sha512 = "rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA=="; }; }; "@babel/helper-annotate-as-pure-7.8.3" = { @@ -319,22 +319,22 @@ let sha512 = "5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw=="; }; }; - "@babel/helper-builder-react-jsx-7.8.3" = { + "@babel/helper-builder-react-jsx-7.9.0" = { name = "_at_babel_slash_helper-builder-react-jsx"; packageName = "@babel/helper-builder-react-jsx"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz"; - sha512 = "JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; + sha512 = "weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw=="; }; }; - "@babel/helper-call-delegate-7.8.7" = { - name = "_at_babel_slash_helper-call-delegate"; - packageName = "@babel/helper-call-delegate"; - version = "7.8.7"; + "@babel/helper-builder-react-jsx-experimental-7.9.0" = { + name = "_at_babel_slash_helper-builder-react-jsx-experimental"; + packageName = "@babel/helper-builder-react-jsx-experimental"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz"; - sha512 = "doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz"; + sha512 = "3xJEiyuYU4Q/Ar9BsHisgdxZsRlsShMe90URZ0e6przL26CCs8NJbDoxH94kKT17PcxlMhsCAwZd90evCo26VQ=="; }; }; "@babel/helper-compilation-targets-7.8.7" = { @@ -427,13 +427,13 @@ let sha512 = "R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg=="; }; }; - "@babel/helper-module-transforms-7.8.6" = { + "@babel/helper-module-transforms-7.9.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.8.6"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz"; - sha512 = "RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; + sha512 = "0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA=="; }; }; "@babel/helper-optimise-call-expression-7.8.3" = { @@ -499,6 +499,15 @@ let sha512 = "3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA=="; }; }; + "@babel/helper-validator-identifier-7.9.0" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; + sha512 = "6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw=="; + }; + }; "@babel/helper-wrap-function-7.8.3" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; @@ -508,31 +517,31 @@ let sha512 = "LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ=="; }; }; - "@babel/helpers-7.8.4" = { + "@babel/helpers-7.9.2" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.8.4"; + version = "7.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz"; - sha512 = "VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz"; + sha512 = "JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA=="; }; }; - "@babel/highlight-7.8.3" = { + "@babel/highlight-7.9.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz"; - sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; + sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; }; - "@babel/parser-7.8.8" = { + "@babel/parser-7.9.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.8.8"; + version = "7.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz"; - sha512 = "mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz"; + sha512 = "bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -589,13 +598,22 @@ let sha512 = "TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.8.3" = { + "@babel/plugin-proposal-numeric-separator-7.8.3" = { + name = "_at_babel_slash_plugin-proposal-numeric-separator"; + packageName = "@babel/plugin-proposal-numeric-separator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz"; + sha512 = "jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ=="; + }; + }; + "@babel/plugin-proposal-object-rest-spread-7.9.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz"; - sha512 = "8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; + sha512 = "UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.8.3" = { @@ -607,13 +625,13 @@ let sha512 = "0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.8.3" = { + "@babel/plugin-proposal-optional-chaining-7.9.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz"; - sha512 = "QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz"; + sha512 = "NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w=="; }; }; "@babel/plugin-proposal-unicode-property-regex-7.8.8" = { @@ -688,6 +706,15 @@ let sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; }; }; + "@babel/plugin-syntax-numeric-separator-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-numeric-separator"; + packageName = "@babel/plugin-syntax-numeric-separator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz"; + sha512 = "H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw=="; + }; + }; "@babel/plugin-syntax-object-rest-spread-7.8.3" = { name = "_at_babel_slash_plugin-syntax-object-rest-spread"; packageName = "@babel/plugin-syntax-object-rest-spread"; @@ -769,13 +796,13 @@ let sha512 = "pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w=="; }; }; - "@babel/plugin-transform-classes-7.8.6" = { + "@babel/plugin-transform-classes-7.9.2" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.8.6"; + version = "7.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz"; - sha512 = "k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; + sha512 = "TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ=="; }; }; "@babel/plugin-transform-computed-properties-7.8.3" = { @@ -823,22 +850,22 @@ let sha512 = "zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.8.3" = { + "@babel/plugin-transform-flow-strip-types-7.9.0" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz"; - sha512 = "g/6WTWG/xbdd2exBBzMfygjX/zw4eyNC4X8pRaq7aRHRoDUCzAIu3kGYIXviOv8BjCuWm8vDBwjHcjiRNgXrPA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz"; + sha512 = "7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg=="; }; }; - "@babel/plugin-transform-for-of-7.8.6" = { + "@babel/plugin-transform-for-of-7.9.0" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.8.6"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz"; - sha512 = "M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; + sha512 = "lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ=="; }; }; "@babel/plugin-transform-function-name-7.8.3" = { @@ -868,40 +895,40 @@ let sha512 = "3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA=="; }; }; - "@babel/plugin-transform-modules-amd-7.8.3" = { + "@babel/plugin-transform-modules-amd-7.9.0" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz"; - sha512 = "MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; + sha512 = "vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.8.3" = { + "@babel/plugin-transform-modules-commonjs-7.9.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz"; - sha512 = "JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; + sha512 = "qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.8.3" = { + "@babel/plugin-transform-modules-systemjs-7.9.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz"; - sha512 = "8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; + sha512 = "FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ=="; }; }; - "@babel/plugin-transform-modules-umd-7.8.3" = { + "@babel/plugin-transform-modules-umd-7.9.0" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz"; - sha512 = "evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; + sha512 = "uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ=="; }; }; "@babel/plugin-transform-named-capturing-groups-regex-7.8.3" = { @@ -931,13 +958,13 @@ let sha512 = "57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ=="; }; }; - "@babel/plugin-transform-parameters-7.8.8" = { + "@babel/plugin-transform-parameters-7.9.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.8.8"; + version = "7.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz"; - sha512 = "hC4Ld/Ulpf1psQciWWwdnUspQoQco2bMzSrwU6TmzRlvoYQe4rQFy9vnCZDTlVeCQj0JPfL+1RX0V8hCJvkgBA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz"; + sha512 = "fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg=="; }; }; "@babel/plugin-transform-property-literals-7.8.3" = { @@ -949,13 +976,13 @@ let sha512 = "uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg=="; }; }; - "@babel/plugin-transform-react-jsx-7.8.3" = { + "@babel/plugin-transform-react-jsx-7.9.4" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.8.3"; + version = "7.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz"; - sha512 = "r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz"; + sha512 = "Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw=="; }; }; "@babel/plugin-transform-regenerator-7.8.7" = { @@ -976,13 +1003,13 @@ let sha512 = "mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A=="; }; }; - "@babel/plugin-transform-runtime-7.8.3" = { + "@babel/plugin-transform-runtime-7.9.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz"; - sha512 = "/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; + sha512 = "pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw=="; }; }; "@babel/plugin-transform-shorthand-properties-7.8.3" = { @@ -1030,13 +1057,13 @@ let sha512 = "2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg=="; }; }; - "@babel/plugin-transform-typescript-7.8.7" = { + "@babel/plugin-transform-typescript-7.9.4" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.8.7"; + version = "7.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.7.tgz"; - sha512 = "7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz"; + sha512 = "yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w=="; }; }; "@babel/plugin-transform-unicode-regex-7.8.3" = { @@ -1057,22 +1084,31 @@ let sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ=="; }; }; - "@babel/preset-env-7.8.7" = { + "@babel/preset-env-7.9.0" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.8.7"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz"; - sha512 = "BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz"; + sha512 = "712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ=="; }; }; - "@babel/preset-flow-7.8.3" = { + "@babel/preset-flow-7.9.0" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.8.3.tgz"; - sha512 = "iCXFk+T4demnq+dNLLvlGOgvYF6sPZ/hS1EmswugOqh1Ysp2vuiqJzpgsnp5rW8+6dLJT/0CXDzye28ZH6BAfQ=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.9.0.tgz"; + sha512 = "88uSmlshIrlmPkNkEcx3UpSZ6b8n0UGBq0/0ZMZCF/uxAW0XIAUuDHBhIOAh0pvweafH4RxOwi/H3rWhtqOYPA=="; + }; + }; + "@babel/preset-modules-0.1.3" = { + name = "_at_babel_slash_preset-modules"; + packageName = "@babel/preset-modules"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; }; }; "@babel/preset-stage-2-7.8.3" = { @@ -1084,22 +1120,22 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.8.3" = { + "@babel/preset-typescript-7.9.0" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz"; - sha512 = "qee5LgPGui9zQ0jR1TeU5/fP9L+ovoArklEqY12ek8P/wV5ZeM/VYSQYwICeoT6FfpJTekG9Ilay5PhwsOpMHA=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz"; + sha512 = "S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg=="; }; }; - "@babel/register-7.8.6" = { + "@babel/register-7.9.0" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.8.6"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.8.6.tgz"; - sha512 = "7IDO93fuRsbyml7bAafBQb3RcBGlCpU4hh5wADA2LJEEcYk92WkwFZ0pHyIi2fb5Auoz1714abETdZKCOxN0CQ=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.9.0.tgz"; + sha512 = "Tv8Zyi2J2VRR8g7pC5gTeIN8Ihultbmk0ocyNz8H2nEZbmhp1N6q0A1UGsQbDvGP/sNinQKUHf3SqXwqjtFv4Q=="; }; }; "@babel/runtime-7.7.7" = { @@ -1111,22 +1147,22 @@ let sha512 = "uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA=="; }; }; - "@babel/runtime-7.8.7" = { + "@babel/runtime-7.9.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.8.7"; + version = "7.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz"; - sha512 = "+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"; + sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; }; }; - "@babel/runtime-corejs3-7.8.7" = { + "@babel/runtime-corejs3-7.9.2" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.8.7"; + version = "7.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz"; - sha512 = "sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz"; + sha512 = "HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA=="; }; }; "@babel/template-7.8.6" = { @@ -1138,13 +1174,13 @@ let sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg=="; }; }; - "@babel/traverse-7.8.6" = { + "@babel/traverse-7.9.0" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.8.6"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz"; - sha512 = "2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz"; + sha512 = "jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -1165,13 +1201,13 @@ let sha512 = "wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA=="; }; }; - "@babel/types-7.8.7" = { + "@babel/types-7.9.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.8.7"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz"; - sha512 = "k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz"; + sha512 = "BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng=="; }; }; "@chemzqm/neovim-5.1.9" = { @@ -2587,22 +2623,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.0.6" = { + "@schematics/angular-9.0.7" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.6.tgz"; - sha512 = "oYIfSJF9ISAJWJjIiUnj8Rp1m4t9T3oqKl1FzkMWXvUmR1BfkO2S2/Moi2RQ0aHG6D9Oz4CJjrsQRmjaqBpEZw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.7.tgz"; + sha512 = "3UCeexYx/YVo3kboyPZ8KgqBTduMA18AAm3s2yrC0qj41fBFVVZAZLa74uouTf4RYVgy9kR7J3uv6VLxrJPOnQ=="; }; }; - "@schematics/update-0.900.6" = { + "@schematics/update-0.900.7" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.900.6"; + version = "0.900.7"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.6.tgz"; - sha512 = "54Xi3FIJQWFBM91vxD9ciKkTlNWaIV7wsjKSImg53h2m2/l2VPPHyIZWI4j79dWXlfJVTNeaqPNYGzJlRvaEmA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.7.tgz"; + sha512 = "e9tX2DGNYfj/k9mVICpQt2bWIYyD92dlsip7LzPeZGt+R9zCp5w19uBLa8Z00OgEGzFR1krhRvkQE5OxkkAnVw=="; }; }; "@serverless/cli-1.4.0" = { @@ -2641,13 +2677,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.5.0" = { + "@serverless/enterprise-plugin-3.6.0" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.5.0.tgz"; - sha512 = "AyY7ADtUItSQFQjNRaXZ5ZgMVeeUJZ05UJHxN3WbO9c3fY6/6TxAQRlrDB2O5hfSPkBDfqhUOSp2xbBwIVg/Tw=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.0.tgz"; + sha512 = "nOefmzh6fz1vY9tfUzDNYVyg1jlsOVdmbp3JVMZMsMhIKQvBpGZYcaAboSyU97pIOFYUlsSBVQsc57IuLsIeiQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -2839,6 +2875,15 @@ let sha512 = "dlled3mfpnAt3cQb5hxkFiqfPCj4Yk0xV8Yl5P8PeVv1pUmO7vI4Ka4Mjs4r6CYM5f9kZhviFPQQcWOIDlMRcw=="; }; }; + "@sorg/log-2.1.0" = { + name = "_at_sorg_slash_log"; + packageName = "@sorg/log"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sorg/log/-/log-2.1.0.tgz"; + sha512 = "weyuceH7eLZGlQLwA9+c2vxCWtWLe0vt4ma9qHzvB7aIbEZkAUXsONytEza6vNq2hIeL3/lRFRoGeiuBbnFfaA=="; + }; + }; "@starptech/expression-parser-0.10.0" = { name = "_at_starptech_slash_expression-parser"; packageName = "@starptech/expression-parser"; @@ -2848,15 +2893,6 @@ let sha512 = "HcNE5lqbBd0CNMArErVboWZ9PyJ8Hqp0VGnLJXkA3e38r6/VjhFa2pcsoJQGQiiuHj6napSMr3s+Gc34WUGhzw=="; }; }; - "@starptech/expression-parser-0.9.0" = { - name = "_at_starptech_slash_expression-parser"; - packageName = "@starptech/expression-parser"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/expression-parser/-/expression-parser-0.9.0.tgz"; - sha512 = "a4CFSYZ3klnflR/rkvN87T2r/n+RxfMhDaZlrWYBaCHcbPhX+2THWyKAn82vT6Ari3SPp3XOsTqUZK4Vx2qcTA=="; - }; - }; "@starptech/hast-util-from-webparser-0.10.0" = { name = "_at_starptech_slash_hast-util-from-webparser"; packageName = "@starptech/hast-util-from-webparser"; @@ -2866,15 +2902,6 @@ let sha512 = "ebBrqxnkk4uhOkYXi0EMsHLrUrpGUjAMGz++04HPZmZYfpEZjaHxF3VmhfTWnS6u8SGUtsDPMQ+RxHSvrsNxZg=="; }; }; - "@starptech/hast-util-from-webparser-0.9.0" = { - name = "_at_starptech_slash_hast-util-from-webparser"; - packageName = "@starptech/hast-util-from-webparser"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/hast-util-from-webparser/-/hast-util-from-webparser-0.9.0.tgz"; - sha512 = "evqGr0KOXB27vu/KiNv6gmd/ggygzwYvINVsCWF6GAd1SFQNS4Vz2wv4tmiktX6rcr6Qq+jBwVXvVwe60d5Z3g=="; - }; - }; "@starptech/prettyhtml-0.10.0" = { name = "_at_starptech_slash_prettyhtml"; packageName = "@starptech/prettyhtml"; @@ -2884,15 +2911,6 @@ let sha512 = "d79qc81gX5oyiv0Ioz82NEMnO/waltC7HAOlZ8r/es/zPuRilWMRo5ZCV00/80ZsQ0MiCIuhAnvUcg7rVzFDLg=="; }; }; - "@starptech/prettyhtml-0.9.0" = { - name = "_at_starptech_slash_prettyhtml"; - packageName = "@starptech/prettyhtml"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/prettyhtml/-/prettyhtml-0.9.0.tgz"; - sha512 = "GekZtpBSdlFo732AxrpO7W8ue1dEZdpMK0kNHD/NVDBNU/50/D0NJ72FD2HKLh0Aune9uK+x8b+9MbBFJ2JT9A=="; - }; - }; "@starptech/prettyhtml-formatter-0.10.0" = { name = "_at_starptech_slash_prettyhtml-formatter"; packageName = "@starptech/prettyhtml-formatter"; @@ -2902,15 +2920,6 @@ let sha512 = "AEpBQTRHhgB9NmQZNXINo/ObavGLATEvS41MgiJljsiSHzfUX3ltOPLI2fy9VfDB3E76mjUqIfmEQ/v5lJ5Cfw=="; }; }; - "@starptech/prettyhtml-formatter-0.9.0" = { - name = "_at_starptech_slash_prettyhtml-formatter"; - packageName = "@starptech/prettyhtml-formatter"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/prettyhtml-formatter/-/prettyhtml-formatter-0.9.0.tgz"; - sha512 = "uyG90dzyERExzQg7VTYJm3uBs6hIW81MDvqACgiFgmaafTrveKebJxAZpkbkAgTesvNmApM2I0b5Tu4OKHmaKQ=="; - }; - }; "@starptech/prettyhtml-hast-to-html-0.10.0" = { name = "_at_starptech_slash_prettyhtml-hast-to-html"; packageName = "@starptech/prettyhtml-hast-to-html"; @@ -2920,15 +2929,6 @@ let sha512 = "TAbm1q6bCBl13i8FbY/1eHMnTHWr/kLM5RcOD1S6F3T12DwhMwcqagMzqPQc4tT1DmyLzGWY8SA/p3HrB0iPcg=="; }; }; - "@starptech/prettyhtml-hast-to-html-0.9.0" = { - name = "_at_starptech_slash_prettyhtml-hast-to-html"; - packageName = "@starptech/prettyhtml-hast-to-html"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/prettyhtml-hast-to-html/-/prettyhtml-hast-to-html-0.9.0.tgz"; - sha512 = "PcMRqtwXBDsliBC6nesNlDaO0a4uqC2uwfqbz/1VRaFVEInudMQ00fbRjv3Fql5C2YZ1MObMwre/+W7UDuzcIw=="; - }; - }; "@starptech/prettyhtml-hastscript-0.10.0" = { name = "_at_starptech_slash_prettyhtml-hastscript"; packageName = "@starptech/prettyhtml-hastscript"; @@ -2938,15 +2938,6 @@ let sha512 = "oSZB/CXRagbJ1UAGihSsdDcvHIGa+ivdVVmljWtJDqO5+FfFn9utzCw/QI9NAV3m9cgFWRdW/6TkXwbdPrIQ4A=="; }; }; - "@starptech/prettyhtml-hastscript-0.9.0" = { - name = "_at_starptech_slash_prettyhtml-hastscript"; - packageName = "@starptech/prettyhtml-hastscript"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/prettyhtml-hastscript/-/prettyhtml-hastscript-0.9.0.tgz"; - sha512 = "ifXB3oqZl5LMMaFuQvfUYF0e+XdGDeQoIzFQYdA59cJ+RgjGdsjgFMmvkW+kxZwMWRYyAsLsYuJ19UfIWO8ymQ=="; - }; - }; "@starptech/prettyhtml-sort-attributes-0.10.0" = { name = "_at_starptech_slash_prettyhtml-sort-attributes"; packageName = "@starptech/prettyhtml-sort-attributes"; @@ -2956,15 +2947,6 @@ let sha512 = "ctsjmEEsxzW4dzMOIwYRWQvqfilgdGFaZn+lIxiNuPJIL4V4ZpgQhT96Us5BQcalHYQqQsKF+nRelCWFhd67IQ=="; }; }; - "@starptech/prettyhtml-sort-attributes-0.9.0" = { - name = "_at_starptech_slash_prettyhtml-sort-attributes"; - packageName = "@starptech/prettyhtml-sort-attributes"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/prettyhtml-sort-attributes/-/prettyhtml-sort-attributes-0.9.0.tgz"; - sha512 = "jj4btXkDU0dnY8llM6Cv+6arqVIjfaHhrfLnaaiVdLLb02f1eazMIr8+4jfK0Dol4Bfg3AC3RIYAyu2Kd7FF6g=="; - }; - }; "@starptech/rehype-minify-whitespace-0.10.0" = { name = "_at_starptech_slash_rehype-minify-whitespace"; packageName = "@starptech/rehype-minify-whitespace"; @@ -2974,15 +2956,6 @@ let sha512 = "11k2dW0ju2hMuSfQ9znXqeCjyBtkfY7BRoyPjDLiVCsGIlqM2JpZhx46sFTF3JJOsJz9pr2HQ8Cvf4oTt9hgvg=="; }; }; - "@starptech/rehype-minify-whitespace-0.9.0" = { - name = "_at_starptech_slash_rehype-minify-whitespace"; - packageName = "@starptech/rehype-minify-whitespace"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/rehype-minify-whitespace/-/rehype-minify-whitespace-0.9.0.tgz"; - sha512 = "z4CL6TCdHyXVZGU6I632Un5g2MmIsYhnsYVerAW4DKf3Zyc5Nam2U+wVdbE2nLqTInDUpUr4vmzksD8tHsY9Ew=="; - }; - }; "@starptech/rehype-webparser-0.10.0" = { name = "_at_starptech_slash_rehype-webparser"; packageName = "@starptech/rehype-webparser"; @@ -2992,15 +2965,6 @@ let sha512 = "1CPMVKrgXjKnehAouQBa2wWkikR6jD+BZ+8/v1RDH1S1a293fOzItU63W3VIx4zv3n0iMgrTWeeyfpk/9cT4LQ=="; }; }; - "@starptech/rehype-webparser-0.9.0" = { - name = "_at_starptech_slash_rehype-webparser"; - packageName = "@starptech/rehype-webparser"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/rehype-webparser/-/rehype-webparser-0.9.0.tgz"; - sha512 = "Ndv/excuCjdRIUWtzD5YQMvuZudMvjtYmNhLllzYEzMq6+nkPrhaORuUNihDG1SYZI260CXV1khDTGqPc581Yg=="; - }; - }; "@starptech/webparser-0.10.0" = { name = "_at_starptech_slash_webparser"; packageName = "@starptech/webparser"; @@ -3010,15 +2974,6 @@ let sha512 = "vA/p1LTVfuK8dP+EhBglMS7ll3dZahBjnvjwUiJ8NNUCqH5pSAj3tcRtOG3k7k1Wx1hWHJpGgZVj0VNQIo99bA=="; }; }; - "@starptech/webparser-0.9.0" = { - name = "_at_starptech_slash_webparser"; - packageName = "@starptech/webparser"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@starptech/webparser/-/webparser-0.9.0.tgz"; - sha512 = "QEC1yjpsOtj3leNCWZGirAyVCN7WJDH+rUhfMVGQuLEfoJNKK66t/UWAOrXeGxR2jdU5IffAGnqZIHbFMX6SNw=="; - }; - }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -3352,13 +3307,13 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-0.0.42" = { + "@types/estree-0.0.44" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.42"; + version = "0.0.44"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz"; - sha512 = "K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz"; + sha512 = "iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g=="; }; }; "@types/events-3.0.0" = { @@ -3379,13 +3334,13 @@ let sha512 = "5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA=="; }; }; - "@types/express-serve-static-core-4.17.2" = { + "@types/express-serve-static-core-4.17.3" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.2"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz"; - sha512 = "El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.3.tgz"; + sha512 = "sHEsvEzjqN+zLbqP+8OXTipc10yH1QLR+hnr5uw29gi9AhCAAAdri8ClNV7iMdrJrIzXIQtlkPvq8tJGhj3QJQ=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -3577,13 +3532,13 @@ let sha512 = "gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q=="; }; }; - "@types/node-13.9.1" = { + "@types/node-13.9.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.9.1"; + version = "13.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz"; - sha512 = "E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz"; + sha512 = "01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="; }; }; "@types/node-6.14.9" = { @@ -3757,6 +3712,15 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; + "@types/yoga-layout-1.9.1" = { + name = "_at_types_slash_yoga-layout"; + packageName = "@types/yoga-layout"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.1.tgz"; + sha512 = "OpfgQXWLZn5Dl7mOd8dBNcV8NywXbYYoHjUpa64vJ/RQABaxMzJ5bVicKLGIvIiMnQPtPgKNgXb5jkv9fkOQtw=="; + }; + }; "@types/zen-observable-0.8.0" = { name = "_at_types_slash_zen-observable"; packageName = "@types/zen-observable"; @@ -3793,6 +3757,15 @@ let sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; }; }; + "@typescript-eslint/typescript-estree-2.25.0" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "2.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz"; + sha512 = "VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg=="; + }; + }; "@vue/cli-shared-utils-4.2.3" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -3838,15 +3811,6 @@ let sha512 = "gDrC14Ae2b4gP9vYdCzx6ytY4LuYoH3I0h0QzU9RPifGPgjXz8F3s5g9632P7Wf39vQQg6XQ0Bfv29rc5RoTmw=="; }; }; - "@webassemblyjs/ast-1.8.5" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz"; - sha512 = "aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ=="; - }; - }; "@webassemblyjs/ast-1.9.0" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -3865,15 +3829,6 @@ let sha512 = "g50x4xV7o2b39pB+uppF3kibFXhb9Dl4Jj3fj18eqWPGBgabreIwQmw3B5Uc6Y7Ec7ZZJ8TrUe79swN3iBaPDQ=="; }; }; - "@webassemblyjs/floating-point-hex-parser-1.8.5" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz"; - sha512 = "9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ=="; - }; - }; "@webassemblyjs/floating-point-hex-parser-1.9.0" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; @@ -3892,15 +3847,6 @@ let sha512 = "79RidFwQOl8vG+Wv1uQWfCw4JQO5XR8iQcNGKLum3oPsSG8jkuEK5ILT6NxT3MNOa+xwSd3d+YqVFB1V0/W7/w=="; }; }; - "@webassemblyjs/helper-api-error-1.8.5" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz"; - sha512 = "Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA=="; - }; - }; "@webassemblyjs/helper-api-error-1.9.0" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; @@ -3919,13 +3865,13 @@ let sha512 = "ex3cnmE6V0JfCBIesxF70vsPvh/QNOfaIsL5N0lkiJjVDl65YjH/WZxLe0nTuIuvVQhZH7DdRzUm0G9g12YACg=="; }; }; - "@webassemblyjs/helper-buffer-1.8.5" = { + "@webassemblyjs/helper-buffer-1.9.0" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz"; - sha512 = "Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; + sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; }; }; "@webassemblyjs/helper-code-frame-1.8.1" = { @@ -3937,15 +3883,6 @@ let sha512 = "vSs2ObU/pbPXrvMqfpEUnvTcvlhwHT3ochBdekn+cv5zYR1wtmAIj+UXrmzbkBQYff/yTrZgaeqkFaT3fLLOrA=="; }; }; - "@webassemblyjs/helper-code-frame-1.8.5" = { - name = "_at_webassemblyjs_slash_helper-code-frame"; - packageName = "@webassemblyjs/helper-code-frame"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz"; - sha512 = "VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ=="; - }; - }; "@webassemblyjs/helper-code-frame-1.9.0" = { name = "_at_webassemblyjs_slash_helper-code-frame"; packageName = "@webassemblyjs/helper-code-frame"; @@ -3982,15 +3919,6 @@ let sha512 = "WeXD3ZkKi2wpAXqPW+COawoNb0Vcu3OGoaQv8/cL3VpTfGO85ZN30h/6CjUHLISGZtpZxQu3D7AuJmI/rlEqAw=="; }; }; - "@webassemblyjs/helper-fsm-1.8.5" = { - name = "_at_webassemblyjs_slash_helper-fsm"; - packageName = "@webassemblyjs/helper-fsm"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz"; - sha512 = "kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow=="; - }; - }; "@webassemblyjs/helper-fsm-1.9.0" = { name = "_at_webassemblyjs_slash_helper-fsm"; packageName = "@webassemblyjs/helper-fsm"; @@ -4009,15 +3937,6 @@ let sha512 = "657xpRy6lptA7oCIgOKQAHElsgAXliqutMPLjoEL2T5Uyp1cIDUH7axmphu7bb5U+ZUpwApnZHvdvyJYGDOxsQ=="; }; }; - "@webassemblyjs/helper-module-context-1.8.5" = { - name = "_at_webassemblyjs_slash_helper-module-context"; - packageName = "@webassemblyjs/helper-module-context"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz"; - sha512 = "/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g=="; - }; - }; "@webassemblyjs/helper-module-context-1.9.0" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; @@ -4036,15 +3955,6 @@ let sha512 = "MDdqmxj6ea1qfHBLKVHaF2+IyWLQtw8+bvRaeZc4MtcO7dNBz/2cZZ/GCFN9kGTJVvhe37tkeCi2JAB3evoU2w=="; }; }; - "@webassemblyjs/helper-wasm-bytecode-1.8.5" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz"; - sha512 = "Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ=="; - }; - }; "@webassemblyjs/helper-wasm-bytecode-1.9.0" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; @@ -4063,13 +3973,13 @@ let sha512 = "FlNdlARr+mcP8XL+wg6bXqgC+0ZwnltqXExw63e9cgK84bAdTwKnfX9k6CKg8qvK5e/d9dUmk0dkVrkyEpKx5w=="; }; }; - "@webassemblyjs/helper-wasm-section-1.8.5" = { + "@webassemblyjs/helper-wasm-section-1.9.0" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz"; - sha512 = "VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; + sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; }; }; "@webassemblyjs/ieee754-1.8.1" = { @@ -4081,15 +3991,6 @@ let sha512 = "Pq3IQR3uay+rFC0qIgg6xvD+uu0a9QEWDCRihHuU9wmOBFW3Lda/ObnO0HjC7XUJ8A9h4xExaa1w5TsSk+DxIQ=="; }; }; - "@webassemblyjs/ieee754-1.8.5" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz"; - sha512 = "aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g=="; - }; - }; "@webassemblyjs/ieee754-1.9.0" = { name = "_at_webassemblyjs_slash_ieee754"; packageName = "@webassemblyjs/ieee754"; @@ -4108,15 +4009,6 @@ let sha512 = "Ir8M3hgTzFLEOKmMMH44neM6sLESfEoSCjNsOInETxbSpPY1MKOsFSAxCUaeXhjtLQfflCCdjgSsU+2veP6SGw=="; }; }; - "@webassemblyjs/leb128-1.8.5" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz"; - sha512 = "plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A=="; - }; - }; "@webassemblyjs/leb128-1.9.0" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; @@ -4135,15 +4027,6 @@ let sha512 = "I5QQEb5ajQ99ARiyDrVQM/2nvyFFG0tF1TX2Ql7dOjw5GRT6P4FF+gRk7OeAUtI1CLyffUNWbIvpJz13crGSxw=="; }; }; - "@webassemblyjs/utf8-1.8.5" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz"; - sha512 = "U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw=="; - }; - }; "@webassemblyjs/utf8-1.9.0" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; @@ -4162,13 +4045,13 @@ let sha512 = "ysKeFNEWX8r45OXHtH0UPkqFM5qeUd+887+KnDob6kCrryqjNNyW3Ew+fTI8u1vzg7VUXYOJqxXplRUF6cfsfA=="; }; }; - "@webassemblyjs/wasm-edit-1.8.5" = { + "@webassemblyjs/wasm-edit-1.9.0" = { name = "_at_webassemblyjs_slash_wasm-edit"; packageName = "@webassemblyjs/wasm-edit"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz"; - sha512 = "A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; + sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; }; }; "@webassemblyjs/wasm-gen-1.8.1" = { @@ -4180,22 +4063,22 @@ let sha512 = "xOgoGf6rR6gHlhlNlU0EfMIgDAjbLCO2cNdEIKdGfKj2/fc02pbAyS3gYJ6EWAzSnL/XpAOf3Q/trp/EUeikug=="; }; }; - "@webassemblyjs/wasm-gen-1.8.5" = { + "@webassemblyjs/wasm-gen-1.9.0" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz"; - sha512 = "BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; + sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; }; }; - "@webassemblyjs/wasm-opt-1.8.5" = { + "@webassemblyjs/wasm-opt-1.9.0" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; - version = "1.8.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz"; - sha512 = "HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; + sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; }; }; "@webassemblyjs/wasm-parser-1.8.1" = { @@ -4207,15 +4090,6 @@ let sha512 = "k63WJZdIjTQgZt+cn8rsIEvW0aNKttGip6ygTE/ZPXKZsMTk0G5xyw+MQxphbvt/GYbNu5DdxGN/7WGybO95TA=="; }; }; - "@webassemblyjs/wasm-parser-1.8.5" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz"; - sha512 = "pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw=="; - }; - }; "@webassemblyjs/wasm-parser-1.9.0" = { name = "_at_webassemblyjs_slash_wasm-parser"; packageName = "@webassemblyjs/wasm-parser"; @@ -4234,15 +4108,6 @@ let sha512 = "iXjhXGhZeZIAnWkHD2G4ZOx8x5GYux5dwHuQL/AU8jb2H3BxolxVvNdpDmBTQPKDAgAAEeCFDnftNf4xNR9KMQ=="; }; }; - "@webassemblyjs/wast-parser-1.8.5" = { - name = "_at_webassemblyjs_slash_wast-parser"; - packageName = "@webassemblyjs/wast-parser"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz"; - sha512 = "daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg=="; - }; - }; "@webassemblyjs/wast-parser-1.9.0" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; @@ -4261,15 +4126,6 @@ let sha512 = "YYRBpDCBLeYJBO+sVapLRkEE/+wrjv1O03IEybkqyls3sCZqhu3ZXjJwMSMCgFEyYP2MrdZvqL/dz2RBnULTbA=="; }; }; - "@webassemblyjs/wast-printer-1.8.5" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz"; - sha512 = "w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg=="; - }; - }; "@webassemblyjs/wast-printer-1.9.0" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; @@ -5827,6 +5683,15 @@ let sha512 = "rPMUMkR8JjjPDDHHDZ/YeLO0KIbUGCrXgy921F6sBkEXBR9jYYxK8LUlwpZkUVi70cMR6r8uSmHZ/5HvtrntHg=="; }; }; + "append-type-1.0.2" = { + name = "append-type"; + packageName = "append-type"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/append-type/-/append-type-1.0.2.tgz"; + sha512 = "hac740vT/SAbrFBLgLIWZqVT5PUAcGTWS5UkDDhr+OCizZSw90WKw6sWAEgGaYd2viIblggypMXwpjzHXOvAQg=="; + }; + }; "appendable-cli-menu-2.0.0" = { name = "appendable-cli-menu"; packageName = "appendable-cli-menu"; @@ -6547,6 +6412,15 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; + "ast-module-types-2.6.0" = { + name = "ast-module-types"; + packageName = "ast-module-types"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.6.0.tgz"; + sha512 = "zXSoVaMrf2R+r+ISid5/9a8SXm1LLdkhHzh6pSRhj9jklzruOOl1hva1YmFT33wAstg/f9ZndJAlq1BSrFLSGA=="; + }; + }; "ast-types-0.13.2" = { name = "ast-types"; packageName = "ast-types"; @@ -6799,6 +6673,15 @@ let sha1 = "ef249dc869d6c07e7dfd4a22c8a18850bb39d7f1"; }; }; + "at-least-node-1.0.0" = { + name = "at-least-node"; + packageName = "at-least-node"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; + }; + }; "atob-2.1.2" = { name = "atob"; packageName = "atob"; @@ -6889,13 +6772,13 @@ let sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ=="; }; }; - "autoprefixer-9.7.4" = { + "autoprefixer-9.7.5" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "9.7.4"; + version = "9.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz"; - sha512 = "g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.5.tgz"; + sha512 = "URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg=="; }; }; "await-semaphore-0.1.3" = { @@ -6925,13 +6808,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.639.0" = { + "aws-sdk-2.644.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.639.0"; + version = "2.644.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.639.0.tgz"; - sha512 = "cbH69oV0ObZ4tapbjDqu0j3I779uscQNhRaewjIJY5O5At4RULtd7us24n72FtT4HIwM9cwORzVxA9rK6DHKOA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.644.0.tgz"; + sha512 = "FkglRU5fvWHwT2Ll0caXS/QzRNzh5ZCS5cs4pF2nP0OjdD7VNJhNtu5lOnSzvMHAtZQJMsG3k0em8PoI8vk1AQ=="; }; }; "aws-sign2-0.6.0" = { @@ -7078,13 +6961,13 @@ let sha512 = "tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg=="; }; }; - "babel-loader-8.0.6" = { + "babel-loader-8.1.0" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.0.6"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz"; - sha512 = "4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"; + sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; }; }; "babel-plugin-dynamic-import-node-2.3.0" = { @@ -7735,13 +7618,13 @@ let sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; }; }; - "bezier-js-2.5.1" = { + "bezier-js-2.6.0" = { name = "bezier-js"; packageName = "bezier-js"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.5.1.tgz"; - sha512 = "a+U+hOQWIx1aM37TZLGbAH1Hw0YdsuBTWYNlFudz/V/CvOM56gl5RyPoH0pUwuIqg1LAhDtoA3uRVYl0ZJpi5w=="; + url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.6.0.tgz"; + sha512 = "BBnddaIUivrZYXUIbyEJrFWkjU0hFkqJyqfIbANPwUQfFr3Ec61qLaFEys7VmNIwsdHL24FJZsS6MKrY7HyudQ=="; }; }; "biased-opener-0.2.8" = { @@ -7969,13 +7852,13 @@ let sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; }; }; - "bl-4.0.1" = { + "bl-4.0.2" = { name = "bl"; packageName = "bl"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.0.1.tgz"; - sha512 = "FL/TdvchukRCuWVxT0YMO/7+L5TNeNrVFvRU2IY63aUyv9mpt8splf2NEr6qXtPo5fya5a66YohQKvGNmLrWNA=="; + url = "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz"; + sha512 = "j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ=="; }; }; "blake2b-2.1.3" = { @@ -8581,13 +8464,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.9.1" = { + "browserslist-4.11.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.9.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz"; - sha512 = "Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.0.tgz"; + sha512 = "WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A=="; }; }; "bser-2.1.1" = { @@ -8851,6 +8734,15 @@ let sha512 = "jzQnSbdJqhIltU9O5KUiTtljP9ccw2u5ix59McQy4pV2xGhVLhRZIndY8GIrgh5HjXa6+QJ9AQhOd2QWQizJFQ=="; }; }; + "build-purescript-0.4.1" = { + name = "build-purescript"; + packageName = "build-purescript"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/build-purescript/-/build-purescript-0.4.1.tgz"; + sha512 = "wHoafIs4c1yDJspybVilXRQZUauaxdGPkZU0HdJdu968uei7O4yS/cp/h1O4zIMVDu9MN6/sYDCLnhQA3iLAYA=="; + }; + }; "builtin-modules-1.1.1" = { name = "builtin-modules"; packageName = "builtin-modules"; @@ -9040,13 +8932,13 @@ let sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; }; }; - "cacache-12.0.3" = { + "cacache-12.0.4" = { name = "cacache"; packageName = "cacache"; - version = "12.0.3"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz"; - sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw=="; + url = "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz"; + sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; "cacache-15.0.0" = { @@ -9076,13 +8968,13 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; - "cacheable-lookup-2.0.0" = { + "cacheable-lookup-2.0.1" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.0.tgz"; - sha512 = "s2piO6LvA7xnL1AR03wuEdSx3BZT3tIJpZ56/lcJwzO/6DTJZlTs7X3lrvPxk6d1PlDe6PrVe2TjlUIZNFglAQ=="; + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; + sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; }; }; "cacheable-request-2.1.4" = { @@ -9310,6 +9202,24 @@ let sha512 = "BPCNVH56RVIxQQIXskp5tLQXUNGQ6sXr7iCv1FHDt81xBOQ/1r6H8SPxf19InVP6DexWar4s87q9thfuk8X9HA=="; }; }; + "cancelable-pipeline-1.0.0" = { + name = "cancelable-pipeline"; + packageName = "cancelable-pipeline"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cancelable-pipeline/-/cancelable-pipeline-1.0.0.tgz"; + sha512 = "vsimf+py0scGFJyZXsawF7h2ZJ6A1p5FXjieXjQ36kZyigWKYTDW3VjiYPTj+tFqdzQzYz+XV8J24Dtc88pmGQ=="; + }; + }; + "cancelable-pump-0.4.0" = { + name = "cancelable-pump"; + packageName = "cancelable-pump"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cancelable-pump/-/cancelable-pump-0.4.0.tgz"; + sha512 = "7Yvp8ADC9exD0Kdq/Q35UD5wOiuXTTLp159gFHC+uMQvjRMllrsM6EUKnozmIe43yesLBiH/ni0KD69k07yzZQ=="; + }; + }; "caniuse-api-3.0.0" = { name = "caniuse-api"; packageName = "caniuse-api"; @@ -9319,13 +9229,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001035" = { + "caniuse-lite-1.0.30001036" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001035"; + version = "1.0.30001036"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz"; - sha512 = "C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001036.tgz"; + sha512 = "jU8CIFIj2oR7r4W+5AKcsvWNVIb6Q6OZE3UsrXrZBHFtreT4YgTeOJtTucp+zSedEpTi3L5wASSP0LYIE3if6w=="; }; }; "capture-exit-2.0.0" = { @@ -10282,13 +10192,13 @@ let sha512 = "2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA=="; }; }; - "clipboardy-2.2.0" = { + "clipboardy-2.3.0" = { name = "clipboardy"; packageName = "clipboardy"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.2.0.tgz"; - sha512 = "9ry9nC3VFULNmoEIqvuRwCIQ9M7wjnm4O+yvk7xkmhR+7FAUWaeX751oeYJbORg0h0zmqW1EVDoZK8f7yapwbg=="; + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz"; + sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; }; }; "clipper-lib-1.0.0" = { @@ -10579,13 +10489,13 @@ let sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; }; }; - "coc.nvim-0.0.76" = { + "coc.nvim-0.0.77" = { name = "coc.nvim"; packageName = "coc.nvim"; - version = "0.0.76"; + version = "0.0.77"; src = fetchurl { - url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.76.tgz"; - sha512 = "URa4r4dXcvotXJDKwgzHgMk9+vRFjO7tePKnznKF7XK+ApewV4aoibQ3NzC4xMWuDGto5RWWlHlWWOd5orDiOQ=="; + url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.77.tgz"; + sha512 = "wwn3ca7iMKuH/a6NAV7HL95xkEK5DzrKJ1dWGKBs+HZHFLhzXVYhjA0RL8x8Xf62TBEQGhH1wlKtBxkluGd1oQ=="; }; }; "code-point-at-1.1.0" = { @@ -12407,6 +12317,15 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; + "css-tree-1.0.0-alpha.39" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha.39"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; + sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; + }; + }; "css-what-2.1.3" = { name = "css-what"; packageName = "css-what"; @@ -12506,13 +12425,13 @@ let sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; - "csso-4.0.2" = { + "csso-4.0.3" = { name = "csso"; packageName = "csso"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz"; - sha512 = "kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg=="; + url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz"; + sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ=="; }; }; "cssom-0.3.8" = { @@ -12524,6 +12443,15 @@ let sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; }; }; + "cssom-0.4.4" = { + name = "cssom"; + packageName = "cssom"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz"; + sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; + }; + }; "cssstyle-0.2.37" = { name = "cssstyle"; packageName = "cssstyle"; @@ -12542,6 +12470,24 @@ let sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA=="; }; }; + "cssstyle-2.2.0" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz"; + sha512 = "sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA=="; + }; + }; + "csstype-2.6.9" = { + name = "csstype"; + packageName = "csstype"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/csstype/-/csstype-2.6.9.tgz"; + sha512 = "xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q=="; + }; + }; "csurf-1.11.0" = { name = "csurf"; packageName = "csurf"; @@ -12938,13 +12884,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.22" = { + "dayjs-1.8.23" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.22"; + version = "1.8.23"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.22.tgz"; - sha512 = "N8IXfxBD62Y9cKTuuuSoOlCXRnnzaTj1vu91r855iq6FbY5cZqOZnW/95nUn6kJiR+W9PHHrLykEoQOe6fUKxQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.23.tgz"; + sha512 = "NmYHMFONftoZbeOhVz6jfiXI4zSiPN6NoVWJgC0aZQfYVwzy/ZpESPHuCcI0B8BUMpSJQ08zenHDbofOLKq8hQ=="; }; }; "de-indent-1.0.2" = { @@ -13163,6 +13109,15 @@ let sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; }; + "decomment-0.9.2" = { + name = "decomment"; + packageName = "decomment"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/decomment/-/decomment-0.9.2.tgz"; + sha512 = "sblyUmOJZxiL7oJ2ogJS6jtl/67+CTOW87SrYE/96u3PhDYikYoLCdLzcnceToiQejOLlqNnLCkaxx/+nE/ehg=="; + }; + }; "decompress-4.2.0" = { name = "decompress"; packageName = "decompress"; @@ -13559,6 +13514,24 @@ let sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; }; + "del-5.1.0" = { + name = "del"; + packageName = "del"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz"; + sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA=="; + }; + }; + "del-cli-3.0.0" = { + name = "del-cli"; + packageName = "del-cli"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/del-cli/-/del-cli-3.0.0.tgz"; + sha512 = "J4HDC2mpcN5aopya4VdkyiFXZaqAoo7ua9VpKbciX3DDUSbtJbPMc3ivggJsAAgS6EqonmbenIiMhBGtJPW9FA=="; + }; + }; "delay-4.3.0" = { name = "delay"; packageName = "delay"; @@ -13649,6 +13622,15 @@ let sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; + "dependency-tree-7.2.1" = { + name = "dependency-tree"; + packageName = "dependency-tree"; + version = "7.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-tree/-/dependency-tree-7.2.1.tgz"; + sha512 = "nBxnjkqDW4LqAzBazy60V4lE0mAtIQ+oers/GIIvVvGYVdCD9+RNNd4G9jjstyz7ZFVg/j/OiYCvK5MjoVqA2w=="; + }; + }; "deprecated-0.0.1" = { name = "deprecated"; packageName = "deprecated"; @@ -13802,6 +13784,87 @@ let sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; + "detective-amd-3.0.0" = { + name = "detective-amd"; + packageName = "detective-amd"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.0.tgz"; + sha512 = "kOpKHyabdSKF9kj7PqYHLeHPw+TJT8q2u48tZYMkIcas28el1CYeLEJ42Nm+563/Fq060T5WknfwDhdX9+kkBQ=="; + }; + }; + "detective-cjs-3.1.1" = { + name = "detective-cjs"; + packageName = "detective-cjs"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-cjs/-/detective-cjs-3.1.1.tgz"; + sha512 = "JQtNTBgFY6h8uT6pgph5QpV3IyxDv+z3qPk/FZRDT9TlFfm5dnRtpH39WtQEr1khqsUxVqXzKjZHpdoQvQbllg=="; + }; + }; + "detective-es6-2.1.0" = { + name = "detective-es6"; + packageName = "detective-es6"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.1.0.tgz"; + sha512 = "QSHqKGOp/YBIfmIqKXaXeq2rlL+bp3bcIQMfZ+0PvKzRlELSOSZxKRvpxVcxlLuocQv4QnOfuWGniGrmPbz8MQ=="; + }; + }; + "detective-less-1.0.2" = { + name = "detective-less"; + packageName = "detective-less"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-less/-/detective-less-1.0.2.tgz"; + sha512 = "Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA=="; + }; + }; + "detective-postcss-3.0.1" = { + name = "detective-postcss"; + packageName = "detective-postcss"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-3.0.1.tgz"; + sha512 = "tfTS2GdpUal5NY0aCqI4dpEy8Xfr88AehYKB0iBIZvo8y2g3UsrcDnrp9PR2FbzoW7xD5Rip3NJW7eCSvtqdUw=="; + }; + }; + "detective-sass-3.0.1" = { + name = "detective-sass"; + packageName = "detective-sass"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-sass/-/detective-sass-3.0.1.tgz"; + sha512 = "oSbrBozRjJ+QFF4WJFbjPQKeakoaY1GiR380NPqwdbWYd5wfl5cLWv0l6LsJVqrgWfFN1bjFqSeo32Nxza8Lbw=="; + }; + }; + "detective-scss-2.0.1" = { + name = "detective-scss"; + packageName = "detective-scss"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-scss/-/detective-scss-2.0.1.tgz"; + sha512 = "VveyXW4WQE04s05KlJ8K0bG34jtHQVgTc9InspqoQxvnelj/rdgSAy7i2DXAazyQNFKlWSWbS+Ro2DWKFOKTPQ=="; + }; + }; + "detective-stylus-1.0.0" = { + name = "detective-stylus"; + packageName = "detective-stylus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz"; + sha1 = "50aee7db8babb990381f010c63fabba5b58e54cd"; + }; + }; + "detective-typescript-5.7.0" = { + name = "detective-typescript"; + packageName = "detective-typescript"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-5.7.0.tgz"; + sha512 = "4SQeACXWAjIOsd2kJykPL8gWC9nVA+z8w7KtAdtd/7BCpDfrpI2ZA7pdhsmHv/zxf3ofeqpYi72vCkZ65bAjtA=="; + }; + }; "dezalgo-1.0.3" = { name = "dezalgo"; packageName = "dezalgo"; @@ -14000,13 +14063,13 @@ let sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; }; }; - "discord.js-11.6.2" = { + "discord.js-11.6.3" = { name = "discord.js"; packageName = "discord.js"; - version = "11.6.2"; + version = "11.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/discord.js/-/discord.js-11.6.2.tgz"; - sha512 = "QwN7RBb705qqvxletW41aw8ScZJh4LUVWtGNdLA1/N4od1pf8pueDWdnKLqw9pAud6cg9AADcCkm8os1YHWESg=="; + url = "https://registry.npmjs.org/discord.js/-/discord.js-11.6.3.tgz"; + sha512 = "dwIzHB5GPU9O/WiNw42d0yco0JED5bOjCPiHwU9VSSCkEhnyOdx5iqt7Dl2PQZAMNzWPI/t9oyCziOuzFlwm3Q=="; }; }; "discovery-channel-5.5.1" = { @@ -14054,6 +14117,15 @@ let sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; }; }; + "dl-tar-0.8.1" = { + name = "dl-tar"; + packageName = "dl-tar"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dl-tar/-/dl-tar-0.8.1.tgz"; + sha512 = "1EdwnDJmqStX85PuVhcrqdeB3b7k4pn3WhMjPEL1lHuPEf0Mf8Cqdo76hgUPX60QWtCbPPTrDl8JFGrPMc1grw=="; + }; + }; "dlnacasts-0.1.0" = { name = "dlnacasts"; packageName = "dlnacasts"; @@ -14549,6 +14621,33 @@ let sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; }; }; + "download-or-build-purescript-0.3.4" = { + name = "download-or-build-purescript"; + packageName = "download-or-build-purescript"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/download-or-build-purescript/-/download-or-build-purescript-0.3.4.tgz"; + sha512 = "8P4vNgbLTZi07s3uRnUCI+kE7lAERyIexVYwAHsAw7AQhooFnVbypq/yiP1vSZVibQ4Fl74LdOWnJKbqe9Mnow=="; + }; + }; + "download-purescript-0.8.5" = { + name = "download-purescript"; + packageName = "download-purescript"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/download-purescript/-/download-purescript-0.8.5.tgz"; + sha512 = "m2avp1YMDTxZW3mtlG7U09bmgCrLbBIsuBEglywew0uoG7VHVdtOwlTXEdvQQTqpW9iylrz8PokfPlqzc6AYiA=="; + }; + }; + "download-purescript-source-0.6.5" = { + name = "download-purescript-source"; + packageName = "download-purescript-source"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/download-purescript-source/-/download-purescript-source-0.6.5.tgz"; + sha512 = "RyOSTL7B3qzrhCOfhgzxNrcZD1klFOAJcw2YG345AIB4su1KC4WSk6fzRz3xpg1tp/plr5v8aDlvZy+LDtf6uA=="; + }; + }; "draftlog-1.0.12" = { name = "draftlog"; packageName = "draftlog"; @@ -14810,13 +14909,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.376" = { + "electron-to-chromium-1.3.383" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.376"; + version = "1.3.383"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz"; - sha512 = "cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.383.tgz"; + sha512 = "EHYVJl6Ox1kFy/SzGVbijHu8ksQotJnqHCFFfaVhXiC+erOSplwhCtOTSocu1jRwirlNsSn/aZ9Kf84Z6s5qrg=="; }; }; "elegant-spinner-1.0.1" = { @@ -15324,13 +15423,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.17.4" = { + "es-abstract-1.17.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz"; - sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; + sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; }; "es-get-iterator-1.1.0" = { @@ -15459,6 +15558,15 @@ let sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg=="; }; }; + "es6-promisify-6.1.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz"; + sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw=="; + }; + }; "es6-set-0.1.5" = { name = "es6-set"; packageName = "es6-set"; @@ -15666,15 +15774,6 @@ let sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; }; }; - "eslint-plugin-vue-5.2.3" = { - name = "eslint-plugin-vue"; - packageName = "eslint-plugin-vue"; - version = "5.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz"; - sha512 = "mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw=="; - }; - }; "eslint-plugin-vue-6.2.2" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; @@ -15765,15 +15864,6 @@ let sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A=="; }; }; - "espree-4.1.0" = { - name = "espree"; - packageName = "espree"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz"; - sha512 = "I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w=="; - }; - }; "espree-5.0.1" = { name = "espree"; packageName = "espree"; @@ -15846,13 +15936,13 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "esquery-1.1.0" = { + "esquery-1.2.0" = { name = "esquery"; packageName = "esquery"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz"; - sha512 = "MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz"; + sha512 = "weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q=="; }; }; "esrecurse-4.2.1" = { @@ -15918,6 +16008,15 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; + "estraverse-5.0.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz"; + sha512 = "j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A=="; + }; + }; "estree-walker-0.6.1" = { name = "estree-walker"; packageName = "estree-walker"; @@ -16296,6 +16395,15 @@ let sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; }; }; + "executing-npm-path-1.0.0" = { + name = "executing-npm-path"; + packageName = "executing-npm-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/executing-npm-path/-/executing-npm-path-1.0.0.tgz"; + sha512 = "d/dZlFCLkKm8nwdzpfQ7JBL2BISg4Fu0bVpZ5nacuT3e6DIxYVb+8tx0eQ+jxquvV/8I+VjJ9g6aEAqjukogkw=="; + }; + }; "exit-0.1.2" = { name = "exit"; packageName = "exit"; @@ -16980,6 +17088,15 @@ let sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="; }; }; + "feint-1.0.3" = { + name = "feint"; + packageName = "feint"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/feint/-/feint-1.0.3.tgz"; + sha512 = "BY1jwDlOx4uA9rtn2H9bZSuHT7yyOtSRDVwUwprRpRXvpm1F73gSGuHznEu50lT6epscULOknphOprG9ljoARg=="; + }; + }; "fields-0.1.24" = { name = "fields"; packageName = "fields"; @@ -16998,13 +17115,13 @@ let sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34"; }; }; - "figgy-pudding-3.5.1" = { + "figgy-pudding-3.5.2" = { name = "figgy-pudding"; packageName = "figgy-pudding"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; - sha512 = "vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="; + url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; }; }; "figures-1.7.0" = { @@ -17052,6 +17169,24 @@ let sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; }; }; + "file-exists-dazinatorfork-1.0.2" = { + name = "file-exists-dazinatorfork"; + packageName = "file-exists-dazinatorfork"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/file-exists-dazinatorfork/-/file-exists-dazinatorfork-1.0.2.tgz"; + sha512 = "r70c72ln2YHzQINNfxDp02hAhbGkt1HffZ+Du8oetWDLjDtFja/Lm10lUaSh9e+wD+7VDvPee0b0C9SAy8pWZg=="; + }; + }; + "file-to-npm-cache-0.1.0" = { + name = "file-to-npm-cache"; + packageName = "file-to-npm-cache"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-to-npm-cache/-/file-to-npm-cache-0.1.0.tgz"; + sha512 = "2/aq3BD1pkd6b4pafmTaO8EzRCiQKfFmJxg+zKAdDMAcqqJMC0nQYcuCU29say0ZTzXxafKXcJB50N+yb0WIoQ=="; + }; + }; "file-type-10.11.0" = { name = "file-type"; packageName = "file-type"; @@ -17178,6 +17313,15 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; + "filesize-4.2.1" = { + name = "filesize"; + packageName = "filesize"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-4.2.1.tgz"; + sha512 = "bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA=="; + }; + }; "filestream-5.0.0" = { name = "filestream"; packageName = "filestream"; @@ -17187,6 +17331,15 @@ let sha512 = "5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A=="; }; }; + "filing-cabinet-2.5.1" = { + name = "filing-cabinet"; + packageName = "filing-cabinet"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-2.5.1.tgz"; + sha512 = "GWOdObzou2L0HrJUk8MpJa01q0ZOwuTwTssM2+P+ABJWEGlVWd6ueEatANFdin94/3rdkVSdqpH14VqCNqp3RA=="; + }; + }; "fill-range-2.2.4" = { name = "fill-range"; packageName = "fill-range"; @@ -17250,6 +17403,15 @@ let sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"; }; }; + "find-0.3.0" = { + name = "find"; + packageName = "find"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find/-/find-0.3.0.tgz"; + sha512 = "iSd+O4OEYV/I36Zl8MdYJO0xD82wH528SaCieTVHhclgiYNe9y+yPKSwK+A7/WsmHL1EZ+pYUJBXWTL5qofksw=="; + }; + }; "find-cache-dir-2.1.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -17268,6 +17430,24 @@ let sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; }; }; + "find-pkg-dir-1.0.1" = { + name = "find-pkg-dir"; + packageName = "find-pkg-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-pkg-dir/-/find-pkg-dir-1.0.1.tgz"; + sha512 = "pIXIrZshXst3hpg5nXDYALHlN4ikh4IwoM0QRnMnYIALChamvpPCJS1Mpwp27GpXXTL/647LDS4JkH1yfAKctw=="; + }; + }; + "find-process-1.4.3" = { + name = "find-process"; + packageName = "find-process"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/find-process/-/find-process-1.4.3.tgz"; + sha512 = "+IA+AUsQCf3uucawyTwMWcY+2M3FXq3BRvw3S+j5Jvydjk31f/+NPWpYZOJs+JUs2GvxH4Yfr6Wham0ZtRLlPA=="; + }; + }; "find-requires-1.0.0" = { name = "find-requires"; packageName = "find-requires"; @@ -17529,6 +17709,15 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; + "flatten-1.0.3" = { + name = "flatten"; + packageName = "flatten"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz"; + sha512 = "dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="; + }; + }; "flow-bin-0.118.0" = { name = "flow-bin"; packageName = "flow-bin"; @@ -17538,13 +17727,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.120.1" = { + "flow-parser-0.121.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.120.1"; + version = "0.121.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.120.1.tgz"; - sha512 = "t5y9QoOegJuY+LCIjh0p6SGF7ItsxG5ycQApTSqWloutUZQ2gC0f6wMu91dab0/SSj2vH41bu5pDTLuvtP49ng=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.121.0.tgz"; + sha512 = "1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -18141,6 +18330,15 @@ let sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; + "fs-extra-9.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz"; + sha512 = "pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g=="; + }; + }; "fs-minipass-1.2.7" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -18213,13 +18411,13 @@ let sha512 = "fwfd9MBI/fnXtR/ClVTyeuPXJ+oI5WNyXvBQPmc4btgqLYTKOuBRTRUVjmVpDUri0C88HLwMlc5ESg48fEAGjw=="; }; }; - "fsevents-1.2.11" = { + "fsevents-1.2.12" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz"; - sha512 = "+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz"; + sha512 = "Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q=="; }; }; "fsevents-2.1.2" = { @@ -18447,6 +18645,15 @@ let sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; }; }; + "get-amd-module-type-3.0.0" = { + name = "get-amd-module-type"; + packageName = "get-amd-module-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-3.0.0.tgz"; + sha512 = "99Q7COuACPfVt18zH9N4VAMyb81S6TUgJm2NgV6ERtkh9VIkAaByZkW530wl3lLN5KTtSrK9jVLxYsoP5hQKsw=="; + }; + }; "get-assigned-identifiers-1.2.0" = { name = "get-assigned-identifiers"; packageName = "get-assigned-identifiers"; @@ -18492,6 +18699,15 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; + "get-own-enumerable-property-symbols-3.0.2" = { + name = "get-own-enumerable-property-symbols"; + packageName = "get-own-enumerable-property-symbols"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; + }; + }; "get-pkg-repo-1.4.0" = { name = "get-pkg-repo"; packageName = "get-pkg-repo"; @@ -18942,13 +19158,13 @@ let sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; - "glob-parent-5.1.0" = { + "glob-parent-5.1.1" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz"; - sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; "glob-stream-3.1.18" = { @@ -20194,13 +20410,13 @@ let sha512 = "ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg=="; }; }; - "hast-util-is-body-ok-link-1.0.2" = { + "hast-util-is-body-ok-link-1.0.3" = { name = "hast-util-is-body-ok-link"; packageName = "hast-util-is-body-ok-link"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.2.tgz"; - sha512 = "eSxO9rgtb7dfKxNa8NAFS3VEYWHXnJWVsoH/Z4jSsq1J2i4H1GkdJ43kXv++xuambrtI5XQwcAx6jeZVMjoBMQ=="; + url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.3.tgz"; + sha512 = "NB8jW4iqT+iVld2oCjSk0T2S2FyR86rDZ7nKHx3WNf/WX16fjjdfoog6T+YeJFsPzszVKsNlVJL+k5c4asAHog=="; }; }; "hast-util-is-element-1.0.4" = { @@ -20221,13 +20437,13 @@ let sha512 = "gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA=="; }; }; - "hast-util-to-string-1.0.2" = { + "hast-util-to-string-1.0.3" = { name = "hast-util-to-string"; packageName = "hast-util-to-string"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.2.tgz"; - sha512 = "fQNr0n5KJmZW1TmBfXbc4DO0ucZmseUw3T6K4PDsUUTMtTGGLZMUYRB8mOKgPgtw7rtICdxxpRQZmWwo8KxlOA=="; + url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.3.tgz"; + sha512 = "3lDgDE5OdpTfP3aFeKRWEwdIZ4vprztvp+AoD+RhF7uGOBs1yBDWZFadxnjcUV4KCoI3vB9A7gdFO98hEXA90w=="; }; }; "hast-util-whitespace-1.0.4" = { @@ -20572,13 +20788,13 @@ let sha512 = "uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w=="; }; }; - "html-whitespace-sensitive-tag-names-1.0.1" = { + "html-whitespace-sensitive-tag-names-1.0.2" = { name = "html-whitespace-sensitive-tag-names"; packageName = "html-whitespace-sensitive-tag-names"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.1.tgz"; - sha512 = "TMdAWVry7Ld0k2sLqpHkWsFAHmU+VZZq/nR4bfwfxThD8q3ibhrpRTywyQkEiunYiZXmJ6gRcJiLbZm+jbQPgQ=="; + url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.2.tgz"; + sha512 = "9jCcAq9ZsjUkZjNFDvxalDPhktOijpfzLyzBcqMLOFSbtcDNrPlKDvZeH7KdEbP7C6OjPpIdDMMPm0oq2Dpk0A=="; }; }; "htmlescape-1.1.1" = { @@ -21293,6 +21509,15 @@ let sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; }; }; + "import-package-1.0.0" = { + name = "import-package"; + packageName = "import-package"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-package/-/import-package-1.0.0.tgz"; + sha512 = "EEDT2ucOWI/9z/h2mLTRkkusM30/pxSoBT6YvomYpEb/UGll6wOvdFagYraCSBHD+dZSKoVFNYCAgC3V7Nvf1Q=="; + }; + }; "imurmurhash-0.1.4" = { name = "imurmurhash"; packageName = "imurmurhash"; @@ -21302,13 +21527,13 @@ let sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; }; - "in-publish-2.0.0" = { + "in-publish-2.0.1" = { name = "in-publish"; packageName = "in-publish"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz"; - sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51"; + url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz"; + sha512 = "oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ=="; }; }; "increment-buffer-1.0.1" = { @@ -21698,6 +21923,24 @@ let sha512 = "MAQUJuIo7Xqk8EVNP+6d3CKq9c80hi4tjIbIAT6lmGW9W6WzlHiu9PS8uSuUYU+Do+j1baiFp3H25XEVxDIG2g=="; }; }; + "install-purescript-0.7.0" = { + name = "install-purescript"; + packageName = "install-purescript"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/install-purescript/-/install-purescript-0.7.0.tgz"; + sha512 = "AOmIq8rPEOLn5Bo8RQngvDXWeo6USKIt+28UhcAmQJNvj63MqdNBIQRTgNyypbsniv7d7VWjz53pw2+kTgh3mg=="; + }; + }; + "install-purescript-cli-0.4.2" = { + name = "install-purescript-cli"; + packageName = "install-purescript-cli"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/install-purescript-cli/-/install-purescript-cli-0.4.2.tgz"; + sha512 = "y62GvwsMksz7aSJQsK2pPelmBByp0eDgpI+uFheEU05wpekM6WtCgq7WkTAc+Ar/nt+7Y5lYzGOqSOWnGAEIBQ=="; + }; + }; "int53-1.0.0" = { name = "int53"; packageName = "int53"; @@ -22877,6 +23120,15 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; + "is-relative-path-1.0.2" = { + name = "is-relative-path"; + packageName = "is-relative-path"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative-path/-/is-relative-path-1.0.2.tgz"; + sha1 = "091b46a0d67c1ed0fe85f1f8cfdde006bb251d46"; + }; + }; "is-relative-url-3.0.0" = { name = "is-relative-url"; packageName = "is-relative-url"; @@ -23228,13 +23480,13 @@ let sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; }; - "isbinaryfile-4.0.4" = { + "isbinaryfile-4.0.5" = { name = "isbinaryfile"; packageName = "isbinaryfile"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.4.tgz"; - sha512 = "pEutbN134CzcjlLS1myKX/uxNjwU5eBVSprvkpv3+3dqhBHUZLIWJQowC40w5c0Zf19vBY8mrZl88y5J4RAPbQ=="; + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.5.tgz"; + sha512 = "Jvz0gpTh1AILHMCBUyqq7xv1ZOQrxTDwyp1/QUq1xFpOBvp4AH5uEobPePJht8KnBGqQIH7We6OR73mXsjG0cA=="; }; }; "isemail-3.2.0" = { @@ -23552,13 +23804,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joplin-turndown-4.0.23" = { + "joplin-turndown-4.0.24" = { name = "joplin-turndown"; packageName = "joplin-turndown"; - version = "4.0.23"; + version = "4.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.23.tgz"; - sha512 = "Dh93R7G/S/KRbOu4/+FIxoUcUDcoUL4QDsqGhperOi/cUxUeg8fngrmEzdP8kEpQzqm5+8jkq9Cc1w6695owpQ=="; + url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.24.tgz"; + sha512 = "mKd2rAFzJKnhTVjEpHomG+T01//uz5rXVSAOYRh3/JKXpY7QUhVp8jCmFfO+kaadrLABTz04mvTmyyoOadxdTA=="; }; }; "joplin-turndown-plugin-gfm-1.0.12" = { @@ -23606,13 +23858,13 @@ let sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4"; }; }; - "jquery.terminal-2.15.0" = { + "jquery.terminal-2.15.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.15.0"; + version = "2.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.0.tgz"; - sha512 = "Dp8ahqK1lcphpmx9veb+S/ZxEt5mk4rHcVTbslCgngIiqH4LX7VtnSIQ2Lm5O0y/lp4eMPaNSTgPniCziF6ACQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.2.tgz"; + sha512 = "/G5L/laZLLO0tEQ+a94mLnvDXB5+PbC9IuZB+ikbw4E7W3GQkRpa0I15Z3xA+WbOaVZj+hEtPcKyyQLcKdjULQ=="; }; }; "js-base64-2.5.2" = { @@ -23777,6 +24029,15 @@ let sha512 = "O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng=="; }; }; + "jsdom-15.2.1" = { + name = "jsdom"; + packageName = "jsdom"; + version = "15.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz"; + sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g=="; + }; + }; "jsdom-7.2.2" = { name = "jsdom"; packageName = "jsdom"; @@ -24056,13 +24317,13 @@ let sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ=="; }; }; - "json5-2.1.1" = { + "json5-2.1.2" = { name = "json5"; packageName = "json5"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz"; - sha512 = "l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ=="; + url = "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz"; + sha512 = "MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ=="; }; }; "jsonata-1.8.1" = { @@ -24128,6 +24389,15 @@ let sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; + "jsonfile-6.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz"; + sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg=="; + }; + }; "jsonify-0.0.0" = { name = "jsonify"; packageName = "jsonify"; @@ -25264,6 +25534,15 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; + "load-from-cwd-or-npm-3.0.4" = { + name = "load-from-cwd-or-npm"; + packageName = "load-from-cwd-or-npm"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/load-from-cwd-or-npm/-/load-from-cwd-or-npm-3.0.4.tgz"; + sha512 = "tdDJgh1zVmxOV24gcj+AEagjTc30Jim9ywX2OxfABdOoTU4UK8b0B371ZNbpj27njP8LQ6U5FH1aNwC2+VRxQg=="; + }; + }; "load-ip-set-2.1.0" = { name = "load-ip-set"; packageName = "load-ip-set"; @@ -25318,6 +25597,15 @@ let sha512 = "dYB1lbwqHgPTrruy9glukCu8Ya9vzj6TMfouCtj2H/GuJ+8syioisgKTBPxnCi6m8K8jINKfTOxOHngFkUYqHw=="; }; }; + "load-request-from-cwd-or-npm-3.0.0" = { + name = "load-request-from-cwd-or-npm"; + packageName = "load-request-from-cwd-or-npm"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-request-from-cwd-or-npm/-/load-request-from-cwd-or-npm-3.0.0.tgz"; + sha512 = "UsYAoXQV3UeL75Rl5IppBGOcKK5iKpvWooUPUHdxcQg9IKIkfg6PWpBQ4EhoRxTioIqrz587Ur2+c2uB/KGpng=="; + }; + }; "loader-runner-2.4.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -27091,15 +27379,6 @@ let sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; }; }; - "mamacro-0.0.3" = { - name = "mamacro"; - packageName = "mamacro"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz"; - sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA=="; - }; - }; "map-age-cleaner-0.1.3" = { name = "map-age-cleaner"; packageName = "map-age-cleaner"; @@ -27604,6 +27883,15 @@ let sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; }; }; + "mdn-data-2.0.6" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz"; + sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="; + }; + }; "mdns-js-0.5.0" = { name = "mdns-js"; packageName = "mdns-js"; @@ -27865,13 +28153,13 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.0.1" = { + "meow-6.1.0" = { name = "meow"; packageName = "meow"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.0.1.tgz"; - sha512 = "kxGTFgT/b7/oSRSQsJ0qsT5IMU+bgZ1eAdSA3kIV7onkW0QWo/hL5RbGlMfvBjHJKPE1LaPX0kdecYFiqYWjUw=="; + url = "https://registry.npmjs.org/meow/-/meow-6.1.0.tgz"; + sha512 = "iIAoeI01v6pmSfObAAWFoITAA4GgiT45m4SmJgoxtZfvI0fyZwhV4d0lTwiUXvAKIPlma05Feb2Xngl52Mj5Cg=="; }; }; "merge-1.2.1" = { @@ -28558,6 +28846,24 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; + "mkdirp-0.5.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; + sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; + }; + }; + "mkdirp-0.5.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz"; + sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="; + }; + }; "mkdirp-1.0.3" = { name = "mkdirp"; packageName = "mkdirp"; @@ -28621,6 +28927,15 @@ let sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="; }; }; + "module-definition-3.3.0" = { + name = "module-definition"; + packageName = "module-definition"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.0.tgz"; + sha512 = "HTplA9xwDzH67XJFC1YvZMUElWJD28DV0dUq7lhTs+JKJamUOWA/CcYWSlhW5amJO66uWtY7XdltT+LfX0wIVg=="; + }; + }; "module-deps-6.2.2" = { name = "module-deps"; packageName = "module-deps"; @@ -28630,6 +28945,15 @@ let sha512 = "a9y6yDv5u5I4A+IPHTnqFxcaKr4p50/zxTjcQJaX2ws9tN/W6J6YXnEKhqRyPhl494dkcxx951onSKVezmI+3w=="; }; }; + "module-lookup-amd-6.2.0" = { + name = "module-lookup-amd"; + packageName = "module-lookup-amd"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/module-lookup-amd/-/module-lookup-amd-6.2.0.tgz"; + sha512 = "uxHCj5Pw9psZiC1znjU2qPsubt6haCSsN9m7xmIdoTciEgfxUkE1vhtDvjHPuOXEZrVJhjKgkmkP+w73rRuelQ=="; + }; + }; "mold-source-map-0.4.0" = { name = "mold-source-map"; packageName = "mold-source-map"; @@ -28702,13 +29026,13 @@ let sha512 = "IrhznRheWtDcT/TEL3cqaT4UJOqc5G3K8TnGq29PRXZil+sWGPkcM6SHVUZVirTKFKceuCadfyDMjmRoXCN21A=="; }; }; - "morgan-1.9.1" = { + "morgan-1.10.0" = { name = "morgan"; packageName = "morgan"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; - sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; + url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; }; "mout-0.5.0" = { @@ -29570,6 +29894,15 @@ let sha512 = "+T6UtYItDTE1L30g/nLRjP55dFlvldrzCRsn4CrcNHIbhg5JUe0hnOx1DHFViysUC7I1cevBQVjdGJ9ZftY9DA=="; }; }; + "neat-stack-1.0.1" = { + name = "neat-stack"; + packageName = "neat-stack"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-stack/-/neat-stack-1.0.1.tgz"; + sha512 = "nl0eft4etsbFowZVP+1lNqZsNKb2SIC+PnAr/ODBln6RNVaJh0YYu8P3j8Iuh4XeIAgyWn3xCSizbTobRjocIA=="; + }; + }; "neat-tasks-1.1.1" = { name = "neat-tasks"; packageName = "neat-tasks"; @@ -30184,6 +30517,15 @@ let sha512 = "hwaTaFPUwNKns5qXwGJpLQM3Z5zRluYeAxpYy1L8fWmWdT/DjLmsnW8/oGlSN8Vo4R28c2znfUoBUiB/RlPptw=="; }; }; + "node-source-walk-4.2.0" = { + name = "node-source-walk"; + packageName = "node-source-walk"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-source-walk/-/node-source-walk-4.2.0.tgz"; + sha512 = "hPs/QMe6zS94f5+jG3kk9E7TNm4P2SulrKiLWMzKszBfNZvL/V6wseHlTd7IvfW0NZWqPtK3+9yYNr+3USGteA=="; + }; + }; "node-ssdp-2.9.1" = { name = "node-ssdp"; packageName = "node-ssdp"; @@ -30472,6 +30814,15 @@ let sha512 = "KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ=="; }; }; + "npcache-1.0.2" = { + name = "npcache"; + packageName = "npcache"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npcache/-/npcache-1.0.2.tgz"; + sha512 = "h42LqKZvSbykPoCyAwEKbJAXUpt1SZ7O8GvA0XRqb26VtWQuKLJtp+Rt4jqkq1Y+ZRErINdyeZ3Ijc5lDtqkSg=="; + }; + }; "npm-2.15.12" = { name = "npm"; packageName = "npm"; @@ -30490,6 +30841,51 @@ let sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; }; }; + "npm-cache-env-2.0.0" = { + name = "npm-cache-env"; + packageName = "npm-cache-env"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cache-env/-/npm-cache-env-2.0.0.tgz"; + sha512 = "t5cz/NY4IPmiKBRFry3U3M8Ypwdx4LJ3w7te/49LWB2R4wPf5QAAGB1zNoH9IbGtC/wiOeE8b/HsoG2lLAOYaQ=="; + }; + }; + "npm-cache-path-2.0.0" = { + name = "npm-cache-path"; + packageName = "npm-cache-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cache-path/-/npm-cache-path-2.0.0.tgz"; + sha512 = "7OJzaenruC1PffVJ7onG0u4aTQLaykT4gF5n61j9fot58J4ppoglkrv+pY4BsFR2drPWb6vbEpJH7/Xviv7h+Q=="; + }; + }; + "npm-cli-dir-3.0.1" = { + name = "npm-cli-dir"; + packageName = "npm-cli-dir"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cli-dir/-/npm-cli-dir-3.0.1.tgz"; + sha512 = "t9V9Gz/Q5a5KOSynLpKKnLxJzWLnHtAZvaLmNSbNeNR+qEpCmu/n5J74lyz4QQ/XIGEEYWIoVXR8scqbUWaMrQ=="; + }; + }; + "npm-cli-path-3.1.2" = { + name = "npm-cli-path"; + packageName = "npm-cli-path"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cli-path/-/npm-cli-path-3.1.2.tgz"; + sha512 = "JdiFz8kpCf9WD01zRx5u29EP5UYjKp9osSVMflPkamlplgsuaagkwqY3JpzDySl/VDpGUva8q8YoSG6AatFkIg=="; + }; + }; + "npm-cli-version-1.0.0" = { + name = "npm-cli-version"; + packageName = "npm-cli-version"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-cli-version/-/npm-cli-version-1.0.0.tgz"; + sha512 = "VqqnMzMfcZ0UZFDki7ZR8E4U8Pz7VbTOGSMk8KJbQ+oUlJlon8IXhb6BIdMJClRArHn216useYM1kvqgZmDvtQ=="; + }; + }; "npm-conf-1.1.3" = { name = "npm-conf"; packageName = "npm-conf"; @@ -30697,6 +31093,15 @@ let sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; }; + "npm-version-compare-1.0.1" = { + name = "npm-version-compare"; + packageName = "npm-version-compare"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-version-compare/-/npm-version-compare-1.0.1.tgz"; + sha512 = "X+/Oz2OkF6KzMqyFyNBV5MC1ScPxtl5bJTkUcIp9Bz5Wv2Yf8uqDIq+vu+/gy2DRb11Q2Z6jfHbav7Ux0t99JQ=="; + }; + }; "npm-which-3.0.1" = { name = "npm-which"; packageName = "npm-which"; @@ -31472,6 +31877,15 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; + "optional-0.1.4" = { + name = "optional"; + packageName = "optional"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz"; + sha512 = "gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw=="; + }; + }; "optionator-0.3.0" = { name = "optionator"; packageName = "optionator"; @@ -32939,6 +33353,24 @@ let sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; }; }; + "pause-fn-1.0.0" = { + name = "pause-fn"; + packageName = "pause-fn"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-fn/-/pause-fn-1.0.0.tgz"; + sha512 = "23uUK11+go9zE7ij4Qh45HPvqanTt22viyNsHnWrRFVgcT5TV4MFtfMhx/wL2aMt0LYbqTsJJZgG3V4C57+NQw=="; + }; + }; + "pause-methods-1.0.0" = { + name = "pause-methods"; + packageName = "pause-methods"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-methods/-/pause-methods-1.0.0.tgz"; + sha512 = "RA8T1+kt1wbD8p0y9/x0BuCMBwNRJzp08euseZ7ZSLGeBUSNHh4yLIsq9J+7fCSDAwnHTjQPSzShwoFnBj0QNQ=="; + }; + }; "pause-stream-0.0.11" = { name = "pause-stream"; packageName = "pause-stream"; @@ -33056,13 +33488,13 @@ let sha1 = "18de2f97e4bf7a9551ad7511942b5496f7aba660"; }; }; - "picomatch-2.2.1" = { + "picomatch-2.2.2" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz"; - sha512 = "ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; }; }; "picture-tuber-1.0.2" = { @@ -33272,6 +33704,15 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; + "platform-name-1.0.0" = { + name = "platform-name"; + packageName = "platform-name"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/platform-name/-/platform-name-1.0.0.tgz"; + sha512 = "ZRbqJ30uRRKGKW2O1XnG/Ls1K/aBGlnyjq1Z0BbjqDPTNN+XZKFaugCsCm3/mq6XGR5DZNVdV75afpQEvNNY3Q=="; + }; + }; "playerui-1.3.0" = { name = "playerui"; packageName = "playerui"; @@ -33957,6 +34398,15 @@ let sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg=="; }; }; + "postcss-values-parser-1.5.0" = { + name = "postcss-values-parser"; + packageName = "postcss-values-parser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz"; + sha512 = "3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ=="; + }; + }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -34002,6 +34452,15 @@ let sha512 = "GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g=="; }; }; + "precinct-6.2.0" = { + name = "precinct"; + packageName = "precinct"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/precinct/-/precinct-6.2.0.tgz"; + sha512 = "BCAmnOxZzobF3H1/h/gq70pEyvX/BVLWCrzi8beFD22dqu5Z14qOghNUsI24Wg8oaTsGFcIjOGtFX5L9ttmjVg=="; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -34416,13 +34875,13 @@ let sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; }; }; - "promisify-child-process-3.1.3" = { + "promisify-child-process-3.1.4" = { name = "promisify-child-process"; packageName = "promisify-child-process"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-3.1.3.tgz"; - sha512 = "qVox3vW2hqbktVw+IN7YZ/kgGA+u426ekmiZxiofNe9O4GSewjROwRQ4MQ6IbvhpeYSLqiLS0kMn+FWCz6ENlg=="; + url = "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-3.1.4.tgz"; + sha512 = "tLifJs99E4oOXUz/dKQjRgdchfiepmYQzBVrcVX9BtUWi9aGJeGSf2KgXOWBW1JFsSYgLkl1Z9HRm8i0sf4cTg=="; }; }; "promisize-1.1.2" = { @@ -34452,13 +34911,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "prompts-2.3.1" = { + "prompts-2.3.2" = { name = "prompts"; packageName = "prompts"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz"; - sha512 = "qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz"; + sha512 = "Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA=="; }; }; "promzard-0.3.0" = { @@ -34488,15 +34947,6 @@ let sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d"; }; }; - "proper-lockfile-3.2.0" = { - name = "proper-lockfile"; - packageName = "proper-lockfile"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz"; - sha512 = "iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA=="; - }; - }; "properties-1.2.1" = { name = "properties"; packageName = "properties"; @@ -35415,6 +35865,15 @@ let sha512 = "hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA=="; }; }; + "purescript-0.12.5" = { + name = "purescript"; + packageName = "purescript"; + version = "0.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/purescript/-/purescript-0.12.5.tgz"; + sha512 = "L0N0KrRgZm8pXYqT8Dc5m6BzjnYvkOaxx9Tms874NUivm8DYSs3oLtDrnNM8cVrjCCXCvS0g8l73CKNymaL6qw=="; + }; + }; "purgecss-1.4.2" = { name = "purgecss"; packageName = "purgecss"; @@ -35586,13 +36045,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.1" = { + "qs-6.9.2" = { name = "qs"; packageName = "qs"; - version = "6.9.1"; + version = "6.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz"; - sha512 = "Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.2.tgz"; + sha512 = "2eQ6zajpK7HwqrY1rRtGw5IZvjgtELXzJECaEDuzDFo2jjnIXpJSimzd4qflWZq6bLLi+Zgfj5eDrAzl/lptyg=="; }; }; "query-string-1.0.1" = { @@ -35892,6 +36351,15 @@ let sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q=="; }; }; + "rate-map-1.0.5" = { + name = "rate-map"; + packageName = "rate-map"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rate-map/-/rate-map-1.0.5.tgz"; + sha512 = "u/oBh01ZgCZM8Dqkm+xUh9mLl5t/9wxBNpVDZUSKjYvPSOOwYCeVheS5esvdyVnR0k3sLh+H9v16h1Z7FRy2Fw=="; + }; + }; "raven-1.2.1" = { name = "raven"; packageName = "raven"; @@ -35982,22 +36450,22 @@ let sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA=="; }; }; - "react-16.13.0" = { + "react-16.13.1" = { name = "react"; packageName = "react"; - version = "16.13.0"; + version = "16.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/react/-/react-16.13.0.tgz"; - sha512 = "TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ=="; + url = "https://registry.npmjs.org/react/-/react-16.13.1.tgz"; + sha512 = "YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w=="; }; }; - "react-is-16.13.0" = { + "react-is-16.13.1" = { name = "react-is"; packageName = "react-is"; - version = "16.13.0"; + version = "16.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz"; - sha512 = "GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA=="; + url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"; + sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; }; "react-reconciler-0.24.0" = { @@ -36486,13 +36954,13 @@ let sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; }; }; - "regenerator-transform-0.14.3" = { + "regenerator-transform-0.14.4" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.14.3"; + version = "0.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.3.tgz"; - sha512 = "zXHNKJspmONxBViAb3ZUmFoFPnTBs3zFhCEZJiwp/gkNzxVbTqNJVjYKx6Qk1tQ1P4XLf4TbH9+KBB7wGoAaUw=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha512 = "EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw=="; }; }; "regex-cache-0.4.4" = { @@ -36630,6 +37098,15 @@ let sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; + "reject-unsatisfied-npm-version-1.0.0" = { + name = "reject-unsatisfied-npm-version"; + packageName = "reject-unsatisfied-npm-version"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reject-unsatisfied-npm-version/-/reject-unsatisfied-npm-version-1.0.0.tgz"; + sha512 = "8cl35x8i3W1+RubvIq9CM7fJkdMwBOdjne4b7eFBoo4vvN1QoXbgusQw6VVv2DBmm6NDyMhUmp9FBxaMWU9s7Q=="; + }; + }; "relateurl-0.2.7" = { name = "relateurl"; packageName = "relateurl"; @@ -36693,13 +37170,13 @@ let sha512 = "K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw=="; }; }; - "remark-frontmatter-1.3.2" = { + "remark-frontmatter-1.3.3" = { name = "remark-frontmatter"; packageName = "remark-frontmatter"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.2.tgz"; - sha512 = "2eayxITZ8rezsXdgcXnYB3iLivohm2V/ZT4Ne8uhua6A4pk6GdLE2ZzJnbnINtD1HRLaTdB7RwF9sgUbMptJZA=="; + url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.3.tgz"; + sha512 = "fM5eZPBvu2pVNoq3ZPW22q+5Ativ1oLozq2qYt9I2oNyxiUd/tDl0iLLntEVAegpZIslPWg1brhcP1VsaSVUag=="; }; }; "remark-html-2.0.2" = { @@ -37080,6 +37557,15 @@ let sha512 = "ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg=="; }; }; + "requirejs-config-file-3.1.2" = { + name = "requirejs-config-file"; + packageName = "requirejs-config-file"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/requirejs-config-file/-/requirejs-config-file-3.1.2.tgz"; + sha512 = "sdLWywcDuNz7EIOhenSbRfT4YF84nItDv90coN2htbokjmU2QeyQuSBZILQUKNksepl8UPVU+hgYySFaDxbJPQ=="; + }; + }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -37134,6 +37620,15 @@ let sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; }; }; + "resolve-dependency-path-2.0.0" = { + name = "resolve-dependency-path"; + packageName = "resolve-dependency-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dependency-path/-/resolve-dependency-path-2.0.0.tgz"; + sha512 = "DIgu+0Dv+6v2XwRaNWnumKu7GPufBBOr5I1gRPJHkvghrfCGOooJODFvgFimX/KRxk9j0whD2MnKHzM1jYvk9w=="; + }; + }; "resolve-dir-1.0.1" = { name = "resolve-dir"; packageName = "resolve-dir"; @@ -37188,6 +37683,15 @@ let sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; }; }; + "resolve-from-npm-3.1.0" = { + name = "resolve-from-npm"; + packageName = "resolve-from-npm"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from-npm/-/resolve-from-npm-3.1.0.tgz"; + sha512 = "HVhEcznfeFWM7T3HWCT7vCjwkv0R1ruC4Ref5jTlTvz2X8GKeUZTqjvZWlefmKQvQfKYOJhQo90Yjhpcr8aclg=="; + }; + }; "resolve-options-1.1.0" = { name = "resolve-options"; packageName = "resolve-options"; @@ -37674,13 +38178,13 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; - "rss-parser-3.7.5" = { + "rss-parser-3.7.6" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.7.5"; + version = "3.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.5.tgz"; - sha512 = "bUbAJfiuNyR/IGpYie6ro6x7X26QMWHxz1Sy9qkPyU/vYwbf3YdopQJIIELwdp3FCU4evcyetOD8bA8fgS+SqA=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.6.tgz"; + sha512 = "wWWh3/pPLAPgWyfkCC9jB83jSBenU6VPMymfXiysi8wJxaN7KNkW4vU3Jm8jQxExAribFvXREy+RtaL3XQubeA=="; }; }; "rsvp-3.6.2" = { @@ -37737,6 +38241,15 @@ let sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg=="; }; }; + "run-in-dir-0.3.0" = { + name = "run-in-dir"; + packageName = "run-in-dir"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-in-dir/-/run-in-dir-0.3.0.tgz"; + sha512 = "5aPpxad3Jq9r6OK6rw+Gs5HVuZsEeQM/M4I9CdCWyThkstLAUCJSc3IRs8dT0p/z9mxAJgU5ELRQL2q/ddY6PQ=="; + }; + }; "run-parallel-1.1.9" = { name = "run-parallel"; packageName = "run-parallel"; @@ -37863,6 +38376,15 @@ let sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q=="; }; }; + "s.color-0.0.13" = { + name = "s.color"; + packageName = "s.color"; + version = "0.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/s.color/-/s.color-0.0.13.tgz"; + sha512 = "56rTWlPg3jQX5n2wv201gUBn8fSgnGwbNjN159FV+JeD4EeqZiVnhDASmivhE4+f9Ivzj59y5AgoFflsf25KwA=="; + }; + }; "s3-stream-upload-2.0.2" = { name = "s3-stream-upload"; packageName = "s3-stream-upload"; @@ -37989,6 +38511,24 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; + "sass-formatter-0.4.4" = { + name = "sass-formatter"; + packageName = "sass-formatter"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.4.tgz"; + sha512 = "pI/2olF5F3AMkAXbn71nJK7yAsWfRYLlyp7Suhiy4hzuNga05XaUzLO74lplCpvS8GVeUdFgef+8lU5+cHr60g=="; + }; + }; + "sass-lookup-3.0.0" = { + name = "sass-lookup"; + packageName = "sass-lookup"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-lookup/-/sass-lookup-3.0.0.tgz"; + sha512 = "TTsus8CfFRn1N44bvdEai1no6PqdmDiQUiqW5DlpmtT+tYnIt1tXtDIph5KA1efC+LmioJXSnCtUVpcK9gaKIg=="; + }; + }; "sax-0.5.8" = { name = "sax"; packageName = "sax"; @@ -38052,6 +38592,15 @@ let sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; }; + "schema-utils-2.6.5" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "2.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz"; + sha512 = "5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ=="; + }; + }; "scoped-regex-1.0.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -39015,13 +39564,22 @@ let sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA=="; }; }; - "sisteransi-1.0.4" = { + "sisteransi-1.0.5" = { name = "sisteransi"; packageName = "sisteransi"; - version = "1.0.4"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"; + sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="; + }; + }; + "size-rate-0.3.1" = { + name = "size-rate"; + packageName = "size-rate"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz"; - sha512 = "/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig=="; + url = "https://registry.npmjs.org/size-rate/-/size-rate-0.3.1.tgz"; + sha512 = "gs1+6r1P1w00Qv00qC4Be2pbl70/cIVCtsZJPQhEzH3vNss8QbkGIVh6/SCC7atSlX7hkuwH93TyWL1iyXjurQ=="; }; }; "skin-tone-1.0.0" = { @@ -39258,13 +39816,13 @@ let sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw=="; }; }; - "snyk-docker-plugin-2.2.2" = { + "snyk-docker-plugin-2.6.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "2.2.2"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.2.2.tgz"; - sha512 = "ufeACGqtypUJ3AV5+bQw/mZLo40MC9tVHdRxpBw95w0F0Oa1MT5DATQj/K8RHpkEy8X6rlMmnxH8swyryFgRhg=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.6.1.tgz"; + sha512 = "v3LIPILRL5faZ+qiIhF9on0rAxuFaQku3UwaiGumoTrfXywLkv7x8PJgdMnrsWUxDwB8EZFc1k2qvI6V6rTF5g=="; }; }; "snyk-go-parser-1.4.0" = { @@ -39915,6 +40473,15 @@ let sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; }; }; + "spawn-stack-0.7.0" = { + name = "spawn-stack"; + packageName = "spawn-stack"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spawn-stack/-/spawn-stack-0.7.0.tgz"; + sha512 = "lV3XTrZqR76y9voQq3g0NfCCd4dylXtgQW+xcoZkRYe/6IZJM20G//s2+4JYojJoHQQKKuoU+lUZkO5/tEJe4A=="; + }; + }; "spawn-sync-1.0.15" = { name = "spawn-sync"; packageName = "spawn-sync"; @@ -41247,6 +41814,15 @@ let sha512 = "fqqhZzXyAM6pGD9lky/GOPq6V4X0SeTAFBl0iXb/BzOegl40gpf/bV3QQP7zULNYvjr6+Dx8SCaDULjVoOru0A=="; }; }; + "stringify-object-3.3.0" = { + name = "stringify-object"; + packageName = "stringify-object"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"; + sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; + }; + }; "stringify-parameters-0.0.4" = { name = "stringify-parameters"; packageName = "stringify-parameters"; @@ -41634,6 +42210,15 @@ let sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug=="; }; }; + "stylus-lookup-3.0.2" = { + name = "stylus-lookup"; + packageName = "stylus-lookup"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stylus-lookup/-/stylus-lookup-3.0.2.tgz"; + sha512 = "oEQGHSjg/AMaWlKe7gqsnYzan8DLcGIHe0dUaFkucZZ14z4zjENRlQMCHT4FNsiWnJf17YN9OvrCfCoi7VvOyg=="; + }; + }; "stylus-supremacy-2.14.0" = { name = "stylus-supremacy"; packageName = "stylus-supremacy"; @@ -41679,6 +42264,33 @@ let sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463"; }; }; + "suf-cli-0.1.1" = { + name = "suf-cli"; + packageName = "suf-cli"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/suf-cli/-/suf-cli-0.1.1.tgz"; + sha512 = "0znmYibLknX0bWsnqW9rzM8IvKux3rTSnW52l5teIC+QAgS/StUl5f4WyLPBw+posfbOgoX+03xHPV4sMxY64Q=="; + }; + }; + "suf-node-1.1.1" = { + name = "suf-node"; + packageName = "suf-node"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/suf-node/-/suf-node-1.1.1.tgz"; + sha512 = "XiyPqLdiHJ3CMphADCJg/JVQYcj3JfO8NomlLubSdGYgppfzE+g/7Fyusza/Kr7lC919BdwbfIqFxK8VO7+l4w=="; + }; + }; + "suf-regex-0.0.14" = { + name = "suf-regex"; + packageName = "suf-regex"; + version = "0.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.14.tgz"; + sha512 = "+WE5PZTfD6lVNCNsyBInJIAbok8LpqgOhvCbSViZeQ/JTxdxq7Lw+tSJXGM+jrIp81jj9GCMYvkl00JAkn2CtA=="; + }; + }; "sugarss-1.0.1" = { name = "sugarss"; packageName = "sugarss"; @@ -42454,13 +43066,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.35.1" = { + "terminal-kit-1.35.2" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.35.1"; + version = "1.35.2"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.1.tgz"; - sha512 = "36q0frqenTb1kWuq+vJU+xbGB8KPX1+05kxnbVZxeu9cXDL68qR5w2NzsliogHweplRI7XP0Zc/FITMMA8/BHA=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.2.tgz"; + sha512 = "PCNmMKjlcGQN/OlQ+nzdgPmrS0kmPcOqPCmHPrxCfOuvz0fQ1fZLiyivRIcwzY9bnm624VVsywUis+iPA3Hq5A=="; }; }; "terser-3.17.0" = { @@ -42472,13 +43084,13 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.6.6" = { + "terser-4.6.7" = { name = "terser"; packageName = "terser"; - version = "4.6.6"; + version = "4.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz"; - sha512 = "4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g=="; + url = "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz"; + sha512 = "fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g=="; }; }; "terser-webpack-plugin-1.4.3" = { @@ -42742,6 +43354,15 @@ let sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; }; }; + "tilde-path-3.0.0" = { + name = "tilde-path"; + packageName = "tilde-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tilde-path/-/tilde-path-3.0.0.tgz"; + sha512 = "jHGx1beQCxoIuyg1LDKxqL3J0zNA57eGjlXsqtcjj6Q9EKXh4Sz895VxXW/psJW1PYIF79XViZEEWrvmhaZ61g=="; + }; + }; "tildify-1.2.0" = { name = "tildify"; packageName = "tildify"; @@ -43147,15 +43768,6 @@ let sha512 = "Y7EDM+uoU8TZxF5ej2mUR0dLO4qbuuNRnJKxEht2QJWEq2421pyG1D1x8YxPKmyTc6nHh7Td/jLGFxYo+9vkLA=="; }; }; - "to-vfile-5.0.3" = { - name = "to-vfile"; - packageName = "to-vfile"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/to-vfile/-/to-vfile-5.0.3.tgz"; - sha512 = "z1Lfx60yAMDMmr+f426Y4yECsHdl8GVEAE+LymjRF5oOIZ7T4N20IxWNAxXLMRzP9jSSll38Z0fKVAhVLsdLOw=="; - }; - }; "to-vfile-6.1.0" = { name = "to-vfile"; packageName = "to-vfile"; @@ -43588,13 +44200,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-node-8.7.0" = { + "ts-node-8.8.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.7.0"; + version = "8.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz"; - sha512 = "s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.8.1.tgz"; + sha512 = "10DE9ONho06QORKAaCBpPiFCdW+tZJuY/84tyypGtl6r+/C7Asq0dhqbRZURuUlLQtZxxDvT8eoj8cGW0ha6Bg=="; }; }; "ts-process-promises-1.0.2" = { @@ -43651,6 +44263,15 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; + "tsutils-3.17.1" = { + name = "tsutils"; + packageName = "tsutils"; + version = "3.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz"; + sha512 = "kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g=="; + }; + }; "ttf2woff-2.0.1" = { name = "ttf2woff"; packageName = "ttf2woff"; @@ -43705,6 +44326,24 @@ let sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; }; }; + "tty-truncate-1.0.5" = { + name = "tty-truncate"; + packageName = "tty-truncate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-truncate/-/tty-truncate-1.0.5.tgz"; + sha512 = "ftM6dBJyEXLMspVSO2huTtGQapxsljpmQh5jYMaUFeCgETOWNT/KZcBGXtoBEYRBO2JRdxsSSHPloa6Fy/AWXw=="; + }; + }; + "tty-width-frame-1.0.3" = { + name = "tty-width-frame"; + packageName = "tty-width-frame"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-width-frame/-/tty-width-frame-1.0.3.tgz"; + sha512 = "k3DeWv+GnKYcFaFLK87Ecum4AWxySB0lfzQaonlHKaoum7A2DlTkWw8mfgWtz4o8Hoa4Ab/ZdDitR74LhbOK8A=="; + }; + }; "tunnel-0.0.6" = { name = "tunnel"; packageName = "tunnel"; @@ -43930,15 +44569,6 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.7.3" = { - name = "typescript"; - packageName = "typescript"; - version = "3.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz"; - sha512 = "Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw=="; - }; - }; "typescript-3.7.5" = { name = "typescript"; packageName = "typescript"; @@ -44704,6 +45334,15 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; + "universalify-1.0.0" = { + name = "universalify"; + packageName = "universalify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz"; + sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="; + }; + }; "unix-crypt-td-js-1.1.4" = { name = "unix-crypt-td-js"; packageName = "unix-crypt-td-js"; @@ -44713,13 +45352,13 @@ let sha512 = "8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw=="; }; }; - "unix-dgram-2.0.3" = { + "unix-dgram-2.0.4" = { name = "unix-dgram"; packageName = "unix-dgram"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.3.tgz"; - sha512 = "Bay5CkSLcdypcBCsxvHEvaG3mftzT5FlUnRToPWEAVxwYI8NI/8zSJ/Gknlp86MPhV6hBA8I8TBsETj2tssoHQ=="; + url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.4.tgz"; + sha512 = "7tpK6x7ls7J7pDrrAU63h93R0dVhRbPwiRRCawR10cl+2e1VOvF3bHlVJc6WI1dl/8qk5He673QU+Ogv7bPNaw=="; }; }; "unixify-1.0.0" = { @@ -45658,13 +46297,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.0.0-12" = { + "verda-1.0.0" = { name = "verda"; packageName = "verda"; - version = "1.0.0-12"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.0.0-12.tgz"; - sha512 = "pNfCbq1WlBTE0SsyajJFzkQtp+E/opy5/+8405XHE4VMQ+3Xr/h2s9OijnbHPwPDJvybV4+JCktJhc6Ru6yg7w=="; + url = "https://registry.npmjs.org/verda/-/verda-1.0.0.tgz"; + sha512 = "kr/M1CkBepFQP/jIWh9QB8x/2Ly7qzsZMJwbjUurJAhbn+FQkGxiDMcCGRGYpMGl0oL8kLmEQDVNyzFzE9AUVw=="; }; }; "verror-1.1.0" = { @@ -45712,6 +46351,15 @@ let sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; }; }; + "vertical-meter-1.0.0" = { + name = "vertical-meter"; + packageName = "vertical-meter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vertical-meter/-/vertical-meter-1.0.0.tgz"; + sha512 = "xvtone0DHRBrWSBVF2p3+/KSz/mzHvDZ7+HYB3g68hBpqIC3tIF8J1maf5osHPKHB/45iq2B+T4ju/mfxArd/Q=="; + }; + }; "vfile-1.4.0" = { name = "vfile"; packageName = "vfile"; @@ -45973,6 +46621,15 @@ let sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow=="; }; }; + "vls-0.2.0" = { + name = "vls"; + packageName = "vls"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vls/-/vls-0.2.0.tgz"; + sha512 = "B6xMWi3sOVSitcLx4zKWB5vh1DLL0Okkqy5Fa7rHSmqvPhDDn7idU+vwjWZW8IzHQO1T+brxvDjbKuSnEXNPRw=="; + }; + }; "vm-browserify-1.1.2" = { name = "vm-browserify"; packageName = "vm-browserify"; @@ -46225,13 +46882,13 @@ let sha512 = "ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw=="; }; }; - "vscode-nls-4.1.1" = { + "vscode-nls-4.1.2" = { name = "vscode-nls"; packageName = "vscode-nls"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.1.tgz"; - sha512 = "4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A=="; + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz"; + sha512 = "7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="; }; }; "vscode-textbuffer-1.0.0" = { @@ -46279,6 +46936,15 @@ let sha512 = "eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A=="; }; }; + "vscode-web-custom-data-0.1.3" = { + name = "vscode-web-custom-data"; + packageName = "vscode-web-custom-data"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-web-custom-data/-/vscode-web-custom-data-0.1.3.tgz"; + sha512 = "u9RdZ3aIjx5f0WYSb8EIcmo7trgrJk+bVfGDfjyBSlfG59XWg8xw/JVfHNpO5AklustCez3vixnGLAOWzhPkZg=="; + }; + }; "vstream-0.1.0" = { name = "vstream"; packageName = "vstream"; @@ -46315,15 +46981,6 @@ let sha512 = "ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw=="; }; }; - "vue-eslint-parser-5.0.0" = { - name = "vue-eslint-parser"; - packageName = "vue-eslint-parser"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz"; - sha512 = "JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g=="; - }; - }; "vue-eslint-parser-6.0.5" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; @@ -46351,15 +47008,6 @@ let sha512 = "RXv0lrDG2CAx3yAQCoD9beU8nAoT3rhh/fgb+xlYM0Qlm+cpkWSLTdfOt1x2j2wHI08uEsi0q7x6rjhn54EbNA=="; }; }; - "vue-language-server-0.0.62" = { - name = "vue-language-server"; - packageName = "vue-language-server"; - version = "0.0.62"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.62.tgz"; - sha512 = "Q/nwAVlBfLKz4CSA4vkA14jJcXElP1Vf+O5GZhG7sPlNKMEy91rdVwYc7IfMRZV/SCAZRak9/oo0Zy4+39dwrg=="; - }; - }; "vue-onsenui-helper-json-1.0.2" = { name = "vue-onsenui-helper-json"; packageName = "vue-onsenui-helper-json"; @@ -46549,13 +47197,13 @@ let sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; }; }; - "webpack-4.42.0" = { + "webpack-4.42.1" = { name = "webpack"; packageName = "webpack"; - version = "4.42.0"; + version = "4.42.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz"; - sha512 = "EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; + sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; }; }; "webpack-cli-3.3.11" = { @@ -46873,6 +47521,15 @@ let sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e"; }; }; + "win-user-installed-npm-cli-path-3.0.1" = { + name = "win-user-installed-npm-cli-path"; + packageName = "win-user-installed-npm-cli-path"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-user-installed-npm-cli-path/-/win-user-installed-npm-cli-path-3.0.1.tgz"; + sha512 = "Us1ZlMmWDInXihJ+SWP8/L0ArqsLqPtWK9Q67x6+q+z7C2c22viVgCmbH+x0BeMsosmPS9OKHvka519XbO51Rw=="; + }; + }; "window-size-0.1.0" = { name = "window-size"; packageName = "window-size"; @@ -47864,15 +48521,6 @@ let sha512 = "HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg=="; }; }; - "yargs-13.3.0" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; - sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; - }; - }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -47900,13 +48548,13 @@ let sha512 = "T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg=="; }; }; - "yargs-15.3.0" = { + "yargs-15.3.1" = { name = "yargs"; packageName = "yargs"; - version = "15.3.0"; + version = "15.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz"; - sha512 = "g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA=="; + url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; + sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; }; }; "yargs-3.10.0" = { @@ -47990,15 +48638,6 @@ let sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw=="; }; }; - "yargs-parser-13.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; - }; - }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -48026,13 +48665,13 @@ let sha512 = "H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg=="; }; }; - "yargs-parser-18.1.0" = { + "yargs-parser-18.1.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "18.1.0"; + version = "18.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.0.tgz"; - sha512 = "o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz"; + sha512 = "KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA=="; }; }; "yargs-parser-2.4.1" = { @@ -48188,13 +48827,13 @@ let sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; }; - "yoga-layout-prebuilt-1.9.3" = { + "yoga-layout-prebuilt-1.9.5" = { name = "yoga-layout-prebuilt"; packageName = "yoga-layout-prebuilt"; - version = "1.9.3"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.3.tgz"; - sha512 = "9SNQpwuEh2NucU83i2KMZnONVudZ86YNcFk9tq74YaqrQfgJWO3yB9uzH1tAg8iqh5c9F5j0wuyJ2z72wcum2w=="; + url = "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.5.tgz"; + sha512 = "+G5Ojl4/sG78mk5masCL3SRaZtkKXRBhMGf5c+4C1j32jN9KpS4lxVFdYyBi15EHN4gMeK5sIRf83T33TOaDkA=="; }; }; "yosay-2.0.2" = { @@ -48302,17 +48941,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.0.6"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.6.tgz"; - sha512 = "uDXhkPcHhE4G4FlY7+LJWhXErHnkn63V8lqkKD7juivs+Epmx8oXCOVObEQTbbtw7sF6s0dM8uTzHKgoefTlaA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.7.tgz"; + sha512 = "/9CUNSSVyTtTNUADZ/VXJDEdhineMN/rfd35w6VsHiob49tKkeOTggaoiSne3RY4VCTqlo7GGf4KhhVXEMGnDQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.900.6" - sources."@angular-devkit/core-9.0.6" - sources."@angular-devkit/schematics-9.0.6" - sources."@schematics/angular-9.0.6" - (sources."@schematics/update-0.900.6" // { + sources."@angular-devkit/architect-0.900.7" + sources."@angular-devkit/core-9.0.7" + sources."@angular-devkit/schematics-9.0.7" + sources."@schematics/angular-9.0.7" + (sources."@schematics/update-0.900.7" // { dependencies = [ (sources."npm-package-arg-7.0.0" // { dependencies = [ @@ -48343,7 +48982,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."builtins-1.0.3" - (sources."cacache-12.0.3" // { + (sources."cacache-12.0.4" // { dependencies = [ sources."rimraf-2.7.1" ]; @@ -48381,7 +49020,7 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.4" sources."err-code-1.1.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -48391,7 +49030,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."figures-3.2.0" sources."flush-write-stream-1.1.1" sources."forever-agent-0.6.1" @@ -48464,11 +49103,11 @@ in sources."mime-types-2.1.26" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mississippi-3.0.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" (sources."move-concurrently-1.0.1" // { dependencies = [ sources."rimraf-2.7.1" @@ -48656,7 +49295,7 @@ in sources."deep-freeze-node-1.1.3" sources."esprima-4.0.1" sources."js-yaml-3.13.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."lodash.clonedeep-4.5.0" sources."map-obj-4.1.0" sources."minimist-1.2.5" @@ -48706,9 +49345,14 @@ in sources."async-lock-1.2.2" sources."balanced-match-1.0.0" sources."base64-js-0.0.2" - sources."bl-4.0.1" + sources."bl-4.0.2" sources."bops-0.0.7" sources."brace-expansion-1.1.11" + (sources."buffer-5.5.0" // { + dependencies = [ + sources."base64-js-1.3.1" + ]; + }) sources."buffer-crc32-0.2.13" sources."buffer-equal-1.0.0" sources."cache-directory-2.0.0" @@ -48828,6 +49472,7 @@ in sources."handlebars-4.5.3" sources."has-symbols-1.0.1" sources."http-cache-semantics-4.1.0" + sources."ieee754-1.1.13" sources."ignore-5.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -48846,7 +49491,7 @@ in sources."js-yaml-3.13.1" sources."json-buffer-3.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonfile-4.0.0" sources."keyv-3.1.0" (sources."lazystream-1.0.0" // { @@ -49185,26 +49830,21 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.24" sources."@babel/code-frame-7.8.3" - (sources."@babel/compat-data-7.8.6" // { + (sources."@babel/compat-data-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - (sources."@babel/core-7.8.7" // { + (sources."@babel/core-7.9.0" // { dependencies = [ - sources."@babel/generator-7.8.8" - sources."@babel/types-7.8.7" + sources."@babel/generator-7.9.4" + sources."@babel/types-7.9.0" sources."semver-5.7.1" ]; }) sources."@babel/generator-7.8.6" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - (sources."@babel/helper-call-delegate-7.8.7" // { - dependencies = [ - sources."@babel/types-7.8.7" - ]; - }) (sources."@babel/helper-compilation-targets-7.8.7" // { dependencies = [ sources."semver-5.7.1" @@ -49219,7 +49859,11 @@ in sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" - sources."@babel/helper-module-transforms-7.8.6" + (sources."@babel/helper-module-transforms-7.9.0" // { + dependencies = [ + sources."@babel/types-7.9.0" + ]; + }) sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" @@ -49227,24 +49871,31 @@ in sources."@babel/helper-replace-supers-7.8.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" + (sources."@babel/helpers-7.9.2" // { + dependencies = [ + sources."@babel/types-7.9.0" + ]; + }) + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.8.3" + sources."@babel/plugin-proposal-numeric-separator-7.8.3" + sources."@babel/plugin-proposal-object-rest-spread-7.9.0" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" - sources."@babel/plugin-proposal-optional-chaining-7.8.3" + sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-flow-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" @@ -49254,25 +49905,25 @@ in sources."@babel/plugin-transform-async-to-generator-7.8.3" sources."@babel/plugin-transform-block-scoped-functions-7.8.3" sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.8.6" + sources."@babel/plugin-transform-classes-7.9.2" sources."@babel/plugin-transform-computed-properties-7.8.3" sources."@babel/plugin-transform-destructuring-7.8.8" sources."@babel/plugin-transform-dotall-regex-7.8.3" sources."@babel/plugin-transform-duplicate-keys-7.8.3" sources."@babel/plugin-transform-exponentiation-operator-7.8.3" - sources."@babel/plugin-transform-flow-strip-types-7.8.3" - sources."@babel/plugin-transform-for-of-7.8.6" + sources."@babel/plugin-transform-flow-strip-types-7.9.0" + sources."@babel/plugin-transform-for-of-7.9.0" sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.8.3" - sources."@babel/plugin-transform-modules-commonjs-7.8.3" - sources."@babel/plugin-transform-modules-systemjs-7.8.3" - sources."@babel/plugin-transform-modules-umd-7.8.3" + sources."@babel/plugin-transform-modules-amd-7.9.0" + sources."@babel/plugin-transform-modules-commonjs-7.9.0" + sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.8.8" + sources."@babel/plugin-transform-parameters-7.9.3" sources."@babel/plugin-transform-property-literals-7.8.3" sources."@babel/plugin-transform-regenerator-7.8.7" sources."@babel/plugin-transform-reserved-words-7.8.3" @@ -49281,30 +49932,36 @@ in sources."@babel/plugin-transform-sticky-regex-7.8.3" sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" - sources."@babel/plugin-transform-typescript-7.8.7" + sources."@babel/plugin-transform-typescript-7.9.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - (sources."@babel/preset-env-7.8.7" // { + (sources."@babel/preset-env-7.9.0" // { dependencies = [ - sources."@babel/types-7.8.7" + sources."@babel/types-7.9.0" sources."semver-5.7.1" ]; }) - sources."@babel/preset-flow-7.8.3" - sources."@babel/preset-typescript-7.8.3" - (sources."@babel/register-7.8.6" // { + sources."@babel/preset-flow-7.9.0" + sources."@babel/preset-modules-0.1.3" + sources."@babel/preset-typescript-7.9.0" + (sources."@babel/register-7.9.0" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - (sources."@babel/runtime-7.8.7" // { + (sources."@babel/runtime-7.9.2" // { dependencies = [ sources."regenerator-runtime-0.13.5" ]; }) sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" + (sources."@babel/traverse-7.9.0" // { + dependencies = [ + sources."@babel/generator-7.9.4" + sources."@babel/types-7.9.0" + ]; + }) sources."@babel/types-7.8.6" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" sources."@hapi/address-2.1.4" @@ -49391,7 +50048,7 @@ in sources."@types/cors-2.8.6" sources."@types/events-3.0.0" sources."@types/express-4.17.2" - sources."@types/express-serve-static-core-4.17.2" + sources."@types/express-serve-static-core-4.17.3" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.1" sources."@types/graphql-upload-8.0.3" @@ -49402,7 +50059,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" (sources."@types/node-fetch-2.5.5" // { dependencies = [ sources."form-data-3.0.0" @@ -49566,7 +50223,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.9.1" + sources."browserslist-4.11.0" sources."buffer-5.5.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -49584,7 +50241,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001035" + sources."caniuse-lite-1.0.30001036" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -49748,7 +50405,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.376" + sources."electron-to-chromium-1.3.383" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -49757,7 +50414,7 @@ in sources."env-ci-3.2.2" sources."envinfo-7.5.0" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -49832,7 +50489,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.120.1" + sources."flow-parser-0.121.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -49845,7 +50502,7 @@ in sources."fs-exists-sync-0.1.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."fswin-2.17.1227" sources."function-bind-1.1.1" sources."gaze-1.1.3" @@ -50006,7 +50663,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" - sources."isbinaryfile-4.0.4" + sources."isbinaryfile-4.0.5" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" @@ -50025,7 +50682,7 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."kind-of-6.0.3" @@ -50119,11 +50776,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."ms-2.0.0" sources."mute-stream-0.0.7" @@ -50250,6 +50903,7 @@ in sources."pinkie-promise-2.0.1" sources."pirates-4.0.1" sources."pkg-dir-3.0.0" + sources."pkg-up-3.1.0" (sources."portfinder-1.0.25" // { dependencies = [ sources."debug-3.2.6" @@ -50296,7 +50950,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.10.5" - sources."regenerator-transform-0.14.3" + sources."regenerator-transform-0.14.4" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -50325,7 +50979,7 @@ in sources."ret-0.1.15" sources."retry-0.12.0" sources."rimraf-2.7.1" - sources."rss-parser-3.7.5" + sources."rss-parser-3.7.6" sources."run-async-2.4.0" sources."rxjs-6.5.4" sources."safe-buffer-5.2.0" @@ -50545,7 +51199,7 @@ in sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" - sources."ts-node-8.7.0" + sources."ts-node-8.8.1" sources."tslib-1.11.1" sources."tty-1.0.1" sources."tunnel-agent-0.6.0" @@ -50793,11 +51447,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/generator-7.8.8" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" + sources."@babel/generator-7.9.4" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/types-7.9.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -50819,7 +51474,6 @@ in sources."color-name-1.1.3" sources."commander-2.20.3" sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" sources."has-flag-3.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" @@ -50878,25 +51532,32 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/core-7.8.7" // { + (sources."@babel/core-7.9.0" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.8.8" // { + (sources."@babel/generator-7.9.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.8.3" sources."@babel/helper-get-function-arity-7.8.3" + sources."@babel/helper-member-expression-to-functions-7.8.3" + sources."@babel/helper-module-imports-7.8.3" + sources."@babel/helper-module-transforms-7.9.0" + sources."@babel/helper-optimise-call-expression-7.8.3" + sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helpers-7.9.2" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -50915,7 +51576,6 @@ in sources."ejs-2.5.7" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" sources."fs-extra-5.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.1" @@ -50942,7 +51602,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" sources."lodash-4.17.15" @@ -50990,20 +51650,20 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-3.0.1.tgz"; - sha512 = "43sVUKSX0VLNfavair0OLzPoVX5rRdqAxcUUhtwKLGkKQPs2ePreOG7zpp3gZOLvZGhZxixD9JZBxWKgqH8r1g=="; + url = "https://registry.npmjs.org/asar/-/asar-3.0.2.tgz"; + sha512 = "nFtY0kToUcMEAY8f6qmeyqn+HZzovwlKsbzf5yjEnzOksFzJLTxWvP2jbzItFT04BdaL3CZKRApTr5iRofVq6g=="; }; dependencies = [ sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" - sources."commander-4.1.1" + sources."commander-5.0.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.6" @@ -51251,11 +51911,7 @@ in sources."mime-db-1.43.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."natives-1.1.6" sources."normalize-package-data-2.5.0" @@ -51374,11 +52030,7 @@ in sources."defined-1.0.0" sources."deps-sort-2.0.1" sources."des.js-1.0.1" - (sources."detective-5.2.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."detective-5.2.0" sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" @@ -51413,8 +52065,8 @@ in sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."module-deps-6.2.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -51460,11 +52112,7 @@ in }) sources."stream-splicer-2.0.1" sources."string_decoder-1.3.0" - (sources."subarg-1.0.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."subarg-1.0.0" sources."syntax-error-1.4.0" sources."through-2.3.8" sources."through2-2.0.5" @@ -51629,8 +52277,7 @@ in sources."form-data-2.3.3" (sources."fs-chunk-store-1.7.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."thunky-1.1.0" ]; }) @@ -51772,8 +52419,7 @@ in sources."query-string-1.0.1" (sources."random-access-file-2.1.3" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."random-access-storage-1.4.1" @@ -52164,13 +52810,13 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.7.2"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.7.2.tgz"; - sha512 = "j0pzvL9swPwN4sW/abHRAtm1Pc0TNMT7YwItkA8F90kaUxdfF0JQaR3AvDe1/YxFUlNHU92F2R0g2VAdcSzWEg=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.7.4.tgz"; + sha512 = "5gE7m9/Cm/HYFfW4QcpGdVK9waWTQT0pyxSSrvhIjbRjAYv+uspsCUrg6ODxruIakHaRpvqrdhodRt2cnF0NJg=="; }; dependencies = [ - sources."@babel/runtime-7.8.7" + sources."@babel/runtime-7.9.2" sources."@chemzqm/neovim-5.1.9" sources."async-2.6.3" sources."await-semaphore-0.1.3" @@ -52178,7 +52824,7 @@ in sources."brace-expansion-1.1.11" sources."bser-2.1.1" sources."chownr-1.1.4" - sources."coc.nvim-0.0.76" + sources."coc.nvim-0.0.77" sources."concat-map-0.0.1" sources."date-format-2.1.0" sources."debounce-1.2.0" @@ -52224,10 +52870,10 @@ in ]; }) sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."msgpack-lite-0.1.26" (sources."mv-2.1.1" // { @@ -52241,12 +52887,8 @@ in sources."node-int64-0.4.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."promisify-child-process-3.1.3" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."promisify-child-process-3.1.4" + sources."rc-1.2.8" sources."regenerator-runtime-0.13.5" sources."rfc-3986-1.0.1" sources."rfdc-1.1.4" @@ -52314,7 +52956,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" @@ -52369,7 +53012,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001035" + sources."caniuse-lite-1.0.30001036" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -52455,7 +53098,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.376" + sources."electron-to-chromium-1.3.383" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -52471,7 +53114,11 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -52738,23 +53385,19 @@ in sources."mimic-fn-2.1.0" ]; }) - (sources."meow-3.7.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."meow-3.7.0" sources."merge2-1.3.0" sources."micromatch-2.3.11" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."mute-stream-0.0.7" (sources."nanomatch-1.2.13" // { @@ -52896,11 +53539,7 @@ in sources."kind-of-6.0.3" ]; }) - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."rc-1.2.8" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -53046,7 +53685,6 @@ in sources."load-json-file-4.0.0" sources."map-obj-2.0.0" sources."meow-4.0.1" - sources."minimist-1.2.5" sources."parse-json-4.0.0" sources."path-type-3.0.0" sources."read-pkg-3.0.0" @@ -53291,27 +53929,34 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/core-7.8.7" // { + (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.8.8" + sources."@babel/generator-7.9.4" sources."@babel/helper-function-name-7.8.3" sources."@babel/helper-get-function-arity-7.8.3" + sources."@babel/helper-member-expression-to-functions-7.8.3" + sources."@babel/helper-module-imports-7.8.3" + sources."@babel/helper-module-transforms-7.9.0" + sources."@babel/helper-optimise-call-expression-7.8.3" + sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helpers-7.9.2" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -53336,7 +53981,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."atob-2.1.2" - (sources."autoprefixer-9.7.4" // { + (sources."autoprefixer-9.7.5" // { dependencies = [ sources."postcss-value-parser-4.0.3" ]; @@ -53354,7 +53999,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.9.1" + sources."browserslist-4.11.0" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -53362,7 +54007,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001035" + sources."caniuse-lite-1.0.30001036" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -53421,13 +54066,12 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.376" + sources."electron-to-chromium-1.3.383" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."esutils-2.0.3" sources."execall-2.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -53474,7 +54118,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-up-2.1.0" + sources."find-up-3.0.0" sources."flat-cache-2.0.1" sources."flatted-2.0.1" sources."for-in-1.0.2" @@ -53565,11 +54209,7 @@ in sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - (sources."json5-2.1.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-2.1.2" sources."kind-of-6.0.3" sources."known-css-properties-0.14.0" sources."leven-3.1.0" @@ -53578,7 +54218,7 @@ in sources."pify-3.0.0" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."log-symbols-3.0.0" sources."longest-streak-2.0.4" @@ -53601,14 +54241,14 @@ in ]; }) sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."nanomatch-1.2.13" sources."node-releases-1.1.52" @@ -53636,9 +54276,9 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.2.2" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" sources."parse-entities-1.2.2" sources."parse-json-4.0.0" sources."pascalcase-0.1.1" @@ -53651,8 +54291,9 @@ in sources."pify-3.0.0" ]; }) - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pify-4.0.1" + sources."pkg-up-3.1.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.27" // { dependencies = [ @@ -53680,7 +54321,15 @@ in sources."punycode-2.1.1" sources."quick-lru-1.1.0" sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" + (sources."read-pkg-up-3.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + ]; + }) sources."readable-stream-3.6.0" sources."redent-2.0.0" sources."regex-not-1.0.2" @@ -53894,7 +54543,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.0" @@ -53908,7 +54558,6 @@ in sources."diff-4.0.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."esutils-2.0.3" sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."has-flag-3.0.0" @@ -53917,8 +54566,8 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -53978,13 +54627,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.4.11"; + version = "1.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.11.tgz"; - sha512 = "BMqtvulotRQwgQ/UkpGDz7b+tXXQGbxYJLo3SdmFeDeVkWLBGl/oP1ythlT3aY5K3kuCv0JnDgqpoAc175CERg=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.12.tgz"; + sha512 = "JMlIDCgTBXAWh6jsY1c6aMXw50jGRMZoiAYKhX0sYVKrDZznS2ocjKw4m/9yoNPWHIH6gk89BGXXT+7XhtsGWw=="; }; dependencies = [ - sources."typescript-3.7.3" + sources."typescript-3.8.3" ]; buildInputs = globalBuildInputs; meta = { @@ -53999,38 +54648,80 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.1.7"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.7.tgz"; - sha512 = "QhVgqvOAMR/ehil8o+FezjRO6D0j8t/f5Uhn3bBY4dkAoJ0LbYHz+YNT+N0JPRYVgAJQFfRjHVdymWXRuf16wA=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.9.tgz"; + sha512 = "lF5s1hBM/92ZKW9JEjkYrbYYuvjcYirBy+8YgDH0s50iV0pVxd8vBGS/x3z50VNRLx2yp6Elu6bDXAQclp/X5g=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" + (sources."@nodelib/fs.scandir-2.1.3" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + ]; + }) sources."@nodelib/fs.stat-1.1.3" - sources."@starptech/expression-parser-0.9.0" - sources."@starptech/hast-util-from-webparser-0.9.0" - sources."@starptech/prettyhtml-0.9.0" - sources."@starptech/prettyhtml-formatter-0.9.0" - sources."@starptech/prettyhtml-hast-to-html-0.9.0" - sources."@starptech/prettyhtml-hastscript-0.9.0" - sources."@starptech/prettyhtml-sort-attributes-0.9.0" - sources."@starptech/rehype-minify-whitespace-0.9.0" - sources."@starptech/rehype-webparser-0.9.0" - sources."@starptech/webparser-0.9.0" - sources."@types/node-13.9.1" + sources."@nodelib/fs.walk-1.2.4" + sources."@sindresorhus/is-0.14.0" + sources."@sorg/log-2.1.0" + sources."@starptech/expression-parser-0.10.0" + sources."@starptech/hast-util-from-webparser-0.10.0" + sources."@starptech/prettyhtml-0.10.0" + sources."@starptech/prettyhtml-formatter-0.10.0" + sources."@starptech/prettyhtml-hast-to-html-0.10.0" + sources."@starptech/prettyhtml-hastscript-0.10.0" + sources."@starptech/prettyhtml-sort-attributes-0.10.0" + sources."@starptech/rehype-minify-whitespace-0.10.0" + sources."@starptech/rehype-webparser-0.10.0" + sources."@starptech/webparser-0.10.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" + sources."@types/eslint-visitor-keys-1.0.0" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/json-schema-7.0.4" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.9.3" + sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" + (sources."@typescript-eslint/experimental-utils-1.13.0" // { + dependencies = [ + sources."eslint-scope-4.0.3" + ]; + }) + sources."@typescript-eslint/parser-1.13.0" + (sources."@typescript-eslint/typescript-estree-1.13.0" // { + dependencies = [ + sources."semver-5.5.0" + ]; + }) sources."abbrev-1.1.1" - sources."acorn-6.4.1" + sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" + (sources."aggregate-error-3.0.1" // { + dependencies = [ + sources."indent-string-4.0.0" + ]; + }) sources."ajv-6.12.0" - sources."ajv-keywords-2.1.1" - sources."ansi-align-2.0.0" - sources."ansi-escapes-3.2.0" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + (sources."ansi-escapes-4.3.1" // { + dependencies = [ + sources."type-fest-0.11.0" + ]; + }) sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" (sources."anymatch-1.3.2" // { @@ -54062,17 +54753,6 @@ in sources."async-1.5.2" sources."async-each-1.0.3" sources."atob-2.1.2" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."js-tokens-3.0.2" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - sources."babel-runtime-6.26.0" sources."bail-1.0.5" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -54083,7 +54763,14 @@ in sources."binary-extensions-1.13.1" sources."bindings-1.5.0" sources."bootstrap-vue-helper-json-1.1.1" - sources."boxen-1.3.0" + (sources."boxen-3.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."camelcase-5.3.1" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -54094,16 +54781,16 @@ in sources."buffer-from-1.1.1" sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" - sources."call-me-maybe-1.0.1" - (sources."caller-path-0.1.0" // { + (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."callsites-0.2.0" + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" ]; }) + sources."call-me-maybe-1.0.1" sources."callsites-3.1.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54118,8 +54805,7 @@ in sources."is-glob-2.0.1" ]; }) - sources."ci-info-1.6.0" - sources."circular-json-0.3.3" + sources."ci-info-2.0.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -54138,12 +54824,13 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-1.0.0" - sources."cli-cursor-2.1.0" + sources."clean-stack-2.2.0" + sources."cli-boxes-2.2.0" + sources."cli-cursor-3.1.0" sources."cli-width-2.2.0" sources."cliui-4.1.0" sources."clone-1.0.4" - sources."co-4.6.0" + sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.6" sources."collection-visit-1.0.0" @@ -54162,11 +54849,10 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."config-chain-1.1.12" - sources."configstore-3.1.2" + sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" + sources."core-js-3.6.4" sources."core-util-is-1.0.2" - sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" (sources."css-2.2.4" // { @@ -54175,6 +54861,7 @@ in ]; }) sources."css-parse-2.0.0" + sources."csstype-2.6.9" sources."currently-unhandled-0.4.1" sources."debug-3.2.6" sources."decamelize-1.2.0" @@ -54184,10 +54871,32 @@ in ]; }) sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."defaults-1.0.3" + sources."defer-to-connect-1.1.3" sources."define-property-2.0.2" + (sources."del-5.1.0" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.2" + sources."fill-range-7.0.1" + sources."globby-10.0.2" + sources."ignore-5.1.4" + sources."is-number-7.0.0" + sources."is-path-inside-3.0.2" + sources."micromatch-4.0.2" + sources."path-type-4.0.0" + sources."rimraf-3.0.2" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."del-cli-3.0.0" sources."diff-4.0.2" sources."dir-glob-2.0.0" sources."dlv-1.1.3" @@ -54200,26 +54909,32 @@ in sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-5.16.0" // { + (sources."eslint-6.8.0" // { dependencies = [ - sources."cross-spawn-6.0.5" + sources."ansi-regex-4.1.0" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."debug-4.1.1" sources."ignore-4.0.6" + sources."semver-6.3.0" + sources."strip-ansi-5.2.0" + sources."strip-json-comments-3.0.1" ]; }) - (sources."eslint-plugin-vue-5.2.3" // { - dependencies = [ - sources."debug-4.1.1" - sources."espree-4.1.0" - sources."vue-eslint-parser-5.0.0" - ]; - }) - sources."eslint-scope-4.0.3" + sources."eslint-plugin-vue-6.2.2" + sources."eslint-scope-5.0.0" sources."eslint-utils-1.4.3" sources."eslint-visitor-keys-1.1.0" - sources."espree-5.0.1" + sources."espree-6.2.1" sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -54268,11 +54983,20 @@ in ]; }) sources."fast-deep-equal-3.1.1" - sources."fast-glob-2.2.7" + (sources."fast-glob-2.2.7" // { + dependencies = [ + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.6.1" sources."fault-1.0.4" - sources."figures-2.0.0" + sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" @@ -54290,7 +55014,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -54304,16 +55028,20 @@ in sources."is-glob-2.0.1" ]; }) - (sources."glob-parent-3.1.0" // { + sources."glob-parent-5.1.1" + sources."glob-to-regexp-0.3.0" + sources."global-dirs-0.1.1" + (sources."globals-12.4.0" // { dependencies = [ - sources."is-glob-3.1.0" + sources."type-fest-0.8.1" ]; }) - sources."glob-to-regexp-0.3.0" - sources."global-dirs-0.1.1" - sources."globals-11.12.0" sources."globby-8.0.2" - sources."got-6.7.1" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) sources."graceful-fs-4.2.3" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" @@ -54330,16 +55058,18 @@ in sources."kind-of-4.0.0" ]; }) + sources."has-yarn-2.1.0" sources."hast-util-embedded-1.0.5" sources."hast-util-has-property-1.0.4" - sources."hast-util-is-body-ok-link-1.0.2" + sources."hast-util-is-body-ok-link-1.0.3" sources."hast-util-is-element-1.0.4" sources."hast-util-parse-selector-2.2.4" - sources."hast-util-to-string-1.0.2" + sources."hast-util-to-string-1.0.3" sources."hast-util-whitespace-1.0.4" sources."hosted-git-info-2.8.8" sources."html-void-elements-1.0.5" - sources."html-whitespace-sensitive-tag-names-1.0.1" + sources."html-whitespace-sensitive-tag-names-1.0.2" + sources."http-cache-semantics-4.1.0" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" (sources."import-fresh-3.2.1" // { @@ -54353,10 +55083,19 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-6.5.2" // { + (sources."inquirer-7.1.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.1.0" ]; }) sources."invert-kv-2.0.0" @@ -54366,7 +55105,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-2.0.4" - sources."is-ci-1.2.1" + sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -54380,7 +55119,7 @@ in sources."is-hexadecimal-1.0.4" sources."is-hidden-1.1.3" sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" + sources."is-npm-3.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."is-buffer-1.1.6" @@ -54389,33 +55128,35 @@ in }) sources."is-obj-1.0.1" sources."is-object-1.0.1" + sources."is-path-cwd-2.2.0" sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" sources."is-promise-2.1.0" - sources."is-redirect-1.0.0" - sources."is-resolvable-1.1.0" - sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" + sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."js-beautify-1.10.3" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" + sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonc-parser-1.0.3" + sources."keyv-3.1.0" sources."kind-of-6.0.3" - sources."latest-version-3.1.0" + sources."latest-version-5.1.0" sources."lcid-2.0.0" sources."levn-0.3.0" + sources."lines-and-columns-1.1.6" sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" @@ -54448,11 +55189,7 @@ in sources."map-visit-1.0.0" sources."markdown-table-0.4.0" sources."math-random-1.0.4" - (sources."mem-4.3.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) + sources."mem-4.3.0" (sources."meow-5.0.0" // { dependencies = [ sources."read-pkg-up-3.0.0" @@ -54460,7 +55197,8 @@ in }) sources."merge2-1.3.0" sources."micromatch-3.1.10" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minimist-options-3.0.2" @@ -54469,21 +55207,19 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."mout-0.5.0" sources."ms-2.1.2" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" sources."nan-2.14.0" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" + sources."node-fetch-2.6.0" sources."nopt-4.0.3" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" + sources."normalize-url-4.5.0" sources."npm-prefix-1.2.0" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -54507,7 +55243,7 @@ in sources."object.omit-2.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-2.0.1" + sources."onetime-5.1.0" sources."optionator-0.8.3" sources."os-homedir-1.0.2" (sources."os-locale-3.1.0" // { @@ -54519,13 +55255,19 @@ in }) sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" + sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" + sources."p-map-3.0.0" sources."p-try-1.0.0" - sources."package-json-4.0.1" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."parent-module-1.0.1" sources."parse-entities-1.2.2" sources."parse-gitignore-1.0.1" @@ -54544,6 +55286,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."path-type-3.0.0" + sources."picomatch-2.2.2" sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -54557,38 +55300,45 @@ in sources."strip-bom-2.0.0" ]; }) - sources."pluralize-7.0.0" sources."posix-character-classes-0.1.1" sources."prelude-ls-1.1.2" - sources."prepend-http-1.0.4" + sources."prepend-http-2.0.0" sources."preserve-0.2.0" sources."prettier-1.19.1" - (sources."prettier-eslint-8.8.2" // { + (sources."prettier-eslint-9.0.1" // { dependencies = [ - sources."acorn-5.7.4" + sources."acorn-6.4.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" ]; }) - sources."ajv-5.5.2" - sources."chardet-0.4.2" - sources."doctrine-2.1.0" - sources."eslint-4.19.1" - sources."eslint-scope-3.7.3" - sources."espree-3.5.4" - sources."external-editor-2.2.0" - sources."fast-deep-equal-1.1.0" - sources."file-entry-cache-2.0.0" - sources."flat-cache-1.3.4" - sources."inquirer-3.3.0" - sources."json-schema-traverse-0.3.1" - sources."regexpp-1.1.0" - sources."slice-ansi-1.0.0" - sources."table-4.0.2" - sources."typescript-2.9.2" - sources."vue-eslint-parser-2.0.3" - sources."write-0.2.1" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.1.0" + sources."cli-cursor-2.1.0" + sources."cross-spawn-6.0.5" + sources."debug-4.1.1" + sources."eslint-5.16.0" + sources."eslint-scope-4.0.3" + sources."espree-5.0.1" + sources."figures-2.0.0" + sources."globals-11.12.0" + sources."ignore-4.0.6" + sources."indent-string-4.0.0" + sources."inquirer-6.5.2" + sources."mimic-fn-1.2.0" + sources."mute-stream-0.0.7" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" + sources."strip-ansi-5.2.0" + (sources."vue-eslint-parser-2.0.3" // { + dependencies = [ + sources."acorn-5.7.4" + sources."debug-3.2.6" + sources."eslint-scope-3.7.3" + sources."espree-3.5.4" + ]; + }) ]; }) sources."prettier-tslint-0.4.2" @@ -54608,24 +55358,31 @@ in }) sources."rc-1.2.8" sources."read-pkg-3.0.0" - (sources."read-pkg-up-4.0.0" // { + (sources."read-pkg-up-7.0.1" // { dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" + sources."parse-json-5.0.0" + sources."path-exists-4.0.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + sources."type-fest-0.8.1" ]; }) sources."readable-stream-2.3.7" sources."readdirp-2.2.1" sources."redent-2.0.0" - sources."regenerator-runtime-0.11.1" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."regexpp-2.0.1" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" + sources."registry-auth-token-4.1.1" + sources."registry-url-5.1.0" sources."rehype-sort-attribute-values-2.0.1" (sources."remark-5.1.0" // { dependencies = [ @@ -54646,24 +55403,22 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - (sources."require-uncached-1.0.3" // { - dependencies = [ - sources."resolve-from-1.0.1" - ]; - }) sources."resolve-1.15.1" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" - sources."restore-cursor-2.0.0" + sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" + sources."reusify-1.0.4" sources."rimraf-2.6.3" sources."run-async-2.4.0" - sources."rx-lite-4.0.8" - sources."rx-lite-aggregates-4.0.8" + sources."run-parallel-1.1.9" sources."rxjs-6.5.4" + sources."s.color-0.0.13" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" + sources."sass-formatter-0.4.4" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -54788,6 +55543,9 @@ in ]; }) sources."stylus-supremacy-2.14.0" + sources."suf-cli-0.1.1" + sources."suf-node-1.1.1" + sources."suf-regex-0.0.14" sources."supports-color-5.5.0" sources."symbol-0.2.3" (sources."table-5.4.6" // { @@ -54800,7 +55558,6 @@ in sources."term-size-1.2.0" sources."text-table-0.2.0" sources."through-2.3.8" - sources."timed-out-4.0.1" sources."tmp-0.0.33" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -54808,13 +55565,10 @@ in sources."kind-of-3.2.2" ]; }) + sources."to-readable-stream-1.0.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - (sources."to-vfile-5.0.3" // { - dependencies = [ - sources."vfile-3.0.1" - ]; - }) + sources."to-vfile-6.1.0" sources."trim-0.0.1" sources."trim-newlines-2.0.0" sources."trim-trailing-lines-1.1.3" @@ -54823,23 +55577,28 @@ in sources."tslint-5.20.1" sources."tsutils-2.29.0" sources."type-check-0.3.2" + sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."typescript-3.8.3" - (sources."typescript-eslint-parser-16.0.1" // { - dependencies = [ - sources."semver-5.5.0" - ]; - }) sources."unherit-1.1.3" (sources."unified-7.1.0" // { dependencies = [ + sources."unist-util-stringify-position-1.1.2" sources."vfile-3.0.1" + sources."vfile-message-1.1.1" ]; }) (sources."unified-engine-6.0.1" // { dependencies = [ sources."to-vfile-4.0.0" + sources."unist-util-stringify-position-1.1.2" sources."vfile-3.0.1" + sources."vfile-message-1.1.1" + (sources."vfile-reporter-5.1.2" // { + dependencies = [ + sources."unist-util-stringify-position-2.0.3" + ]; + }) ]; }) sources."union-value-1.0.1" @@ -54849,7 +55608,7 @@ in sources."unist-util-is-2.1.3" sources."unist-util-modify-children-1.1.6" sources."unist-util-remove-position-1.1.4" - sources."unist-util-stringify-position-1.1.2" + sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { dependencies = [ @@ -54867,30 +55626,31 @@ in ]; }) sources."untildify-2.1.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" + sources."update-notifier-3.0.1" sources."uri-js-4.2.2" sources."urix-0.1.0" - sources."url-parse-lax-1.0.0" + sources."url-parse-lax-3.0.0" sources."use-3.1.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" + sources."v8-compile-cache-2.1.0" sources."validate-npm-package-license-3.0.4" - (sources."vfile-4.0.3" // { - dependencies = [ - sources."unist-util-stringify-position-2.0.3" - sources."vfile-message-2.0.3" - ]; - }) + sources."vfile-4.0.3" sources."vfile-location-2.0.6" - sources."vfile-message-1.1.1" - (sources."vfile-reporter-5.1.2" // { + sources."vfile-message-2.0.3" + (sources."vfile-reporter-6.0.1" // { dependencies = [ - sources."unist-util-stringify-position-2.0.3" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-6.1.0" ]; }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" + sources."vls-0.2.0" (sources."vscode-css-languageservice-4.1.1" // { dependencies = [ sources."vscode-uri-2.1.1" @@ -54898,19 +55658,18 @@ in }) sources."vscode-emmet-helper-1.2.17" sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageserver-5.3.0-next.10" + sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.1" - sources."vscode-textbuffer-1.0.0" + sources."vscode-nls-4.1.2" sources."vscode-uri-1.0.8" - (sources."vue-eslint-parser-6.0.5" // { + sources."vscode-web-custom-data-0.1.3" + (sources."vue-eslint-parser-7.0.0" // { dependencies = [ sources."debug-4.1.1" ]; }) - sources."vue-language-server-0.0.62" sources."vue-onsenui-helper-json-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -55023,7 +55782,7 @@ in }) sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.1" sources."yaml-ast-parser-custom-tags-0.0.43" sources."yaml-language-server-0.7.2" @@ -55040,10 +55799,10 @@ in coc-yank = nodeEnv.buildNodePackage { name = "coc-yank"; packageName = "coc-yank"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.3.tgz"; - sha512 = "m+hjR2e1Pc4CikJCh1u+XiyeWK7O9aBWWqk6nSkJp22wC8moIVgRa1PYbGpzKAAXem+Ts0BzVw2IRF5EES0MQg=="; + url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.4.tgz"; + sha512 = "8qonhyBfipzni6Fbbdm9hOjUIdLtwPGqnVGxA5DV+Kd4ctvD+FiBRuaWnXWf4QqxC8ATHQyTyoSqrvdXdko4PA=="; }; buildInputs = globalBuildInputs; meta = { @@ -55208,7 +55967,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.0" @@ -55818,7 +56577,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."aggregate-error-3.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -56179,7 +56938,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -56267,7 +57026,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" @@ -56321,10 +57080,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.0.tgz"; - sha512 = "BR5jXjJH6Bz0vHAIoF0pH2K+hX+Frd93UGZjjCUB1k1JJDZbM+QyigTXZ08ddJ02AQ+iYfNyM77WgDwKQBl00g=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.1.tgz"; + sha512 = "i0Zxiqj8Q2tMJkMousrZdB/vlvtoAZyN49bgAfM4yHhWQUzrpM1rZU7TX1Rg5bbDQ1R8Gk/usNnpkDzEHJdVXg=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -56386,8 +57145,8 @@ in sources."lodash-4.17.15" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."once-1.4.0" @@ -56880,11 +57639,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."multi-random-access-2.1.1" sources."multicast-dns-7.2.1" @@ -57402,7 +58157,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.639.0" + sources."aws-sdk-2.644.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -57555,24 +58310,33 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/core-7.8.7" - sources."@babel/generator-7.8.8" - sources."@babel/helper-builder-react-jsx-7.8.3" + sources."@babel/core-7.9.0" + sources."@babel/generator-7.9.4" + sources."@babel/helper-annotate-as-pure-7.8.3" + sources."@babel/helper-builder-react-jsx-7.9.0" + sources."@babel/helper-builder-react-jsx-experimental-7.9.0" sources."@babel/helper-function-name-7.8.3" sources."@babel/helper-get-function-arity-7.8.3" + sources."@babel/helper-member-expression-to-functions-7.8.3" + sources."@babel/helper-module-imports-7.8.3" + sources."@babel/helper-module-transforms-7.9.0" + sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" + sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" - sources."@babel/plugin-proposal-object-rest-spread-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/helpers-7.9.2" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" + sources."@babel/plugin-proposal-object-rest-spread-7.9.0" sources."@babel/plugin-syntax-jsx-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.8.8" - sources."@babel/plugin-transform-react-jsx-7.8.3" + sources."@babel/plugin-transform-react-jsx-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" sources."@sindresorhus/is-2.1.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -57580,9 +58344,10 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" + sources."@types/yoga-layout-1.9.1" sources."ajv-6.12.0" (sources."ansi-escapes-4.3.1" // { dependencies = [ @@ -57595,7 +58360,7 @@ in sources."arrify-2.0.1" sources."astral-regex-2.0.0" sources."auto-bind-4.0.0" - sources."cacheable-lookup-2.0.0" + sources."cacheable-lookup-2.0.1" (sources."cacheable-request-7.0.1" // { dependencies = [ sources."get-stream-5.1.0" @@ -57610,7 +58375,7 @@ in sources."ci-info-2.0.0" sources."cli-cursor-3.1.0" sources."cli-truncate-2.1.0" - sources."clipboardy-2.2.0" + sources."clipboardy-2.3.0" (sources."clone-response-1.0.2" // { dependencies = [ sources."mimic-response-1.0.1" @@ -57643,7 +58408,6 @@ in sources."env-paths-2.2.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" sources."execa-1.0.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" @@ -57698,7 +58462,7 @@ in sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."keyv-4.0.0" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" @@ -57734,7 +58498,7 @@ in sources."mimic-fn-3.0.0" ]; }) - (sources."meow-6.0.1" // { + (sources."meow-6.1.0" // { dependencies = [ sources."type-fest-0.8.1" ]; @@ -57773,8 +58537,8 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."quick-lru-4.0.1" - sources."react-16.13.0" - sources."react-is-16.13.0" + sources."react-16.13.1" + sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -57845,8 +58609,8 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."yargs-parser-16.1.0" - sources."yoga-layout-prebuilt-1.9.3" + sources."yargs-parser-18.1.1" + sources."yoga-layout-prebuilt-1.9.5" ]; buildInputs = globalBuildInputs; meta = { @@ -57885,7 +58649,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."@types/color-name-1.1.1" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" @@ -57924,7 +58689,11 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -57939,7 +58708,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -57972,8 +58741,8 @@ in sources."lodash-4.17.15" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-compare-1.4.0" @@ -58050,14 +58819,15 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.0.tgz"; - sha512 = "cNZFOYG+Quphqj+GPoTNe9nsDCRJo2AjHVpu4RkvAxH8+vR2ckvm7ksr+Lwi+kkKuMf4h+QifTAXJ0HuBkJ7FA=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.1.tgz"; + sha512 = "eYr8vOwCQynnI8b5e5R07D2JI6jCItT9QZzWKGZnqMs9lKN+z0bvn1ULCNKp0u4mz1V+lLRglIDiSGIkIDDcLw=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."@types/color-name-1.1.1" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" @@ -58098,7 +58868,11 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -58113,7 +58887,7 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" @@ -58146,8 +58920,8 @@ in sources."lodash-4.17.15" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."nanolru-1.0.0" @@ -58419,7 +59193,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/highlight-7.8.3" // { + sources."@babel/helper-validator-identifier-7.9.0" + (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -58460,7 +59235,6 @@ in sources."error-ex-1.3.2" sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" sources."execa-4.0.0" sources."external-editor-3.1.0" sources."figures-3.2.0" @@ -58503,7 +59277,7 @@ in sources."lodash-4.17.15" sources."lru-cache-4.1.5" sources."map-obj-4.1.0" - (sources."meow-6.0.1" // { + (sources."meow-6.1.0" // { dependencies = [ sources."type-fest-0.8.1" ]; @@ -58595,7 +59369,7 @@ in sources."which-2.0.2" sources."wrappy-1.0.2" sources."yallist-2.1.2" - sources."yargs-parser-16.1.0" + sources."yargs-parser-18.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -58703,7 +59477,7 @@ in sources."define-property-2.0.2" sources."defined-0.0.0" sources."director-1.2.7" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" (sources."event-stream-0.5.3" // { @@ -58756,7 +59530,7 @@ in sources."forever-monitor-2.0.0" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."get-value-2.0.6" (sources."glob-7.1.6" // { @@ -58825,9 +59599,9 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."mixin-deep-1.3.2" - (sources."mkdirp-0.5.1" // { + (sources."mkdirp-0.5.4" // { dependencies = [ - sources."minimist-0.0.8" + sources."minimist-1.2.5" ]; }) sources."ms-2.0.0" @@ -59108,11 +59882,7 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."moo-0.5.1" sources."ms-2.1.2" @@ -59277,7 +60047,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/highlight-7.8.3" // { + sources."@babel/helper-validator-identifier-7.9.0" + (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -59352,7 +60123,6 @@ in sources."error-ex-1.3.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" sources."execa-4.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.1" @@ -59429,7 +60199,7 @@ in sources."lowercase-keys-1.0.1" sources."make-dir-3.0.2" sources."map-obj-4.1.0" - (sources."meow-6.0.1" // { + (sources."meow-6.1.0" // { dependencies = [ sources."type-fest-0.8.1" ]; @@ -59526,7 +60296,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" - sources."yargs-parser-16.1.0" + sources."yargs-parser-18.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -59994,11 +60764,7 @@ in sources."yallist-4.0.0" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.2" @@ -60820,7 +61586,7 @@ in sources."fragment-cache-0.2.1" sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-value-2.0.6" @@ -61625,11 +62391,7 @@ in sources."lodash-4.17.15" sources."mime-1.6.0" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."opener-1.5.1" (sources."optimist-0.6.1" // { @@ -61638,7 +62400,7 @@ in ]; }) sources."portfinder-1.0.25" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" sources."union-0.5.0" @@ -61738,9 +62500,9 @@ in sources."isstream-0.1.2" sources."minimatch-3.0.4" sources."minimist-0.0.10" - (sources."mkdirp-0.5.1" // { + (sources."mkdirp-0.5.4" // { dependencies = [ - sources."minimist-0.0.8" + sources."minimist-1.2.5" ]; }) sources."moment-2.24.0" @@ -61829,7 +62591,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.4.1" - sources."jquery.terminal-2.15.0" + sources."jquery.terminal-2.15.2" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -62046,11 +62808,7 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."netmask-1.0.6" @@ -62076,7 +62834,7 @@ in sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."raw-body-2.4.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" @@ -62202,26 +62960,28 @@ in name = "iosevka-build-deps"; packageName = "iosevka-build-deps"; version = "2.3.3"; - src = ../../../pkgs/data/fonts/iosevka; + src = ../../data/fonts/iosevka; dependencies = [ + sources."@types/color-name-1.1.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."ajv-6.12.0" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bezier-js-2.5.1" + sources."bezier-js-2.6.0" sources."bindings-1.5.0" sources."block-stream-0.0.9" sources."bluebird-3.7.2" @@ -62230,9 +62990,9 @@ in sources."camelcase-4.1.0" sources."caryll-shapeops-0.3.1" sources."caseless-0.12.0" - sources."chalk-2.4.2" + sources."chalk-3.0.0" sources."child-process-promise-2.2.1" - sources."cli-cursor-2.1.0" + sources."cli-cursor-3.1.0" sources."clipper-lib-1.0.0" (sources."cliui-3.2.0" // { dependencies = [ @@ -62241,8 +63001,8 @@ in }) sources."clone-2.1.2" sources."code-point-at-1.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."complex.js-2.0.11" @@ -62262,11 +63022,9 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.2" - sources."emoji-regex-7.0.3" - sources."end-of-stream-1.4.4" + sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" sources."escape-latex-1.2.0" - sources."escape-string-regexp-1.0.5" sources."escodegen-1.14.1" (sources."escope-1.0.3" // { dependencies = [ @@ -62324,7 +63082,7 @@ in sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-2.8.8" sources."http-signature-1.2.0" @@ -62353,7 +63111,6 @@ in sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lru-cache-4.1.5" - sources."map-age-cleaner-0.1.3" sources."mathjs-5.10.3" sources."megaminx-0.9.0" sources."mem-1.1.0" @@ -62362,11 +63119,10 @@ in sources."mime-types-2.1.26" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."nan-2.14.0" - sources."nice-try-1.0.5" (sources."node-gyp-3.8.0" // { dependencies = [ sources."semver-5.3.0" @@ -62381,7 +63137,11 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-2.0.1" + (sources."onetime-5.1.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" @@ -62400,9 +63160,7 @@ in sources."yargs-8.0.2" ]; }) - sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -62440,10 +63198,8 @@ in sources."primitive-quadify-off-curves-0.4.1" sources."process-nextick-args-2.0.1" sources."promise-polyfill-6.1.0" - sources."proper-lockfile-3.2.0" sources."pseudomap-1.0.2" sources."psl-1.7.0" - sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-pkg-2.0.0" @@ -62454,9 +63210,8 @@ in sources."require-main-filename-1.0.1" sources."resolve-1.15.1" sources."resolve-url-0.2.1" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."resumer-0.0.0" - sources."retry-0.12.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -62498,7 +63253,7 @@ in sources."source-map-0.7.3" ]; }) - sources."supports-color-5.5.0" + sources."supports-color-7.1.0" sources."tar-2.2.2" sources."temp-0.8.4" sources."through-2.3.8" @@ -62522,35 +63277,31 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - (sources."verda-1.0.0-12" // { + (sources."verda-1.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."camelcase-5.3.1" - (sources."cliui-4.1.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."cross-spawn-6.0.5" - sources."execa-1.0.0" - sources."fast-deep-equal-2.0.1" - sources."find-up-3.0.0" - sources."fs-extra-6.0.1" - sources."get-stream-4.1.0" - sources."invert-kv-2.0.0" - sources."jsonfile-4.0.0" - sources."lcid-2.0.0" - sources."locate-path-3.0.0" - sources."mem-4.3.0" - sources."mimic-fn-2.1.0" - sources."os-locale-3.1.0" + sources."cliui-6.0.0" + sources."find-up-4.1.0" + sources."fs-extra-9.0.0" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-3.0.0" + sources."jsonfile-6.0.1" + sources."locate-path-5.0.0" sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."strip-ansi-5.2.0" - sources."yargs-12.0.5" - sources."yargs-parser-11.1.1" + sources."path-exists-4.0.0" + sources."require-main-filename-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."tslib-1.11.1" + sources."universalify-1.0.0" + sources."which-2.0.2" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.0" + sources."yargs-15.3.1" + sources."yargs-parser-18.1.1" ]; }) sources."verror-1.10.0" @@ -62570,8 +63321,12 @@ in (sources."yargs-14.2.3" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" sources."camelcase-5.3.1" sources."cliui-5.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."emoji-regex-7.0.3" sources."find-up-3.0.0" sources."get-caller-file-2.0.5" sources."is-fullwidth-code-point-2.0.0" @@ -62737,7 +63492,7 @@ in sources."@yarnpkg/lockfile-1.1.0" sources."abab-2.0.3" sources."abbrev-1.1.1" - sources."acorn-5.7.4" + sources."acorn-7.1.1" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.1" @@ -62776,7 +63531,6 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-limiter-1.0.1" sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -62789,9 +63543,10 @@ in ]; }) sources."base-64-0.1.0" + sources."base64-js-1.3.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bl-4.0.1" + sources."bl-4.0.2" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -62799,6 +63554,7 @@ in ]; }) sources."browser-process-hrtime-1.0.0" + sources."buffer-5.5.0" sources."cache-base-1.0.1" sources."camel-case-3.0.0" sources."camelcase-4.1.0" @@ -62859,15 +63615,15 @@ in sources."cross-spawn-6.0.5" sources."crypt-0.0.2" sources."css-2.2.4" - sources."cssom-0.3.8" - sources."cssstyle-1.4.0" - sources."cwise-compiler-1.1.3" - sources."dashdash-1.14.1" - (sources."data-urls-1.1.0" // { + sources."cssom-0.4.4" + (sources."cssstyle-2.2.0" // { dependencies = [ - sources."whatwg-url-7.1.0" + sources."cssom-0.3.8" ]; }) + sources."cwise-compiler-1.1.3" + sources."dashdash-1.14.1" + sources."data-urls-1.1.0" sources."debug-3.2.6" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" @@ -63014,6 +63770,7 @@ in sources."http-errors-1.7.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" sources."ignore-walk-3.0.3" (sources."image-data-uri-2.0.1" // { dependencies = [ @@ -63052,6 +63809,7 @@ in ]; }) sources."iota-array-1.0.0" + sources."ip-regex-2.1.0" sources."is-absolute-0.2.6" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.3.2" @@ -63081,12 +63839,12 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."joplin-turndown-4.0.23" + sources."joplin-turndown-4.0.24" sources."joplin-turndown-plugin-gfm-1.0.12" sources."jpeg-js-0.1.2" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" - sources."jsdom-11.12.0" + sources."jsdom-15.2.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -63102,7 +63860,6 @@ in sources."klaw-1.3.1" sources."klaw-sync-6.0.0" sources."lazyness-1.1.1" - sources."left-pad-1.3.0" sources."levenshtein-1.0.5" sources."levn-0.3.0" sources."linkify-it-2.2.0" @@ -63162,11 +63919,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."ms-2.1.2" (sources."multiparty-4.2.1" // { @@ -63234,7 +63987,7 @@ in sources."p-locate-2.0.0" sources."p-try-1.0.0" sources."param-case-2.1.1" - sources."parse5-4.0.0" + sources."parse5-5.1.0" sources."pascalcase-0.1.1" (sources."patch-package-6.2.1" // { dependencies = [ @@ -63276,10 +64029,15 @@ in (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" + sources."tough-cookie-2.5.0" ]; }) sources."request-promise-core-1.1.3" - sources."request-promise-native-1.0.8" + (sources."request-promise-native-1.0.8" // { + dependencies = [ + sources."tough-cookie-2.5.0" + ]; + }) sources."requires-port-1.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -63289,6 +64047,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" + sources."saxes-3.1.11" sources."semver-5.7.1" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" @@ -63424,7 +64183,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.35.1" + sources."terminal-kit-1.35.2" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -63441,7 +64200,7 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" - sources."tough-cookie-2.5.0" + sources."tough-cookie-3.0.1" sources."tr46-1.0.1" sources."tree-kit-0.6.2" sources."tunnel-agent-0.6.0" @@ -63482,10 +64241,11 @@ in sources."valid-url-1.0.9" sources."verror-1.10.0" sources."w3c-hr-time-1.0.2" + sources."w3c-xmlserializer-1.1.2" sources."webidl-conversions-4.0.2" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-6.5.0" + sources."whatwg-url-7.1.0" sources."which-1.3.1" sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" @@ -63498,10 +64258,11 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-5.2.2" + sources."ws-7.2.3" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" + sources."xmlchars-2.2.0" sources."yallist-4.0.0" sources."yargs-parser-7.0.0" ]; @@ -63538,8 +64299,8 @@ in sources."ini-1.3.5" sources."lru-cache-4.1.5" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."nopt-4.0.3" sources."once-1.4.0" sources."os-homedir-1.0.2" @@ -63595,7 +64356,7 @@ in sha512 = "Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A=="; }; dependencies = [ - sources."@babel/parser-7.8.8" + sources."@babel/parser-7.9.4" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -63610,8 +64371,8 @@ in sources."markdown-it-anchor-5.2.5" sources."marked-0.7.0" sources."mdurl-1.0.1" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."requizzle-0.2.3" sources."sprintf-js-1.0.3" sources."strip-json-comments-3.0.1" @@ -63761,7 +64522,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" @@ -63944,7 +64705,11 @@ in sources."mime-types-2.1.26" sources."mimic-response-1.0.1" sources."minimist-1.2.5" - sources."morgan-1.9.1" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) sources."ms-2.0.0" sources."nanoid-2.1.11" sources."negotiator-0.6.2" @@ -64045,8 +64810,8 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."y18n-4.0.0" - sources."yargs-15.3.0" - sources."yargs-parser-18.1.0" + sources."yargs-15.3.1" + sources."yargs-parser-18.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -64160,7 +64925,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.1.2" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."graceful-fs-4.2.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" @@ -64203,7 +64968,7 @@ in sources."parseuri-0.0.5" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pseudomap-1.0.2" sources."qjobs-1.2.0" sources."qs-6.7.0" @@ -64751,7 +65516,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -64804,7 +65569,7 @@ in sources."builtins-1.0.3" sources."byline-5.0.0" sources."byte-size-5.0.1" - sources."cacache-12.0.3" + sources."cacache-12.0.4" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -64888,7 +65653,6 @@ in dependencies = [ sources."concat-stream-2.0.0" sources."meow-4.0.1" - sources."minimist-1.2.5" sources."readable-stream-3.6.0" ]; }) @@ -64940,7 +65704,7 @@ in sources."envinfo-7.5.0" sources."err-code-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -64993,7 +65757,7 @@ in ]; }) sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."figures-2.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -65029,7 +65793,6 @@ in sources."load-json-file-1.1.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."minimist-1.2.5" sources."parse-json-2.2.0" sources."path-exists-2.1.0" sources."path-type-1.1.0" @@ -65050,7 +65813,6 @@ in (sources."git-raw-commits-2.0.0" // { dependencies = [ sources."meow-4.0.1" - sources."minimist-1.2.5" ]; }) (sources."git-remote-origin-url-2.0.0" // { @@ -65061,14 +65823,13 @@ in (sources."git-semver-tags-2.0.3" // { dependencies = [ sources."meow-4.0.1" - sources."minimist-1.2.5" ]; }) sources."git-up-4.0.1" sources."git-url-parse-11.1.2" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."glob-to-regexp-0.3.0" (sources."globby-9.2.0" // { dependencies = [ @@ -65208,7 +65969,7 @@ in sources."mime-types-2.1.26" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minimist-options-3.0.2" sources."minipass-2.9.0" sources."minizlib-1.3.3" @@ -65218,7 +65979,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."mkdirp-promise-5.0.1" sources."modify-values-1.0.1" sources."move-concurrently-1.0.1" @@ -65284,7 +66045,11 @@ in sources."octokit-pagination-methods-1.1.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."optimist-0.6.1" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -65485,11 +66250,7 @@ in sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-indent-2.0.0" - (sources."strong-log-transformer-2.1.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."strong-log-transformer-2.1.0" sources."supports-color-5.5.0" sources."tar-4.4.13" sources."temp-dir-1.0.0" @@ -65646,8 +66407,8 @@ in sources."mime-1.6.0" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."promise-7.3.1" @@ -65771,7 +66532,7 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."destroy-1.0.4" sources."duplexer-0.1.1" sources."ee-first-1.1.1" @@ -65819,7 +66580,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from-0.1.7" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -65834,7 +66595,11 @@ in ]; }) sources."http-auth-3.1.3" - sources."http-errors-1.7.3" + (sources."http-errors-1.7.3" // { + dependencies = [ + sources."depd-1.1.2" + ]; + }) sources."http-parser-js-0.4.10" sources."inherits-2.0.4" sources."is-accessor-descriptor-1.0.0" @@ -65864,7 +66629,7 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."mixin-deep-1.3.2" - sources."morgan-1.9.1" + sources."morgan-1.10.0" sources."ms-2.0.0" sources."nan-2.14.0" sources."nanomatch-1.2.13" @@ -65910,11 +66675,13 @@ in sources."safe-regex-1.1.0" (sources."send-0.17.1" // { dependencies = [ + sources."depd-1.1.2" sources."ms-2.1.1" ]; }) (sources."serve-index-1.9.1" // { dependencies = [ + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" @@ -66168,7 +66935,7 @@ in sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.3.0" @@ -66542,15 +67309,14 @@ in name = "lumo-build-deps"; packageName = "lumo-build-deps"; version = "1.10.1"; - src = ../../../pkgs/development/interpreters/clojurescript/lumo; + src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.8.6" - sources."@babel/core-7.8.7" - sources."@babel/generator-7.8.8" + sources."@babel/compat-data-7.9.0" + sources."@babel/core-7.9.0" + sources."@babel/generator-7.9.4" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - sources."@babel/helper-call-delegate-7.8.7" sources."@babel/helper-compilation-targets-7.8.7" sources."@babel/helper-create-class-features-plugin-7.8.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" @@ -66561,7 +67327,7 @@ in sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" - sources."@babel/helper-module-transforms-7.8.6" + sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" @@ -66569,29 +67335,32 @@ in sources."@babel/helper-replace-supers-7.8.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.8.4" - (sources."@babel/highlight-7.8.3" // { + sources."@babel/helpers-7.9.2" + (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.8.8" + sources."@babel/parser-7.9.4" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.8.3" + sources."@babel/plugin-proposal-numeric-separator-7.8.3" + sources."@babel/plugin-proposal-object-rest-spread-7.9.0" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" - sources."@babel/plugin-proposal-optional-chaining-7.8.3" + sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" @@ -66600,43 +67369,51 @@ in sources."@babel/plugin-transform-async-to-generator-7.8.3" sources."@babel/plugin-transform-block-scoped-functions-7.8.3" sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.8.6" + sources."@babel/plugin-transform-classes-7.9.2" sources."@babel/plugin-transform-computed-properties-7.8.3" sources."@babel/plugin-transform-destructuring-7.8.8" sources."@babel/plugin-transform-dotall-regex-7.8.3" sources."@babel/plugin-transform-duplicate-keys-7.8.3" sources."@babel/plugin-transform-exponentiation-operator-7.8.3" - sources."@babel/plugin-transform-for-of-7.8.6" + sources."@babel/plugin-transform-for-of-7.9.0" sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.8.3" - sources."@babel/plugin-transform-modules-commonjs-7.8.3" - sources."@babel/plugin-transform-modules-systemjs-7.8.3" - sources."@babel/plugin-transform-modules-umd-7.8.3" + sources."@babel/plugin-transform-modules-amd-7.9.0" + sources."@babel/plugin-transform-modules-commonjs-7.9.0" + sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.8.8" + sources."@babel/plugin-transform-parameters-7.9.3" sources."@babel/plugin-transform-property-literals-7.8.3" sources."@babel/plugin-transform-regenerator-7.8.7" sources."@babel/plugin-transform-reserved-words-7.8.3" - sources."@babel/plugin-transform-runtime-7.8.3" + sources."@babel/plugin-transform-runtime-7.9.0" sources."@babel/plugin-transform-shorthand-properties-7.8.3" sources."@babel/plugin-transform-spread-7.8.3" sources."@babel/plugin-transform-sticky-regex-7.8.3" sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.8.7" + sources."@babel/preset-env-7.9.0" + sources."@babel/preset-modules-0.1.3" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.8.7" + sources."@babel/runtime-7.9.2" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" - sources."@istanbuljs/load-nyc-config-1.0.0" + (sources."@istanbuljs/load-nyc-config-1.0.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + ]; + }) sources."@istanbuljs/schema-0.1.2" (sources."@jest/transform-25.1.0" // { dependencies = [ @@ -66649,33 +67426,33 @@ in sources."@types/babel__template-7.0.2" sources."@types/babel__traverse-7.0.9" sources."@types/color-name-1.1.1" - sources."@types/estree-0.0.42" + sources."@types/estree-0.0.44" sources."@types/istanbul-lib-coverage-2.0.1" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.1" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.4" sources."@types/yargs-parser-15.0.0" - sources."@webassemblyjs/ast-1.8.5" - sources."@webassemblyjs/floating-point-hex-parser-1.8.5" - sources."@webassemblyjs/helper-api-error-1.8.5" - sources."@webassemblyjs/helper-buffer-1.8.5" - sources."@webassemblyjs/helper-code-frame-1.8.5" - sources."@webassemblyjs/helper-fsm-1.8.5" - sources."@webassemblyjs/helper-module-context-1.8.5" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" - sources."@webassemblyjs/helper-wasm-section-1.8.5" - sources."@webassemblyjs/ieee754-1.8.5" - sources."@webassemblyjs/leb128-1.8.5" - sources."@webassemblyjs/utf8-1.8.5" - sources."@webassemblyjs/wasm-edit-1.8.5" - sources."@webassemblyjs/wasm-gen-1.8.5" - sources."@webassemblyjs/wasm-opt-1.8.5" - sources."@webassemblyjs/wasm-parser-1.8.5" - sources."@webassemblyjs/wast-parser-1.8.5" - sources."@webassemblyjs/wast-printer-1.8.5" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."JSONStream-1.3.5" @@ -66723,10 +67500,9 @@ in sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" sources."babel-jest-25.1.0" - (sources."babel-loader-8.0.6" // { + (sources."babel-loader-8.1.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."babel-plugin-dynamic-import-node-2.3.0" @@ -66774,7 +67550,7 @@ in sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - (sources."bl-4.0.1" // { + (sources."bl-4.0.2" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -66796,8 +67572,8 @@ in }) (sources."browserify-16.5.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" + sources."punycode-1.4.1" ]; }) sources."browserify-aes-1.2.0" @@ -66806,23 +67582,22 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.9.1" + sources."browserslist-4.11.0" sources."bser-2.1.1" sources."buffer-5.5.0" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-modules-3.1.0" sources."builtin-status-codes-3.0.0" - (sources."cacache-12.0.3" // { + (sources."cacache-12.0.4" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001035" + sources."caniuse-lite-1.0.30001036" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -66841,7 +67616,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."micromatch-3.1.10" ]; }) @@ -66891,8 +67666,7 @@ in sources."convert-source-map-1.7.0" (sources."copy-concurrently-1.0.5" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."copy-descriptor-0.1.1" @@ -66937,7 +67711,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.376" + sources."electron-to-chromium-1.3.383" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" @@ -66949,7 +67723,7 @@ in }) sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" @@ -67001,7 +67775,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fb-watchman-2.0.1" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -67009,7 +67783,7 @@ in ]; }) sources."find-cache-dir-2.1.0" - sources."find-up-4.1.0" + sources."find-up-3.0.0" (sources."findup-sync-3.0.0" // { dependencies = [ sources."micromatch-3.1.10" @@ -67134,8 +67908,7 @@ in sources."jest-serializer-25.1.0" (sources."jest-util-25.1.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) (sources."jest-worker-25.1.0" // { @@ -67153,7 +67926,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-0.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" @@ -67170,7 +67943,7 @@ in sources."json5-1.0.1" ]; }) - sources."locate-path-5.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.memoize-3.0.4" sources."loose-envify-1.4.0" @@ -67178,7 +67951,6 @@ in sources."magic-string-0.25.7" sources."make-dir-2.1.0" sources."makeerror-1.0.11" - sources."mamacro-0.0.3" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -67212,8 +67984,7 @@ in sources."module-deps-6.2.2" (sources."move-concurrently-1.0.1" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."ms-2.1.2" @@ -67229,6 +68000,7 @@ in sources."buffer-4.9.2" sources."events-3.1.0" sources."inherits-2.0.3" + sources."punycode-1.4.1" sources."stream-http-2.8.3" sources."timers-browserify-2.0.11" sources."tty-browserify-0.0.0" @@ -67272,7 +68044,7 @@ in sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-2.2.2" - sources."p-locate-4.1.0" + sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."pako-1.0.11" sources."parallel-transform-1.2.0" @@ -67284,7 +68056,7 @@ in sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" - sources."path-exists-4.0.0" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" @@ -67292,19 +68064,13 @@ in sources."pbkdf2-3.0.17" sources."peek-stream-1.1.3" sources."performance-now-2.1.0" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pify-4.0.1" sources."pinkie-1.0.0" sources."pinkie-promise-1.0.0" sources."pirates-4.0.1" - (sources."pkg-dir-3.0.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."pkg-dir-3.0.0" + sources."pkg-up-3.1.0" sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" sources."prettier-1.19.1" @@ -67322,7 +68088,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-1.4.1" + sources."punycode-2.1.1" sources."qs-6.5.2" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -67344,7 +68110,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" - sources."regenerator-transform-0.14.3" + sources."regenerator-transform-0.14.4" sources."regex-not-1.0.2" sources."regexpu-core-4.7.0" sources."regjsgen-0.5.1" @@ -67396,7 +68162,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."schema-utils-1.0.0" + sources."schema-utils-2.6.5" sources."semver-5.7.1" sources."serialize-javascript-2.1.2" sources."set-blocking-2.0.0" @@ -67509,13 +68275,14 @@ in sources."readable-stream-3.6.0" ]; }) - (sources."terser-4.6.6" // { + (sources."terser-4.6.7" // { dependencies = [ sources."source-map-0.6.1" ]; }) (sources."terser-webpack-plugin-1.4.3" // { dependencies = [ + sources."schema-utils-1.0.0" sources."source-map-0.6.1" ]; }) @@ -67533,11 +68300,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - (sources."tough-cookie-2.5.0" // { - dependencies = [ - sources."punycode-2.1.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."tslib-1.11.1" sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" @@ -67565,11 +68328,7 @@ in ]; }) sources."upath-1.2.0" - (sources."uri-js-4.2.2" // { - dependencies = [ - sources."punycode-2.1.1" - ]; - }) + sources."uri-js-4.2.2" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -67592,12 +68351,12 @@ in sources."vm-browserify-1.1.2" sources."walker-1.0.7" sources."watchpack-1.6.0" - (sources."webpack-4.42.0" // { + (sources."webpack-4.42.1" // { dependencies = [ sources."acorn-6.4.1" sources."micromatch-3.1.10" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" + sources."schema-utils-1.0.0" ]; }) (sources."webpack-cli-3.3.11" // { @@ -67639,14 +68398,7 @@ in sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.1.1" - (sources."yargs-13.2.4" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."yargs-13.2.4" sources."yargs-parser-13.1.2" ]; buildInputs = globalBuildInputs; @@ -68296,11 +69048,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.13" @@ -68560,10 +69308,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz"; - sha512 = "MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz"; + sha512 = "3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA=="; }; dependencies = [ sources."ansi-colors-3.2.3" @@ -68598,7 +69346,7 @@ in sources."define-properties-1.1.3" sources."diff-3.5.0" sources."emoji-regex-7.0.3" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -68610,7 +69358,7 @@ in sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."glob-7.1.3" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -68634,8 +69382,8 @@ in sources."lodash-4.17.15" sources."log-symbols-3.0.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.3" sources."ms-2.1.1" sources."node-environment-flags-1.0.6" sources."normalize-path-3.0.0" @@ -68649,7 +69397,7 @@ in sources."p-try-2.2.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."readdirp-3.2.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -68675,14 +69423,14 @@ in }) sources."wrappy-1.0.2" sources."y18n-4.0.0" - (sources."yargs-13.3.0" // { + (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) - sources."yargs-parser-13.1.1" + sources."yargs-parser-13.1.2" sources."yargs-unparser-1.6.0" ]; buildInputs = globalBuildInputs; @@ -68736,7 +69484,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" @@ -68906,10 +69654,10 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."nopt-4.0.3" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -69119,11 +69867,7 @@ in sources."mime-types-2.1.26" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."nan-2.14.0" sources."negotiator-0.6.2" @@ -69314,10 +70058,10 @@ in sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."needle-2.4.0" sources."nopt-4.0.3" @@ -69333,11 +70077,7 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" @@ -69375,7 +70115,7 @@ in sha512 = "7cRGr69ibl7vnEMWEO2qHhO4L6ft2XsySoE+mMSW7h2tODNTNECelCQtTA+kYfX1wlFS3axu52Y2Br0AV5D+ww=="; }; dependencies = [ - sources."@babel/runtime-7.8.7" + sources."@babel/runtime-7.9.2" sources."@node-red/editor-api-1.0.4" sources."@node-red/editor-client-1.0.4" (sources."@node-red/nodes-1.0.4" // { @@ -69660,11 +70400,7 @@ in ]; }) sources."minizlib-1.3.3" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."moment-timezone-0.5.28" (sources."mqtt-2.18.8" // { @@ -69941,10 +70677,10 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-3.1.1" sources."minizlib-2.1.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" @@ -70088,7 +70824,7 @@ in sources."fill-range-7.0.1" sources."fsevents-2.1.2" sources."get-stream-3.0.0" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.2.3" @@ -70125,7 +70861,7 @@ in sources."package-json-4.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."picomatch-2.2.1" + sources."picomatch-2.2.2" sources."pify-3.0.0" sources."prepend-http-1.0.4" sources."pseudomap-1.0.2" @@ -70178,10 +70914,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.2"; + version = "6.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.2.tgz"; - sha512 = "eBVjzvGJ9v2/jRJZFtIkvUVKmJ0sCJNNwc9Z1gI6llwaT7EBYWJe5o61Ipc1QR0FaDCKM3l1GizI09Ro3STJEw=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.3.tgz"; + sha512 = "3tQYVEEdSGQGYoXhZvNqW8faqCidfMMaL387RdDo4Uu5kQy4IgvJ13NIsWVMQ6e3QWlbicNMSpFiyzYfMUuPDw=="; }; buildInputs = globalBuildInputs; meta = { @@ -70196,10 +70932,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.0.4.tgz"; - sha512 = "o1Db+kfi8Vvs345Xxpn+3WSUJtLa85F2hMF6v6kYfQuvTulsphvDzgbiVkp4vEKC8+BQETCag730XPJudYf4mA=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.0.5.tgz"; + sha512 = "dO2jeEmD1DAa/8NKxQAuhVsICDYWKTL1kZkvUFyRNphK4NiLk1HA7Jk5mCfl2L2xU5FxiGhNq5vgYlivu+2kjw=="; }; dependencies = [ sources."@npmcli/ci-detect-1.2.0" @@ -70248,12 +70984,12 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.0.3" - sources."commander-4.1.1" + sources."commander-5.0.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" (sources."copy-concurrently-1.0.5" // { dependencies = [ - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."core-util-is-1.0.2" @@ -70275,7 +71011,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fast-diff-1.2.0" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."find-up-4.1.0" sources."fs-minipass-2.1.0" sources."fs-write-stream-atomic-1.0.10" @@ -70321,11 +71057,7 @@ in sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.2.0" sources."json-parse-helpfulerror-1.0.3" - (sources."json5-2.1.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-2.1.2" sources."jsonparse-1.3.1" sources."keyv-3.1.0" sources."kleur-3.0.3" @@ -70350,7 +71082,7 @@ in sources."make-fetch-happen-8.0.4" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" (sources."minipass-3.1.1" // { dependencies = [ sources."yallist-4.0.0" @@ -70370,7 +71102,7 @@ in sources."mkdirp-1.0.3" (sources."move-concurrently-1.0.1" // { dependencies = [ - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."ms-2.1.2" @@ -70410,14 +71142,10 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" - sources."prompts-2.3.1" + sources."prompts-2.3.2" sources."pump-3.0.0" sources."pupa-2.0.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."rc-1.2.8" sources."rc-config-loader-3.0.0" sources."read-package-json-fast-1.1.3" sources."readable-stream-2.3.7" @@ -70441,7 +71169,7 @@ in }) sources."semver-utils-1.1.4" sources."signal-exit-3.0.2" - sources."sisteransi-1.0.4" + sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" sources."socks-2.3.3" sources."socks-proxy-agent-5.0.0" @@ -70554,7 +71282,7 @@ in (sources."fstream-0.1.31" // { dependencies = [ sources."graceful-fs-3.0.12" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."gauge-2.7.4" @@ -70581,7 +71309,7 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."mkdirp-0.3.5" sources."natives-1.1.6" sources."ncp-0.4.2" @@ -70718,22 +71446,22 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.8.6" - (sources."@babel/core-7.8.7" // { + sources."@babel/compat-data-7.9.0" + (sources."@babel/core-7.9.0" // { dependencies = [ - sources."json5-2.1.1" + sources."json5-2.1.2" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.8.8" // { + (sources."@babel/generator-7.9.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - sources."@babel/helper-builder-react-jsx-7.8.3" - sources."@babel/helper-call-delegate-7.8.7" + sources."@babel/helper-builder-react-jsx-7.9.0" + sources."@babel/helper-builder-react-jsx-experimental-7.9.0" sources."@babel/helper-compilation-targets-7.8.7" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" @@ -70743,7 +71471,7 @@ in sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" - sources."@babel/helper-module-transforms-7.8.6" + sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" @@ -70751,17 +71479,19 @@ in sources."@babel/helper-replace-supers-7.8.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.8.4" - sources."@babel/highlight-7.8.3" - sources."@babel/parser-7.8.8" + sources."@babel/helpers-7.9.2" + sources."@babel/highlight-7.9.0" + sources."@babel/parser-7.9.4" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.8.3" + sources."@babel/plugin-proposal-numeric-separator-7.8.3" + sources."@babel/plugin-proposal-object-rest-spread-7.9.0" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" - sources."@babel/plugin-proposal-optional-chaining-7.8.3" + sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-dynamic-import-7.8.3" @@ -70769,6 +71499,7 @@ in sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-jsx-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" @@ -70777,27 +71508,27 @@ in sources."@babel/plugin-transform-async-to-generator-7.8.3" sources."@babel/plugin-transform-block-scoped-functions-7.8.3" sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.8.6" + sources."@babel/plugin-transform-classes-7.9.2" sources."@babel/plugin-transform-computed-properties-7.8.3" sources."@babel/plugin-transform-destructuring-7.8.8" sources."@babel/plugin-transform-dotall-regex-7.8.3" sources."@babel/plugin-transform-duplicate-keys-7.8.3" sources."@babel/plugin-transform-exponentiation-operator-7.8.3" - sources."@babel/plugin-transform-flow-strip-types-7.8.3" - sources."@babel/plugin-transform-for-of-7.8.6" + sources."@babel/plugin-transform-flow-strip-types-7.9.0" + sources."@babel/plugin-transform-for-of-7.9.0" sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.8.3" - sources."@babel/plugin-transform-modules-commonjs-7.8.3" - sources."@babel/plugin-transform-modules-systemjs-7.8.3" - sources."@babel/plugin-transform-modules-umd-7.8.3" + sources."@babel/plugin-transform-modules-amd-7.9.0" + sources."@babel/plugin-transform-modules-commonjs-7.9.0" + sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.8.8" + sources."@babel/plugin-transform-parameters-7.9.3" sources."@babel/plugin-transform-property-literals-7.8.3" - sources."@babel/plugin-transform-react-jsx-7.8.3" + sources."@babel/plugin-transform-react-jsx-7.9.4" sources."@babel/plugin-transform-regenerator-7.8.7" sources."@babel/plugin-transform-reserved-words-7.8.3" sources."@babel/plugin-transform-shorthand-properties-7.8.3" @@ -70806,11 +71537,12 @@ in sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.8.7" - sources."@babel/runtime-7.8.7" + sources."@babel/preset-env-7.9.0" + sources."@babel/preset-modules-0.1.3" + sources."@babel/runtime-7.9.2" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.8.6" - sources."@babel/types-7.8.7" + sources."@babel/traverse-7.9.0" + sources."@babel/types-7.9.0" sources."@iarna/toml-2.2.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -70899,7 +71631,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.9.1" + sources."browserslist-4.11.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -70916,7 +71648,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001035" + sources."caniuse-lite-1.0.30001036" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -70990,7 +71722,12 @@ in sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" - sources."csso-4.0.2" + (sources."csso-4.0.3" // { + dependencies = [ + sources."css-tree-1.0.0-alpha.39" + sources."mdn-data-2.0.6" + ]; + }) sources."cssom-0.3.8" sources."cssstyle-1.4.0" sources."dashdash-1.14.1" @@ -71044,14 +71781,14 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.376" + sources."electron-to-chromium-1.3.383" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" sources."envinfo-7.5.0" sources."error-ex-1.3.2" - (sources."es-abstract-1.17.4" // { + (sources."es-abstract-1.17.5" // { dependencies = [ sources."object-inspect-1.7.0" ]; @@ -71097,7 +71834,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.1" sources."get-caller-file-2.0.5" @@ -71142,7 +71879,7 @@ in (sources."htmlnano-0.2.5" // { dependencies = [ sources."posthtml-0.12.0" - sources."terser-4.6.6" + sources."terser-4.6.7" ]; }) (sources."htmlparser2-3.10.1" // { @@ -71271,11 +72008,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."nan-2.14.0" (sources."nanomatch-1.2.13" // { @@ -71339,6 +72072,7 @@ in sources."pbkdf2-3.0.17" sources."performance-now-2.1.0" sources."physical-cpu-count-2.0.0" + sources."pkg-up-3.1.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.27" // { @@ -71435,7 +72169,7 @@ in sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" - sources."regenerator-transform-0.14.3" + sources."regenerator-transform-0.14.4" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -71815,9 +72549,9 @@ in sources."mime-types-2.1.26" sources."minimatch-3.0.4" sources."minimist-0.0.10" - (sources."mkdirp-0.5.1" // { + (sources."mkdirp-0.5.4" // { dependencies = [ - sources."minimist-0.0.8" + sources."minimist-1.2.5" ]; }) sources."moment-2.24.0" @@ -71910,7 +72644,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."uglify-js-3.8.0" - sources."unix-dgram-2.0.3" + sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" @@ -72026,7 +72760,7 @@ in sources."dns-txt-2.0.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."external-editor-2.2.0" @@ -72036,8 +72770,7 @@ in sources."flatten-0.0.1" (sources."fs-chunk-store-1.7.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."fs.realpath-1.0.0" @@ -72163,8 +72896,7 @@ in sources."pump-2.0.1" (sources."random-access-file-2.1.3" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" ]; }) sources."random-access-storage-1.4.1" @@ -72307,12 +73039,11 @@ in (sources."bittorrent-tracker-7.7.0" // { dependencies = [ sources."bencode-0.8.0" - sources."minimist-1.2.5" sources."ultron-1.0.2" sources."ws-1.1.5" ]; }) - sources."bl-4.0.1" + sources."bl-4.0.2" sources."blob-0.0.5" sources."bn.js-4.11.8" sources."bncode-0.5.3" @@ -72469,9 +73200,13 @@ in sources."mime-types-2.1.26" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" - sources."morgan-1.9.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) sources."ms-2.0.0" sources."multiparty-4.2.1" sources."negotiator-0.6.2" @@ -72635,10 +73370,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "4.11.6"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-4.11.6.tgz"; - sha512 = "SJkYVP7BRVR/Q+J13RmB1/WC9dQDOTU6H9uTOmIFE5hbkdh83HqqvOBs7SjT+bUObqMicZ9csfreKxuZhGVvKw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-4.12.0.tgz"; + sha512 = "Sjvf66dfk2d7kRssvHX6x+d0j9NgIE9262vCKviJC+kTPcpZEwxsF/RjQ/CX07UmlDYAX2TWqNZz7jeiksMKSA=="; }; buildInputs = globalBuildInputs; meta = { @@ -72653,10 +73388,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.19.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz"; - sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz"; + sha512 = "5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg=="; }; buildInputs = globalBuildInputs; meta = { @@ -72708,16 +73443,21 @@ in pulp = nodeEnv.buildNodePackage { name = "pulp"; packageName = "pulp"; - version = "13.0.0"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pulp/-/pulp-13.0.0.tgz"; - sha512 = "wjjAVuN1Shx6783NvTd8aPwWZ1pE94+isiWtdAJhedvbLqJuwe8p5CSNul9FS0WvBz7ejdrW0vc6wLDLsKX7Yw=="; + url = "https://registry.npmjs.org/pulp/-/pulp-14.0.0.tgz"; + sha512 = "K/s/BRG+AJpp+D3VES/c08kdxzMRKJYdZHIBnC27+6NS+3htwPPGRNTpPig+Sd6WKd5uZH3NASrBX+zgR5SQ6Q=="; }; dependencies = [ sources."JSONStream-1.3.5" sources."acorn-7.1.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."append-type-1.0.2" + sources."arch-2.1.1" sources."asn1.js-4.10.1" (sources."assert-1.5.0" // { dependencies = [ @@ -72725,6 +73465,7 @@ in sources."util-0.10.3" ]; }) + sources."astral-regex-1.0.0" sources."async-1.5.2" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" @@ -72759,11 +73500,22 @@ in sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" + sources."build-purescript-0.4.1" sources."builtin-status-codes-3.0.0" + sources."byline-5.0.0" sources."cached-path-relative-1.0.2" + sources."cancelable-pipeline-1.0.0" + sources."cancelable-pump-0.4.0" + sources."chalk-2.4.2" + sources."chownr-1.1.4" sources."cipher-base-1.0.4" + sources."clean-stack-2.2.0" + sources."cli-cursor-2.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."colors-1.4.0" sources."combine-source-map-0.8.0" + sources."commander-2.20.3" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ @@ -72777,38 +73529,52 @@ in sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" sources."dash-ast-1.0.0" sources."defined-1.0.0" sources."deps-sort-2.0.1" sources."des.js-1.0.1" - (sources."detective-5.2.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."detective-5.2.0" sources."diffie-hellman-5.0.3" + sources."dl-tar-0.8.1" sources."domain-browser-1.2.0" + sources."download-or-build-purescript-0.3.4" + sources."download-purescript-0.8.5" + sources."download-purescript-source-0.6.5" sources."duplexer2-0.1.4" sources."elliptic-6.5.2" + sources."emoji-regex-7.0.3" + sources."end-of-stream-1.4.4" sources."es6-promise-3.3.1" + sources."escape-string-regexp-1.0.5" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" + sources."executing-npm-path-1.0.0" sources."fast-safe-stringify-2.0.7" + sources."feint-1.0.3" + sources."file-to-npm-cache-0.1.0" + sources."filesize-4.2.1" + sources."find-pkg-dir-1.0.1" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" + sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globule-1.3.1" sources."graceful-fs-4.2.3" sources."has-1.0.3" + sources."has-flag-3.0.0" sources."hash-base-3.0.4" sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" sources."ieee754-1.1.13" + sources."import-package-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inline-source-map-0.6.2" @@ -72817,23 +73583,37 @@ in sources."concat-stream-1.6.2" ]; }) + sources."inspect-with-kind-1.0.5" + sources."install-purescript-0.7.0" + sources."install-purescript-cli-0.4.2" sources."is-buffer-1.1.6" + sources."is-fullwidth-code-point-2.0.0" + sources."is-plain-obj-1.1.0" + sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" + sources."kind-of-6.0.3" sources."labeled-stream-splicer-2.0.2" + sources."load-from-cwd-or-npm-3.0.4" + sources."load-request-from-cwd-or-npm-3.0.0" sources."lodash-4.17.15" sources."lodash.memoize-3.0.4" + sources."log-symbols-3.0.0" + sources."log-update-3.4.0" sources."md5.js-1.3.5" sources."miller-rabin-4.0.1" sources."mime-1.6.0" + sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.4" (sources."module-deps-6.2.2" // { dependencies = [ sources."concat-stream-1.6.2" @@ -72844,32 +73624,54 @@ in sources."through-2.2.7" ]; }) + sources."ms-2.1.2" sources."mute-stream-0.0.8" + sources."neat-stack-1.0.1" + sources."nice-try-1.0.5" sources."node-static-0.7.11" + sources."npcache-1.0.2" + sources."npm-cache-env-2.0.0" + sources."npm-cache-path-2.0.0" + sources."npm-cli-dir-3.0.1" + sources."npm-cli-path-3.1.2" + sources."npm-cli-version-1.0.0" + sources."npm-run-path-2.0.2" + sources."npm-version-compare-1.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" + sources."onetime-2.0.1" (sources."optimist-0.6.1" // { dependencies = [ + sources."minimist-0.0.10" sources."wordwrap-0.0.3" ]; }) + sources."optional-0.1.4" sources."os-browserify-0.3.0" + sources."p-finally-1.0.0" sources."pako-1.0.11" sources."parents-1.0.1" sources."parse-asn1-5.1.5" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."path-platform-0.11.15" + sources."pause-fn-1.0.0" + sources."pause-methods-1.0.0" sources."pbkdf2-3.0.17" + sources."platform-name-1.0.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."public-encrypt-4.0.3" + sources."pump-3.0.0" sources."punycode-1.4.1" + sources."purescript-0.12.5" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" sources."randomfill-1.0.4" + sources."rate-map-1.0.5" sources."read-1.0.7" sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.7" // { @@ -72878,23 +73680,35 @@ in sources."string_decoder-1.1.1" ]; }) + sources."reject-unsatisfied-npm-version-1.0.0" sources."resolve-1.15.1" + sources."resolve-from-npm-3.1.0" + sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" + sources."run-in-dir-0.3.0" sources."safe-buffer-5.2.0" sources."sander-0.5.1" + sources."semver-5.7.1" sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shasum-object-1.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" + sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - (sources."sorcery-0.10.0" // { + sources."size-rate-0.3.1" + sources."slice-ansi-2.1.0" + sources."sorcery-0.10.0" + sources."source-map-0.5.7" + (sources."source-map-support-0.5.16" // { dependencies = [ - sources."minimist-1.2.5" + sources."source-map-0.6.1" ]; }) - sources."source-map-0.5.7" sources."sourcemap-codec-1.4.8" + sources."spawn-stack-0.7.0" sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" (sources."stream-http-3.1.0" // { @@ -72903,23 +73717,43 @@ in ]; }) sources."stream-splicer-2.0.1" + sources."string-width-3.1.0" sources."string_decoder-1.3.0" - (sources."subarg-1.0.0" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."strip-ansi-5.2.0" + sources."strip-eof-1.0.0" + sources."subarg-1.0.0" + sources."supports-color-5.5.0" sources."syntax-error-1.4.0" + sources."tar-4.4.13" (sources."temp-0.9.1" // { dependencies = [ sources."rimraf-2.6.3" ]; }) + (sources."terser-4.6.7" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."through-2.3.8" sources."through2-2.0.5" + sources."tilde-path-3.0.0" sources."timers-browserify-1.4.2" sources."tree-kill-1.2.2" sources."tty-browserify-0.0.1" + (sources."tty-truncate-1.0.5" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + (sources."strip-ansi-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + ]; + }) + ]; + }) + sources."tty-width-frame-1.0.3" sources."typedarray-0.0.6" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.3" @@ -72934,11 +73768,16 @@ in ]; }) sources."util-deprecate-1.0.2" + sources."vertical-meter-1.0.0" sources."vm-browserify-1.1.2" sources."which-1.3.1" + sources."win-user-installed-npm-cli-path-3.0.1" sources."wordwrap-1.0.0" + sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" sources."xtend-4.0.2" + sources."yallist-3.1.1" + sources."zen-observable-0.8.15" ]; buildInputs = globalBuildInputs; meta = { @@ -72988,7 +73827,7 @@ in sources."cycle-1.0.3" sources."deep-equal-2.0.1" sources."define-properties-1.1.3" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -73019,11 +73858,7 @@ in sources."isstream-0.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."mute-stream-0.0.8" sources."ncp-0.4.2" sources."object-inspect-1.7.0" @@ -73098,8 +73933,8 @@ in ]; }) sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."private-0.1.8" @@ -73396,13 +74231,14 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.66.0"; + version = "1.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.66.0.tgz"; - sha512 = "Syl/WikZfx+g6mIKb7XgwJO8S00XBYQCLJnrYxfM2VYRsp4dMx202n+/1XBgKXLeViLRx0ofEe/Xjn9GxRpSUQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.67.0.tgz"; + sha512 = "ocnzEW2op4KrdjnZ7aeadnX1/E6PdlsW8vv67/3sGlni1ep8JiKSRU0aPQqUmood98kEIo/sKvUlHrJcAm3eXg=="; }; dependencies = [ sources."2-thenable-1.0.0" + sources."@babel/parser-7.9.4" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -73425,7 +74261,7 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-3.5.0" // { + (sources."@serverless/enterprise-plugin-3.6.0" // { dependencies = [ sources."fs-extra-8.1.0" sources."node-fetch-2.6.0" @@ -73453,7 +74289,12 @@ in sources."@types/glob-7.1.1" sources."@types/lodash-4.14.149" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" + (sources."@typescript-eslint/typescript-estree-2.25.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."adm-zip-0.4.14" sources."agent-base-6.0.0" sources."ansi-align-3.0.0" @@ -73461,6 +74302,7 @@ in sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" + sources."app-module-path-2.2.0" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -73483,11 +74325,12 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" + sources."ast-module-types-2.6.0" sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.639.0" // { + (sources."aws-sdk-2.644.0" // { dependencies = [ sources."buffer-4.9.1" sources."uuid-3.3.2" @@ -73529,7 +74372,11 @@ in sources."camelcase-5.3.1" sources."capture-stack-trace-1.0.1" sources."caw-2.0.1" - sources."chalk-2.4.2" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) sources."chardet-0.7.0" (sources."child-process-ext-2.1.0" // { dependencies = [ @@ -73579,7 +74426,12 @@ in }) sources."concat-map-0.0.1" sources."config-chain-1.1.12" - sources."configstore-3.1.2" + (sources."configstore-3.1.2" // { + dependencies = [ + sources."make-dir-1.3.0" + sources."pify-3.0.0" + ]; + }) sources."content-disposition-0.5.3" sources."cookie-0.3.1" sources."cookiejar-2.1.2" @@ -73595,11 +74447,21 @@ in sources."type-1.2.0" ]; }) - sources."dayjs-1.8.22" + sources."dayjs-1.8.23" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."decompress-4.2.0" + sources."decomment-0.9.2" + (sources."decompress-4.2.0" // { + dependencies = [ + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-2.3.0" + ]; + }) sources."decompress-response-3.3.0" sources."decompress-tar-4.1.1" (sources."decompress-tarbz2-4.1.1" // { @@ -73612,13 +74474,25 @@ in dependencies = [ sources."file-type-3.9.0" sources."get-stream-2.3.1" + sources."pify-2.3.0" ]; }) sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" sources."defer-to-connect-1.1.3" sources."deferred-0.7.11" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" + sources."dependency-tree-7.2.1" + sources."detective-amd-3.0.0" + sources."detective-cjs-3.1.1" + sources."detective-es6-2.1.0" + sources."detective-less-1.0.2" + sources."detective-postcss-3.0.1" + sources."detective-sass-3.0.1" + sources."detective-scss-2.0.1" + sources."detective-stylus-1.0.0" + sources."detective-typescript-5.7.0" sources."dir-glob-3.0.1" sources."dot-prop-4.2.0" sources."dotenv-8.2.0" @@ -73632,6 +74506,7 @@ in sources."http-cache-semantics-3.8.1" sources."keyv-3.0.0" sources."lowercase-keys-1.0.0" + sources."make-dir-1.3.0" sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" sources."pify-3.0.0" @@ -73643,9 +74518,11 @@ in sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" + sources."enhanced-resolve-4.1.1" + sources."errno-0.1.7" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" - sources."es6-promisify-6.0.2" + sources."es6-promisify-6.1.0" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -73654,9 +74531,13 @@ in sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."escape-string-regexp-1.0.5" + sources."escodegen-1.14.1" + sources."eslint-visitor-keys-1.1.0" sources."esniff-1.1.0" sources."esprima-4.0.1" sources."essentials-1.1.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."events-1.1.1" (sources."execa-0.7.0" // { @@ -73675,13 +74556,23 @@ in sources."fastq-1.6.1" sources."fd-slicer-1.1.0" sources."figures-3.2.0" + sources."file-exists-dazinatorfork-1.0.2" sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."filesize-3.6.1" + sources."filing-cabinet-2.5.1" sources."fill-range-7.0.1" + sources."find-0.3.0" + (sources."find-process-1.4.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."find-requires-1.0.0" sources."flat-5.0.0" + sources."flatten-1.0.3" (sources."follow-redirects-1.5.10" // { dependencies = [ sources."debug-3.1.0" @@ -73706,16 +74597,24 @@ in ]; }) sources."fsevents-2.1.2" + sources."get-amd-module-type-3.0.0" + sources."get-own-enumerable-property-symbols-3.0.2" sources."get-proxy-2.1.0" sources."get-stdin-5.0.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" - sources."glob-parent-5.1.0" + sources."glob-parent-5.1.1" sources."global-dirs-0.1.1" (sources."globby-6.1.0" // { dependencies = [ sources."array-union-1.0.2" + sources."pify-2.3.0" + ]; + }) + (sources."gonzales-pe-4.2.4" // { + dependencies = [ + sources."minimist-1.1.3" ]; }) sources."got-9.6.0" @@ -73749,6 +74648,7 @@ in sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" + sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -73787,8 +74687,11 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" + sources."is-regexp-1.0.0" + sources."is-relative-path-1.0.2" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" + sources."is-url-1.2.4" sources."is-windows-1.0.2" sources."is-wsl-2.1.1" sources."isarray-1.0.0" @@ -73827,6 +74730,7 @@ in ]; }) sources."lazystream-1.0.0" + sources."levn-0.3.0" sources."lie-3.3.0" sources."lodash-4.17.15" (sources."log-6.0.0" // { @@ -73838,14 +74742,11 @@ in sources."lru-cache-4.1.5" sources."lru-queue-0.1.0" sources."lsmod-1.0.0" - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) + sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."memoizee-0.4.14" + sources."memory-fs-0.5.0" sources."merge2-1.3.0" sources."methods-1.1.2" sources."micromatch-4.0.2" @@ -73857,11 +74758,9 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" + sources."module-definition-3.3.0" + sources."module-lookup-amd-6.2.0" sources."moment-2.24.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -73873,6 +74772,7 @@ in sources."nice-try-1.0.5" sources."node-dir-0.1.17" sources."node-fetch-1.7.3" + sources."node-source-walk-4.2.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" (sources."npm-conf-1.1.3" // { @@ -73906,6 +74806,7 @@ in sources."is-wsl-1.1.0" ]; }) + sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-event-2.3.1" @@ -73925,21 +74826,27 @@ in sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-loader-1.0.10" + sources."path-parse-1.0.6" sources."path-type-4.0.0" sources."pend-1.2.0" - sources."picomatch-2.2.1" - sources."pify-2.3.0" + sources."picomatch-2.2.2" + sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" + sources."postcss-7.0.27" + sources."postcss-values-parser-1.5.0" + sources."precinct-6.2.0" + sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."prettyoutput-1.2.0" sources."process-nextick-args-2.0.1" sources."promise-queue-2.2.5" sources."proto-list-1.2.4" + sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."punycode-1.3.2" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."query-string-5.1.1" sources."querystring-0.2.0" sources."ramda-0.26.1" @@ -73957,6 +74864,10 @@ in sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" sources."replaceall-0.1.6" + sources."requirejs-2.3.6" + sources."requirejs-config-file-3.1.2" + sources."resolve-1.15.1" + sources."resolve-dependency-path-2.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -73969,6 +74880,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" + sources."sass-lookup-3.0.0" sources."sax-1.2.1" (sources."seek-bzip-1.0.5" // { dependencies = [ @@ -74051,18 +74963,21 @@ in sources."strict-uri-encode-1.1.0" sources."string-width-3.1.0" sources."string_decoder-1.1.1" + sources."stringify-object-3.3.0" sources."strip-ansi-5.2.0" sources."strip-dirs-2.1.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" + sources."stylus-lookup-3.0.2" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.6" ]; }) - sources."supports-color-5.5.0" + sources."supports-color-6.1.0" sources."tabtab-3.0.2" + sources."tapable-1.1.3" sources."tar-stream-1.6.2" sources."term-size-1.2.0" sources."through-2.3.8" @@ -74080,17 +74995,22 @@ in sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."traverse-0.6.6" + sources."traverse-chain-0.1.0" sources."trim-repeated-1.0.0" sources."tslib-1.11.1" + sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" sources."type-2.0.0" + sources."type-check-0.3.2" sources."type-fest-0.11.0" + sources."typescript-3.8.3" sources."unbzip2-stream-1.3.3" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" ]; }) + sources."uniq-1.0.1" sources."unique-string-1.0.0" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { @@ -74138,6 +75058,7 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."ws-7.2.3" @@ -74289,8 +75210,8 @@ in sources."mime-1.6.0" sources."mime-db-1.43.0" sources."mime-types-2.1.26" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."moment-2.7.0" sources."ms-2.0.0" sources."mute-stream-0.0.8" @@ -74689,8 +75610,8 @@ in sources."lru-cache-2.2.0" sources."mime-1.6.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."mv-2.1.1" sources."nan-2.14.0" sources."ncp-2.0.0" @@ -74789,10 +75710,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.299.0"; + version = "1.304.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.299.0.tgz"; - sha512 = "K2dlmwlmJpD7CZE8B8GguwIJmjOWdXzQ7UlcFIscg8y0tP8OT9a1gouLgBaU4uyS5J5wByipGNX1Cpwi6WRt5w=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.304.0.tgz"; + sha512 = "1wAkvgvzOyUbbKEMXGgY2UULcfvAYPywlC7Whm3DCffAdx8i1ZMT9hWaOZxhj5K94h3doY3LRb6Xq6lbfb0jDw=="; }; dependencies = [ sources."@snyk/cli-interface-2.3.2" @@ -74813,7 +75734,7 @@ in sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.2" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/restify-4.3.6" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.3" @@ -74831,7 +75752,8 @@ in sources."ast-types-0.13.2" sources."async-1.5.2" sources."balanced-match-1.0.0" - (sources."bl-4.0.1" // { + sources."base64-js-1.3.1" + (sources."bl-4.0.2" // { dependencies = [ sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" @@ -74839,6 +75761,7 @@ in }) sources."boxen-1.3.0" sources."brace-expansion-1.1.11" + sources."buffer-5.5.0" sources."buffer-from-1.1.1" sources."bytes-3.1.0" sources."camelcase-4.1.0" @@ -74938,6 +75861,7 @@ in }) sources."https-proxy-agent-3.0.1" sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -75066,7 +75990,7 @@ in sources."signal-exit-3.0.2" sources."smart-buffer-4.1.0" sources."snyk-config-2.2.3" - (sources."snyk-docker-plugin-2.2.2" // { + (sources."snyk-docker-plugin-2.6.1" // { dependencies = [ sources."debug-4.1.1" ]; @@ -75608,7 +76532,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.7" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."exit-hook-1.1.1" @@ -75655,7 +76579,7 @@ in sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."get-value-2.0.6" sources."glob-6.0.4" @@ -75813,11 +76737,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" sources."ms-2.1.2" @@ -76346,7 +77266,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.639.0" // { + (sources."aws-sdk-2.644.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -76592,7 +77512,7 @@ in sources."https-proxy-agent-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" - sources."in-publish-2.0.0" + sources."in-publish-2.0.1" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -76635,11 +77555,7 @@ in sources."json-schema-faker-0.2.16" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."json5-1.0.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-1.0.1" sources."jsonpointer-4.0.1" sources."jspath-0.3.4" (sources."jsprim-1.4.1" // { @@ -76712,9 +77628,9 @@ in sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minitouch-prebuilt-1.2.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."ms-2.1.2" sources."multer-1.4.2" @@ -76945,7 +77861,7 @@ in dependencies = [ sources."debug-3.2.6" sources."form-data-2.5.1" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -76958,7 +77874,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."lodash-3.10.1" - sources."qs-6.9.1" + sources."qs-6.9.2" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -77141,7 +78057,12 @@ in sources."css-select-base-adapter-0.1.1" sources."css-tree-1.0.0-alpha.37" sources."css-what-3.2.1" - sources."csso-4.0.2" + (sources."csso-4.0.3" // { + dependencies = [ + sources."css-tree-1.0.0-alpha.39" + sources."mdn-data-2.0.6" + ]; + }) sources."define-properties-1.1.3" (sources."dom-serializer-0.2.2" // { dependencies = [ @@ -77151,7 +78072,7 @@ in sources."domelementtype-1.3.1" sources."domutils-1.7.0" sources."entities-2.0.0" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -77165,8 +78086,8 @@ in sources."is-symbol-1.0.3" sources."js-yaml-3.13.1" sources."mdn-data-2.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."nth-check-1.0.2" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" @@ -77388,7 +78309,7 @@ in sources."fresh-0.5.2" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -77589,7 +78510,7 @@ in dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."superagent-3.8.3" ]; }) @@ -77837,7 +78758,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."ajv-6.12.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -77864,7 +78785,7 @@ in sources."debug-4.1.1" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" - sources."discord.js-11.6.2" + sources."discord.js-11.6.3" sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."esprima-4.0.1" @@ -78057,7 +78978,7 @@ in sources."define-properties-1.1.3" sources."diff-4.0.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -78101,11 +79022,7 @@ in sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" - (sources."json5-2.1.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-2.1.2" sources."jsonify-0.0.0" sources."levn-0.3.0" sources."load-json-file-1.1.0" @@ -78116,8 +79033,8 @@ in sources."markdown-escapes-1.0.4" sources."md5-2.2.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" @@ -78157,7 +79074,7 @@ in }) sources."readable-stream-2.3.7" sources."regexp.prototype.flags-1.3.0" - sources."remark-frontmatter-1.3.2" + sources."remark-frontmatter-1.3.3" sources."remark-parse-5.0.0" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" @@ -78268,7 +79185,7 @@ in }; dependencies = [ sources."define-properties-1.1.3" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -78480,7 +79397,7 @@ in sources."redent-1.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."remark-frontmatter-1.3.2" + sources."remark-frontmatter-1.3.3" sources."remark-message-control-4.2.0" sources."remark-parse-4.0.0" sources."remark-retext-3.1.3" @@ -78745,7 +79662,7 @@ in sources."buffer-from-1.1.1" sources."concat-stream-2.0.0" sources."define-properties-1.1.3" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -78798,7 +79715,7 @@ in sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -78894,7 +79811,7 @@ in dependencies = [ sources."array-includes-3.1.1" sources."define-properties-1.1.3" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -78978,7 +79895,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -79022,7 +79939,7 @@ in sources."buffer-equal-constant-time-1.0.1" sources."busboy-0.3.1" sources."bytes-3.1.0" - sources."cacheable-lookup-2.0.0" + sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" sources."callsite-1.0.0" sources."caseless-0.12.0" @@ -79195,11 +80112,7 @@ in sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-2.14.0" @@ -79915,7 +80828,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -80198,7 +81111,7 @@ in sources."debug-4.1.1" sources."mime-2.4.4" sources."ms-2.1.2" - sources."qs-6.9.1" + sources."qs-6.9.2" sources."semver-6.3.0" ]; }) @@ -80263,7 +81176,7 @@ in sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" sources."vscode-uri-1.0.8" ]; buildInputs = globalBuildInputs; @@ -80288,12 +81201,12 @@ in sources."typescript-2.9.2" (sources."vscode-css-languageservice-3.0.13" // { dependencies = [ - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" ]; }) (sources."vscode-html-languageservice-2.1.12" // { dependencies = [ - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" ]; }) sources."vscode-jsonrpc-5.0.1" @@ -80487,8 +81400,8 @@ in sources."mime-types-2.1.26" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.4" sources."multimatch-2.1.0" sources."mute-stream-0.0.7" sources."neo-async-2.6.1" @@ -80501,7 +81414,11 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-2.0.1" - sources."optimist-0.6.1" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + ]; + }) sources."ora-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -80616,7 +81533,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.0" + sources."@babel/highlight-7.9.0" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -80632,7 +81550,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -80853,7 +81771,11 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -80924,7 +81846,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -80971,14 +81893,14 @@ in sources."has-yarn-2.1.0" sources."hast-util-embedded-1.0.5" sources."hast-util-has-property-1.0.4" - sources."hast-util-is-body-ok-link-1.0.2" + sources."hast-util-is-body-ok-link-1.0.3" sources."hast-util-is-element-1.0.4" sources."hast-util-parse-selector-2.2.4" - sources."hast-util-to-string-1.0.2" + sources."hast-util-to-string-1.0.3" sources."hast-util-whitespace-1.0.4" sources."hosted-git-info-2.8.8" sources."html-void-elements-1.0.5" - sources."html-whitespace-sensitive-tag-names-1.0.1" + sources."html-whitespace-sensitive-tag-names-1.0.2" sources."http-cache-semantics-4.1.0" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" @@ -81050,7 +81972,7 @@ in sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.1.1" + sources."json5-2.1.2" sources."jsonc-parser-1.0.3" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -81111,11 +82033,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."mout-0.5.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -81556,7 +82474,7 @@ in sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { @@ -81615,7 +82533,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/highlight-7.8.3" // { + sources."@babel/helper-validator-identifier-7.9.0" + (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -81627,14 +82546,14 @@ in }) sources."@babel/polyfill-7.7.0" sources."@babel/runtime-7.7.7" - sources."@babel/runtime-corejs3-7.8.7" + sources."@babel/runtime-corejs3-7.9.2" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" @@ -81773,7 +82692,7 @@ in sources."cheerio-1.0.0-rc.3" (sources."chokidar-2.1.8" // { dependencies = [ - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."normalize-path-3.0.0" ]; }) @@ -81894,7 +82813,7 @@ in sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-error-4.1.1" @@ -81980,7 +82899,11 @@ in ]; }) sources."esprima-4.0.1" - sources."esquery-1.1.0" + (sources."esquery-1.2.0" // { + dependencies = [ + sources."estraverse-5.0.0" + ]; + }) sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -82700,30 +83623,30 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.42.0"; + version = "4.42.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz"; - sha512 = "EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; + sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.5" - sources."@webassemblyjs/floating-point-hex-parser-1.8.5" - sources."@webassemblyjs/helper-api-error-1.8.5" - sources."@webassemblyjs/helper-buffer-1.8.5" - sources."@webassemblyjs/helper-code-frame-1.8.5" - sources."@webassemblyjs/helper-fsm-1.8.5" - sources."@webassemblyjs/helper-module-context-1.8.5" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" - sources."@webassemblyjs/helper-wasm-section-1.8.5" - sources."@webassemblyjs/ieee754-1.8.5" - sources."@webassemblyjs/leb128-1.8.5" - sources."@webassemblyjs/utf8-1.8.5" - sources."@webassemblyjs/wasm-edit-1.8.5" - sources."@webassemblyjs/wasm-gen-1.8.5" - sources."@webassemblyjs/wasm-opt-1.8.5" - sources."@webassemblyjs/wasm-parser-1.8.5" - sources."@webassemblyjs/wast-parser-1.8.5" - sources."@webassemblyjs/wast-printer-1.8.5" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" @@ -82779,7 +83702,7 @@ in sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" - sources."cacache-12.0.3" + sources."cacache-12.0.4" sources."cache-base-1.0.1" sources."chokidar-2.1.8" sources."chownr-1.1.4" @@ -82870,7 +83793,7 @@ in }) sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -82885,7 +83808,7 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -82937,7 +83860,6 @@ in sources."locate-path-3.0.0" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" - sources."mamacro-0.0.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" @@ -82954,11 +83876,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."move-concurrently-1.0.1" sources."ms-2.0.0" sources."nan-2.14.0" @@ -83104,7 +84022,7 @@ in sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.6.6" // { + (sources."terser-4.6.7" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -83519,7 +84437,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.9.1" + sources."@types/node-13.9.3" sources."accepts-1.3.7" sources."ajv-6.12.0" sources."ajv-errors-1.0.1" @@ -83644,7 +84562,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."errno-0.1.7" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -83713,7 +84631,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.11" + sources."fsevents-1.2.12" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-stream-4.1.0" @@ -83813,9 +84731,9 @@ in sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" @@ -84128,7 +85046,7 @@ in sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" - sources."cacache-12.0.3" + sources."cacache-12.0.4" sources."chownr-1.1.4" sources."commondir-1.0.1" sources."concat-map-0.0.1" @@ -84142,7 +85060,7 @@ in sources."end-of-stream-1.4.4" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."figgy-pudding-3.5.1" + sources."figgy-pudding-3.5.2" sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" @@ -84171,19 +85089,15 @@ in sources."is-glob-4.0.1" sources."isarray-1.0.0" sources."json-schema-traverse-0.4.1" - (sources."json5-1.0.1" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."json5-1.0.1" sources."loader-utils-1.4.0" sources."locate-path-3.0.0" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."mississippi-3.0.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."move-concurrently-1.0.1" sources."normalize-path-3.0.0" sources."once-1.4.0" @@ -84399,11 +85313,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."moment-2.24.0" sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.0" @@ -84628,7 +85538,7 @@ in }) sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.1" + sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.1" sources."yaml-ast-parser-custom-tags-0.0.43" ]; @@ -84669,7 +85579,7 @@ in sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; }; dependencies = [ - sources."@babel/runtime-7.8.7" + sources."@babel/runtime-7.9.2" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" @@ -85043,11 +85953,7 @@ in sources."is-extendable-1.0.1" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-0.5.4" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" @@ -85440,4 +86346,4 @@ in bypassCache = true; reconstructLock = true; }; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index faf2cd7d21f6..f2e633300c7e 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -1309,15 +1309,6 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; "minimist-1.2.5" = { name = "minimist"; packageName = "minimist"; @@ -1381,13 +1372,13 @@ let sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.4" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz"; + sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="; }; }; "mkdirp-1.0.3" = { @@ -2863,10 +2854,10 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-3.1.1" sources."minizlib-2.1.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" @@ -3034,10 +3025,10 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."nopt-4.0.3" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -3143,10 +3134,10 @@ in sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ms-2.1.2" sources."needle-2.4.0" sources."nopt-4.0.3" @@ -3162,11 +3153,7 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.5" - ]; - }) + sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix index e83aa90962c1..f87526382b93 100644 --- a/pkgs/development/node-packages/node-packages-v13.nix +++ b/pkgs/development/node-packages/node-packages-v13.nix @@ -598,13 +598,13 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; - "minimist-0.0.8" = { + "minimist-1.2.5" = { name = "minimist"; packageName = "minimist"; - version = "0.0.8"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; "minipass-3.1.1" = { @@ -634,13 +634,13 @@ let sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.4" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz"; + sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw=="; }; }; "mkdirp-1.0.3" = { @@ -1342,10 +1342,10 @@ in sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."minimatch-3.0.4" - sources."minimist-0.0.8" + sources."minimist-1.2.5" sources."minipass-3.1.1" sources."minizlib-2.1.0" - sources."mkdirp-0.5.1" + sources."mkdirp-0.5.4" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" diff --git a/pkgs/development/node-packages/shell-generate.nix b/pkgs/development/node-packages/shell-generate.nix deleted file mode 100644 index aa635b2a81e3..000000000000 --- a/pkgs/development/node-packages/shell-generate.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ nixpkgs ? import ../../.. {} }: -with nixpkgs; -mkShell { - buildInputs = [ - bash nodePackages.node2nix - ]; - NODE_NIXPKGS_PATH = builtins.toString ../../../.; -} diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index bc76cfcd64cf..8a16dcec343b 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ctypes-${version}"; - version = "0.15.1"; + version = "0.17.1"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "0adas974bwinn8jidb6chljkpd70s041h2a969dicsj0xsg6wys6"; + sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; }; nativeBuildInputs = [ pkgconfig ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ocamllabs/ocaml-ctypes; + homepage = "https://github.com/ocamllabs/ocaml-ctypes"; description = "Library for binding to C libraries using pure OCaml"; license = licenses.mit; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index d84c21565db8..aa12ebc8d796 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -3,6 +3,8 @@ buildDunePackage rec { pname = "dune-configurator"; + useDune2 = true; + inherit (dune_2) src version; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 1c3503f11a15..14059070c9a0 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -3,6 +3,8 @@ buildDunePackage rec { pname = "dune-private-libs"; + useDune2 = true; + inherit (dune_2) src version; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index 3922b5cfec75..dacd3a758623 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -1,9 +1,11 @@ -{ stdenv, buildDune2Package, fetchFromGitHub, ctypes, libcxx }: +{ stdenv, buildDunePackage, fetchFromGitHub, ctypes, libcxx }: -buildDune2Package rec { +buildDunePackage rec { pname = "eigen"; version = "0.2.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "owlbarn"; repo = pname; diff --git a/pkgs/development/ocaml-modules/gnuplot/default.nix b/pkgs/development/ocaml-modules/gnuplot/default.nix index e473273b8da7..d939b884e875 100644 --- a/pkgs/development/ocaml-modules/gnuplot/default.nix +++ b/pkgs/development/ocaml-modules/gnuplot/default.nix @@ -1,19 +1,21 @@ -{ stdenv, buildDunePackage, fetchFromBitbucket, gnuplot, core }: +{ lib, buildDunePackage, fetchFromGitHub, gnuplot, iso8601 }: buildDunePackage rec { pname = "gnuplot"; - version = "0.5.3"; + version = "0.7"; - src = fetchFromBitbucket { - owner = "ogu"; - repo = "${pname}-ocaml"; - rev = "release-${version}"; - sha256 = "00sn9g46pj8pfh7faiyxg3pfhq7w9knafyabjr464bh6qz5kiin3"; + minimumOCamlVersion = "4.03"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "ocaml-${pname}"; + rev = "v${version}"; + sha256 = "02pzi3lb57ysrdsba743s3vmnapjbxgq8ynlzpxbbs6cn1jj6ch9"; }; - propagatedBuildInputs = [ core gnuplot ]; + propagatedBuildInputs = [ gnuplot iso8601 ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Ocaml bindings to Gnuplot"; maintainers = [ maintainers.bcdarwin ]; diff --git a/pkgs/development/ocaml-modules/graphics/default.nix b/pkgs/development/ocaml-modules/graphics/default.nix new file mode 100644 index 000000000000..6a3217431b43 --- /dev/null +++ b/pkgs/development/ocaml-modules/graphics/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, buildDunePackage, dune-configurator, libX11 }: + +buildDunePackage rec { + + pname = "graphics"; + version = "5.1.0"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/ocaml/graphics/releases/download/${version}/graphics-${version}.tbz"; + sha256 = "16z997mp0ccilaqqvmz3wp7vx0ghaf4ik9qklgd4piklcl1yv5n5"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ libX11 ]; + + meta = { + homepage = "https://github.com/ocaml/graphics"; + description = "A set of portable drawing primitives"; + license = lib.licenses.lgpl2; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 014525ef2b4e..547fa77ae6e9 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -1,38 +1,28 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4, ounit, gettext, fileutils, camomile }: +{ lib, fetchurl, buildDunePackage, gettext, fileutils, ounit }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-gettext-${version}"; - version = "0.3.8"; +buildDunePackage rec { + pname = "gettext"; + version = "0.4.1"; + + minimumOCamlVersion = "4.03"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1731/ocaml-gettext-${version}.tar.gz"; - sha256 = "05wnpxwzzpn2qinah2wb5wzfh5iz8gyf8jyihdbjxc8mk4hf70qv"; + url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz"; + sha256 = "0pwy6ym5fd77mdbgyas8x86vbrri9cgk79g8wxdjplhyi7zhh158"; }; - propagatedBuildInputs = [ gettext fileutils camomile ]; - - buildInputs = [ ocaml findlib camlp4 ounit ]; - - postPatch = stdenv.lib.optionalString (camlp4 != null) '' - substituteInPlace test/test.ml --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace ocaml-gettext/OCamlGettext.ml --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace ocaml-gettext/Makefile --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace ocaml-gettext/Makefile --replace "unix.cma" "" - substituteInPlace libgettext-ocaml/Makefile --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace libgettext-ocaml/Makefile --replace "\$(shell ocamlc -where)" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib" - ''; + propagatedBuildInputs = [ gettext fileutils ]; - configureFlags = [ "--disable-doc" ]; + doCheck = true; - createFindlibDestdir = true; + checkInputs = lib.optional doCheck ounit; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "OCaml Bindings to gettext"; - homepage = https://forge.ocamlcore.org/projects/ocaml-gettext; - license = licenses.gpl2; + homepage = "https://github.com/gildor478/ocaml-gettext"; + license = licenses.lgpl21; maintainers = [ maintainers.volth ]; - platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix new file mode 100644 index 000000000000..b18c0abc530b --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -0,0 +1,14 @@ +{ lib, buildDunePackage, ocaml_gettext, ounit }: + +buildDunePackage rec { + + pname = "gettext-stub"; + + inherit (ocaml_gettext) src version meta; + + propagatedBuildInputs = [ ocaml_gettext ]; + + doCheck = true; + + checkInputs = lib.optional doCheck ounit; +} diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 11405c0ebe5e..6a9e4e1d8c5c 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { autoconf ''; - buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt"; + buildPhase = "make all opt CPPFLAGS=-Wno-error"; installPhase = "make install-opt"; diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix new file mode 100644 index 000000000000..71e77b24ce4b --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildDunePackage, pkg-config, configurator, stdio, R }: + +buildDunePackage rec { + pname = "ocaml-r"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "pveber"; + repo = pname; + rev = "v${version}"; + sha256 = "09gljccwjsw9693m1hm9hcyvgp3p2fvg3cfn18yyidpc2f81a4fy"; + }; + + # Without the following patch, stub generation fails with: + # > Fatal error: exception (Failure "not supported: osVersion") + preConfigure = '' + substituteInPlace stubgen/stubgen.ml --replace \ + 'failwithf "not supported: %s" name ()' \ + 'sprintf "(* not supported: %s *)" name' + ''; + + buildInputs = [ configurator pkg-config R stdio ]; + + meta = { + description = "OCaml bindings for the R interpreter"; + inherit (src.meta) homepage; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.bcdarwin ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix index ce6ee124466c..9d2bf74a3ace 100644 --- a/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -1,9 +1,11 @@ -{ stdenv, buildDune2Package, fetchFromGitHub, stdlib-shims }: +{ stdenv, buildDunePackage, fetchFromGitHub, stdlib-shims }: -buildDune2Package rec { +buildDunePackage rec { pname = "owl-base"; version = "0.8.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "owlbarn"; repo = "owl"; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index c6eaf69b704b..7fa912d808db 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -1,5 +1,5 @@ { stdenv -, buildDune2Package +, buildDunePackage , dune-configurator , fetchFromGitHub , alcotest @@ -11,10 +11,10 @@ , npy }: -buildDune2Package rec { +buildDunePackage rec { pname = "owl"; - inherit (owl-base) version src meta; + inherit (owl-base) version src meta useDune2; checkInputs = [ alcotest ]; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 049a9a97c8e2..916be9b3d386 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,21 +1,23 @@ -{ stdenv, buildDune2Package, fetchFromGitHub, ppx_deriving -, alcotest, biocaml, gnuplot, lacaml, menhir, owl }: +{ stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving +, alcotest, biocaml, gnuplot, lacaml, menhir, ocaml-r, owl, printbox }: -buildDune2Package rec { +buildDunePackage rec { pname = "phylogenetics"; - version = "unstable-2019-11-15"; + version = "unstable-2020-01-05"; + + useDune2 = true; src = fetchFromGitHub { owner = "biocaml"; repo = pname; - rev = "91c03834db065cf4a86f33affbb9cfd216defc9f"; - sha256 = "0i9m0633a6a724as35ix8z3p1gj267cl0hmqrpw4qfq39zxmgnxb"; + rev = "b55ef7d7322bd822be26d21339945d45487fb547"; + sha256 = "0hzfjhs5w3a7hlzxs739k5ik3k1xn3dzyzziid765s74f638n4hj"; }; minimumOCamlVersion = "4.08"; # e.g., uses Float.min checkInputs = [ alcotest ]; - propagatedBuildInputs = [ biocaml gnuplot lacaml menhir owl ppx_deriving ]; + propagatedBuildInputs = [ biocaml gnuplot lacaml menhir ocaml-r owl ppx_deriving printbox ]; doCheck = false; # many tests require bppsuite diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 8173fc87aba1..a8d438d3731d 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -41,7 +41,7 @@ let src = fetchFromGitHub { pname = "ppx_tools"; meta = with stdenv.lib; { description = "Tools for authors of ppx rewriters"; - homepage = http://www.lexifi.com/ppx_tools; + homepage = "https://www.lexifi.com/ppx_tools"; license = licenses.mit; maintainers = with maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 653f45325857..e9b3721bc682 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned }: +{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "sedlex is not available for OCaml ${ocaml.version}" @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0phnqyn6mpv5byr1kkphl24y9q9fb2k3xg9yb457h5816q6ya72n"; }; - buildInputs = [ ocaml findlib ppx_tools_versioned ]; + buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ gen ]; + propagatedBuildInputs = [ gen ocaml-migrate-parsetree ppx_tools_versioned ]; buildFlags = [ "all" "opt" ]; diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index 6a3ed466e8f7..ea05ecd299da 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -2,13 +2,13 @@ buildPerlPackage rec { pname = "WWW-YoutubeViewer"; - version = "3.3.0"; + version = "3.7.5"; src = fetchFromGitHub { owner = "trizen"; repo = "youtube-viewer"; rev = version; - sha256 = "15xyrwv08fw8jmpydwzks26ipxnzliwddgyjcfqiaj0p7lwlhmx1"; + sha256 = "1caz56sxy554avz2vdv9gm7gyqcq0gyixzrh5v9ixmg6vxif5d4f"; }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; diff --git a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch new file mode 100644 index 000000000000..add6d9df3b7f --- /dev/null +++ b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch @@ -0,0 +1,45 @@ +From e996904128653c67b04ddbdb1e10cef158098957 Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel <samuel@dionne-riel.com> +Date: Fri, 6 Dec 2019 23:00:51 -0500 +Subject: [PATCH] [HACK]: Assumes Expat paths are good. + +The `check_lib` check fails with the cross-compilation build platform's +Perl, since apparently `mktemp` is missing... + +Even then, side-stepping the issue, it seems it is not actually enough +to work, as the compilation fails. +--- + Makefile.PL | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 505d1df..fc38b76 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -29,12 +29,17 @@ foreach (@ARGV) { + @ARGV = @replacement_args; + + unless ( +- check_lib( # fill in what you prompted the user for here +- lib => [qw(expat)], +- header => ['expat.h'], +- incpath => $expat_incpath, +- ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), +- ) ++ #check_lib( # fill in what you prompted the user for here ++ # lib => [qw(expat)], ++ # header => ['expat.h'], ++ # incpath => $expat_incpath, ++ # ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), ++ #) ++ # The check_lib implementation fails horribly with cross-compilation. ++ # We are giving known good paths to expat. ++ # And in all cases, the previous behaviour of not actually failing ++ # seemed to work just fine :/. ++ false + ) { + warn <<'Expat_Not_Installed;'; + +-- +2.23.0 + diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix index 4e6c0f9214c2..123cf3f4741a 100644 --- a/pkgs/development/python-modules/3to2/default.nix +++ b/pkgs/development/python-modules/3to2/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "3to2"; + pname = "py3to2"; version = "1.1.1"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "3to2"; extension = "zip"; sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c"; }; diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix index 7cbe523ba1ec..8158c675898e 100644 --- a/pkgs/development/python-modules/HTSeq/default.nix +++ b/pkgs/development/python-modules/HTSeq/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, cython, numpy, pysam, matplotlib }: buildPythonPackage rec { - version = "0.11.2"; + version = "0.11.4"; pname = "HTSeq"; src = fetchPypi { inherit pname version; - sha256 = "65c4c13968506c7df92e97124df96fdd041c4476c12a548d67350ba8b436bcfc"; + sha256 = "1ncn30yvc18aiv1qsa0bvcbjwqy21s0a0kv3v0vghzsn8vbfzq7h"; }; buildInputs = [ cython numpy pysam ]; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 36a1c1b76e4f..6e867d0b0f65 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.15"; + version = "0.1.16"; src = fetchPypi { inherit pname version; - sha256 = "0gbl08p89959g8dqy2vainppg3kyf948xlh18p7iwk5p0mw5d3j9"; + sha256 = "0yk4ghvg47drfvdrrcw7nk14pg4shccmyhln9d8hy1lyafcqmnd5"; }; # hardcodes a test dependency on an old version of pytest-asyncio @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Asynchronous console and interfaces for asyncio"; - homepage = https://github.com/vxgmichel/aioconsole; + homepage = "https://github.com/vxgmichel/aioconsole"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.catern ]; }; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 782238c3f832..392c77036ca3 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.4"; + version = "0.3.7"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "1gc74a0i0slq3gn9kv3scn7c9x444z5nwjm3d14qilsgq6civsnd"; + sha256 = "00zqlkhfrp1jczgjppaksriidyfshnj0jvrcryn1x77dmy73m023"; }; propagatedBuildInputs = [ aiohttp attrs ]; @@ -20,6 +20,6 @@ buildPythonPackage rec { meta = { description = "SOCKS proxy connector for aiohttp"; license = lib.licenses.asl20; - homepage = https://github.com/romis2012/aiohttp-socks; + homepage = "https://github.com/romis2012/aiohttp-socks"; }; } diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix new file mode 100644 index 000000000000..ef8b74bb9d71 --- /dev/null +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb +, pyopenssl, nose, isPy3k, pythonOlder, mock }: + +buildPythonPackage rec { + pname = "alarmdecoder"; + version = "1.13.9"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "nutechsoftware"; + repo = "alarmdecoder"; + rev = version; + sha256 = "0plr2h1qn4ryawbaxf29cfna4wailghhaqy1jcm9kxq6q7b9xqqy"; + }; + + propagatedBuildInputs = [ pyserial pyftdi pyusb pyopenssl ]; + + doCheck = !isPy3k; + checkInputs = [ nose mock ]; + pythonImportsCheck = [ "alarmdecoder" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/nutechsoftware/alarmdecoder"; + description = + "Python interface for the Alarm Decoder (AD2) family of alarm devices. (AD2USB, AD2SERIAL and AD2PI)"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index c80af1acdc59..f5076953bf20 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "altair"; - version = "4.0.1"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "145gjad415zjfp0ciq1b19i97ibavj8fki1vzhjppqz55k4704nk"; + sha256 = "0c99q5dy6f275yg1f137ird08wmwc1z8wmvjickkf2mvyka31p9y"; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A declarative statistical visualization library for Python."; - homepage = https://github.com/altair-viz/altair; + homepage = "https://github.com/altair-viz/altair"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index 77b93ce890e4..65f51c17d7d4 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ansi"; - version = "0.1.3"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - sha256 = "06y6470bzvlqys3zi2vc68rmk9n05v1ibral14gbfpgfa8fzy7pg"; + sha256 = "02sknsbx55r6nylznslmmzzkfi3rsw7akpyzi6f1bqvr2ila8p0f"; }; checkPhase = '' @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "ANSI cursor movement and graphics"; - homepage = https://github.com/tehmaze/ansi/; + homepage = "https://github.com/tehmaze/ansi/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 049db8a648fb..f23d16c26955 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -134,37 +134,37 @@ buildPythonPackage rec { ]; postPatch = '' + substituteInPlace setup.py \ + --replace "flask>=1.1.0, <2.0" "flask" \ + --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \ + --replace "pandas>=0.17.1, <1.0.0" "pandas" \ + --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \ + --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \ + --replace "pendulum==1.4.4" "pendulum" \ + --replace "cached_property~=1.5" "cached_property" \ + --replace "dill>=0.2.2, <0.3" "dill" \ + --replace "configparser>=3.5.0, <3.6.0" "configparser" \ + --replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \ + --replace "colorlog==4.0.2" "colorlog" \ + --replace "funcsigs==1.0.0" "funcsigs" \ + --replace "flask-swagger==0.2.13" "flask-swagger" \ + --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \ + --replace "alembic>=0.9, <1.0" "alembic" \ + --replace "markdown>=2.5.2, <3.0" "markdown" \ + --replace "future>=0.16.0, <0.17" "future" \ + --replace "tenacity==4.12.0" "tenacity" \ + --replace "text-unidecode==1.2" "text-unidecode" \ + --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \ + --replace "sqlalchemy~=1.3" "sqlalchemy" \ + --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \ + --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug" - substituteInPlace setup.py \ - --replace "flask>=1.1.0, <2.0" "flask" \ - --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \ - --replace "pandas>=0.17.1, <1.0.0" "pandas" \ - --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \ - --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \ - --replace "pendulum==1.4.4" "pendulum" \ - --replace "cached_property~=1.5" "cached_property" \ - --replace "dill>=0.2.2, <0.3" "dill" \ - --replace "configparser>=3.5.0, <3.6.0" "configparser" \ - --replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \ - --replace "funcsigs==1.0.0" "funcsigs" \ - --replace "flask-swagger==0.2.13" "flask-swagger" \ - --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \ - --replace "alembic>=0.9, <1.0" "alembic" \ - --replace "markdown>=2.5.2, <3.0" "markdown" \ - --replace "future>=0.16.0, <0.17" "future" \ - --replace "tenacity==4.12.0" "tenacity" \ - --replace "text-unidecode==1.2" "text-unidecode" \ - --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \ - --replace "sqlalchemy~=1.3" "sqlalchemy" \ - --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \ - --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug" + # dumb-init is only needed for CI and Docker, not relevant for NixOS. + substituteInPlace setup.py \ + --replace "'dumb-init>=1.2.2'," "" - # dumb-init is only needed for CI and Docker, not relevant for NixOS. - substituteInPlace setup.py \ - --replace "'dumb-init>=1.2.2'," "" - - substituteInPlace tests/core.py \ - --replace "/bin/bash" "${stdenv.shell}" + substituteInPlace tests/core.py \ + --replace "/bin/bash" "${stdenv.shell}" ''; checkPhase = '' @@ -184,8 +184,8 @@ buildPythonPackage rec { meta = with lib; { description = "Programmatically author, schedule and monitor data pipelines"; - homepage = http://airflow.apache.org/; + homepage = "http://airflow.apache.org/"; license = licenses.asl20; - maintainers = [ maintainers.costrouc maintainers.ingenieroariel ]; + maintainers = with maintainers; [ costrouc ingenieroariel ]; }; } diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 654567cc23fc..90b21baafdda 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -1,21 +1,26 @@ -{ lib, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: +{ lib, buildPythonPackage, fetchFromGitHub, zope_interface, isPy3k }: buildPythonPackage rec { pname = "python-application"; - version = "2.7.0"; + version = "2.8.0"; disabled = isPy3k; - src = fetchdarcs { - url = "http://devel.ag-projects.com/repositories/${pname}"; + src = fetchFromGitHub { + owner = "AGProjects"; + repo = pname; rev = "release-${version}"; - sha256 = "1xpyk2v3naxkjhpyris58dxg1lxbraxgjd6f7w1sah5j0sk7psla"; + sha256 = "1xd2gbpmx2ghap9cnr1h6sxjai9419bdp3y9qp5lh67977m0qg30"; }; buildInputs = [ zope_interface ]; + # No tests upstream to run + doCheck = false; + meta = with lib; { description = "Basic building blocks for python applications"; - homepage = https://github.com/AGProjects/python-application; + homepage = "https://github.com/AGProjects/python-application"; + changelog = "https://github.com/AGProjects/python-application/blob/master/ChangeLog"; license = licenses.lgpl2Plus; }; } diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 186bda86842e..9e06abd9a71e 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage -, traits, traitsui, configobj +{ lib, fetchPypi, buildPythonPackage +, configobj, six, traitsui , nose, tables, pandas }: buildPythonPackage rec { pname = "apptools"; - version = "4.4.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1dw6vvq7lqkj7mgn3s7r5hs937kl4mj5g7jf2qgvhdld9lsc5xbk"; + sha256 = "10h52ibhr2aw076pivqxiajr9rpcr1mancg6xlpxzckcm3if02i6"; }; - propagatedBuildInputs = [ traits traitsui configobj ]; + propagatedBuildInputs = [ configobj six traitsui ]; checkInputs = [ nose @@ -21,11 +21,12 @@ buildPythonPackage rec { ]; doCheck = true; + checkPhase = ''HOME=$TMP nosetests''; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of packages that Enthought has found useful in creating a number of applications."; - homepage = https://github.com/enthought/apptools; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + homepage = "https://github.com/enthought/apptools"; + maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 6f978778f7da..b34b878a839c 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -1,25 +1,37 @@ -{ buildPythonPackage, fetchPypi, lib, - dicttoxml, pexpect, prettytable, requests_toolbelt +{ buildPythonPackage, fetchPypi, lib +, dicttoxml +, importlib-metadata +, pexpect +, prettytable +, requests_toolbelt }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.10.3"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "a37f522cf3b6a34abddfedb61c4546f60023b3799b22d1cd971eacdc0861530a"; + sha256 = "0h1przxffrhqvi46k40pzjsvdrq4zc3sl1pc96kkigqppq0vdrss"; }; - doCheck = false; # bash-completion test fails with "compgen: command not found". + doCheck = false; # meant to be ran with interactive interpreter # re-enable if we are able to make testing work - # buildInputs = [ coverage flake8 ]; + # checkInputs = [ bashInteractive coverage flake8 ]; - propagatedBuildInputs = [ dicttoxml pexpect prettytable requests_toolbelt ]; + propagatedBuildInputs = [ + dicttoxml + importlib-metadata + pexpect + prettytable + requests_toolbelt + ]; + + pythonImportsCheck = [ "argcomplete" ]; meta = with lib; { description = "Bash tab completion for argparse"; - homepage = https://argcomplete.readthedocs.io; + homepage = "https://kislyuk.github.io/argcomplete/"; maintainers = [ maintainers.womfoo ]; license = [ licenses.asl20 ]; }; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index af3e4547628a..04295dce261f 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "arrow"; - version = "0.15.4"; + version = "0.15.5"; src = fetchPypi { inherit pname version; - sha256 = "e1a318a4c0b787833ae46302c02488b6eeef413c6a13324b3261ad320f21ec1e"; + sha256 = "0yq2bld2bjxddmg9zg4ll80pb32rkki7xyhgnrqnkxy5w9jf942k"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 3aa5a432c4b0..870f0598e5e7 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.19.0"; + version = "3.19.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a8378ab57e91cfe1ba09b3639d8409bb7fc1a40b59479c7822d206e673ad93f9"; + sha256 = "03xzpmpask2q2609kkq0hfgzsfvkyjpbjws7qx00nnfrbbnjk443"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Atomic Simulation Environment"; - homepage = https://wiki.fysik.dtu.dk/ase/; + homepage = "https://wiki.fysik.dtu.dk/ase/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 9fa7d8c7c42e..56c69bb97ede 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: buildPythonPackage rec { - version = "3.2.5"; + version = "3.2.7"; pname = "asgiref"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "040g2cghpskp427xiw9jv7c0lfj1sk5fc01dds8pi7grkk0br357"; + sha256 = "1qf29blzhh6sljaj1adc0p8cnyxh9ar6hky9ccdfbgmrk4rw5kwc"; }; propagatedBuildInputs = [ async-timeout ]; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 9ef332827eb6..e58fa446f819 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.15.4"; + version = "1.15.6"; src = fetchPypi { inherit pname version; - sha256 = "0vkq3sr4a23ipk74swsmc3ydg3q91asixb7hzl8mzkfpgnnyvr77"; + sha256 = "0nn3g2sb0pqfacsqcw94n8v9jbn4ip0pvhvczasfvks2w9q9sij7"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index d1ccef1ece4e..3e08d4a9882a 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "audio-metadata"; - version = "0.6.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "7a0c060d05ac59a4ce841a485808fe8a6993fec554f96bee90e57e971c73a2a6"; + sha256 = "1v7ww3csyxrhnpvpynla64hfn1wp37vbw7srh9343n4wc02mh65l"; }; postPatch = '' diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 1f03ef8cb3b6..20ed59f9e5bd 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -1,15 +1,15 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3 +, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, botocore , requests, requests-kerberos, click, configparser, fido2, isPy27 }: buildPythonPackage rec { pname = "aws-adfs"; - version = "1.21.2"; + version = "1.24.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ba96e71404474350b2c3ae4d5cb2dd25e9267b6d0680933c5711a51ea364e3bc"; + sha256 = "0bcjlf5dkg2q0db0ra1ssa3hy98spflkd3ykhmlyv65rkgx8w1wv"; }; # Relax version constraint @@ -24,11 +24,11 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; - propagatedBuildInputs = [ lxml boto3 requests requests-kerberos click configparser fido2 ]; + propagatedBuildInputs = [ botocore lxml requests requests-kerberos click configparser fido2 ]; meta = with lib; { description = "Command line tool to ease aws cli authentication against ADFS"; - homepage = https://github.com/venth/aws-adfs; + homepage = "https://github.com/venth/aws-adfs"; license = licenses.psfl; maintainers = [ maintainers.bhipple ]; }; diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix index f772d16942f2..05021c73edb0 100644 --- a/pkgs/development/python-modules/azure-batch/default.nix +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi"; + sha256 = "112d73gxjqng348mcvi36ska6pxyg8qc3qswvhf5x4a0lr86zjj7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index b842a66cd278..abf27b5d7ef2 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.24"; + version = "1.1.25"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "184ad6a05a3089dfdc1ce07c1cbfa489bbc45b5f6f56e848cac0851e6443da21"; + sha256 = "ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 24675200b5b1..2e87db4fb6ce 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , aiodns , aiohttp +, mock , msrest , pytest , pytestCheckHook @@ -11,14 +12,14 @@ }: buildPythonPackage rec { - version = "1.2.2"; + version = "1.3.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0bz4m6kmqymxlxf9qk6jw8v895d13rsggbgsjpsbvi9px6w15nwb"; + sha256 = "98d03a35845fe5b6abaa32f5961214da3e16c4c82b8c601926fc5e7f3a39549e"; }; propagatedBuildInputs = [ @@ -29,6 +30,7 @@ buildPythonPackage rec { checkInputs = [ aiodns aiohttp + mock msrest pytest pytestCheckHook diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index 5716b1254af6..4fa05ada8504 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -17,9 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six requests ]; - postInstall = '' - rm $out/${python.sitePackages}/azure/__init__.py - ''; + pythonNamespaces = [ "azure" ]; # requires an active Azure Cosmos service doCheck = false; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index e4b894eca64b..78fd74020980 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.1.0"; + version = "1.3.0"; disabled = isPy38; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1xn4nwi4vly8n3mmphv0wbdg9k55gsgmk3fdwma8rm3m3c7593hc"; + sha256 = "17fa904e0447fd2a2dc19909379edb769b05656dbaf4863b8c4fdfb2bb54350c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 34629e6eb48d..7e03e7faa8e4 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.0.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1l1fwm8plzr5zbv02nlvs0i8ssmd88cxm5lb19i54b3scci77hiq"; + sha256 = "f9967b4deb48e619f6c40558f69e48978779cc09c8a7fad33d536cfc41cd68f9"; }; propagatedBuildInputs = [ @@ -26,6 +26,8 @@ buildPythonPackage rec { cryptography ]; + pythonNamespaces = [ "azure.keyvault" ]; + # requires relative paths to utilities in the mono-repo doCheck = false; checkInputs = [ aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index e2b40c29d850..25d58513d311 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.0.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "066p4x2ixasz6qbxss2ilchl73w1kh2nc32lgh8qygl3d90059lp"; + sha256 = "4f3bfac60e025e01dd1c1998b73649d45d706975356c0cf147174cf5a6ddf8be"; }; propagatedBuildInputs = [ @@ -21,6 +21,8 @@ buildPythonPackage rec { msrest ]; + pythonNamespaces = [ "azure.keyvault" ]; + # requires checkout from mono-repo doCheck = false; diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index b6f7f1d70d49..035871ab9377 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { # this is just a meta package, which contains keys and secrets doCheck = false; + pythonNamespaces = [ "azure" ]; + pythonImportsCheck = [ "azure.keyvault.keys" "azure.keyvault.secrets" diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix index 4bfda9a9342d..beca4018baba 100644 --- a/pkgs/development/python-modules/azure-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -22,9 +22,7 @@ buildPythonPackage rec { azure-common ]; - postInstall = lib.optionalString isPy3k '' - rm -rf $out/${python.sitePackages}/azure/__init__.py - ''; + pythonNamespaces = [ "azure" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 274cb181d2d2..76a0d71b1517 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -27,9 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix index 6da0cf2210c3..8186f87fd727 100644 --- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -24,10 +24,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix index 8c658145d7eb..6e9656950d5b 100644 --- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -30,10 +30,7 @@ buildPythonPackage rec { --replace "azure-namespace-package = azure-mgmt-nspkg" "" ''; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index c535971c7bf5..2dadb1d2cb81 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "5.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906"; + sha256 = "d03641336f4b2ec561112655c93ee80bc28d8e8daa45a57abc36169bd19c07a0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 99545d2a9818..109c3b777480 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -16,15 +16,12 @@ buildPythonPackage rec { sha256 = "00ygppmlx21dxvb0swfdyhqf5xhi0zxy26abcgql02w0lklw91nj"; }; - postInstall = if isPy3k then "" else '' - 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 ]; + pythonNamespaces = [ "azure.mgmt" ]; + # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index de4a1338611d..7e5771645115 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -24,11 +24,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 41124e448541..20861a9efe3a 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "8.2.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0czn781ywbwi8px54nlccsvw5s13y4wqmxhcrxkkl0y7rblqi5pr"; + sha256 = "6f05948bbd19ceb894f46f037b77c54116183364a671e180c007b5737c8d4590"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 0d610eebe9c1..e7da7541dd98 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "0.8.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0rv3443h4f9n88ky0fkfrp6jhf7ck9w3v96q040g3c2vkkywsnwa"; + sha256 = "48b1ec81f30f4b5f38dd17f68f0dfc968db96e0a04fdcfc99f43f80ca041f14b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix index ad77a75fe838..1e4cdd88c957 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix @@ -24,11 +24,7 @@ buildPythonPackage rec { azure-mgmt-datalake-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/datalake/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt.datalake" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix index 5d2db3c21125..4f985e37e6fa 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -3,6 +3,7 @@ , fetchPypi , python , isPy3k +, pythonNamespacesHook , msrestazure , azure-common , azure-mgmt-datalake-nspkg @@ -24,11 +25,7 @@ buildPythonPackage rec { azure-mgmt-datalake-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/datalake/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt.datalake" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index 93c294e4be95..c82bfeab2ed4 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -27,11 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 756af164a719..78f149e2f7da 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -27,11 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 0f1527f688b8..ce467dba31da 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -27,10 +27,7 @@ buildPythonPackage rec { ]; # this is still needed for when the version is overrided - # to previous versions. E.g azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index 789784babfb4..c23ebfc2ce9c 100644 --- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cc844a152079e0d18fb5f47663a24cb204982925425c1fb51bac53894885000b"; + sha256 = "cc4058174e371a0b68b305cd5a082fcca47f3446dd9aefd9ada72da4bd637da9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index 29069d71b88a..5ba25e11a89e 100644 --- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iotcentral"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1fql0j28d2r6slgabb7b438gdga513iskqh4al6c7dsmj1yzdzwa"; + sha256 = "f6dacf442ccae2f18f1082e80bcbdcaa8c0efa2ba92b48c5db6ee01d37240047"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index 1e4c8923d7d3..57ec64f3d562 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1xms5wf21z9i28xl0p515xb08mrlsqnzhxcwv7pjlf26lwxadfi0"; + sha256 = "f6fbb87d9bf29ce325543c9a3a125fbe45f4797f3a7f260c6c21ca60dc3f0885"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index c72ca47cff9b..c668e5ed4d66 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -26,10 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 43f0394669b7..fd6cd26c7c6c 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "2.1.1"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0ga6lzqlinfxlzx1g35a5sv5chjx4im0m4b8i33hqrhmdv9m7ypg"; + sha256 = "1883e12eeb5819064dc52bf3a3ade05c791f4b66e4aeec948bda28df6ce2bce4"; }; propagatedBuildInputs = [ @@ -26,11 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # this is still need when overriding to prevoius versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 53aeff46c585..08a9b6b507ef 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.7.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0r6j3yp7ys0zgszqdjm6y90nigsapni4xhfpfgyk5c5qbgdpl93w"; + sha256 = "40f8e62db145d31731018b83baf2d1a78b585514c373dd3c095f1f6835d17d23"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index a5e2829a930a..c149d5ef6fa1 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -26,10 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix index b18c02672361..db87b81c8380 100644 --- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -26,10 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 252760950e5b..fb3bd445b78e 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2"; + sha256 = "09bhk6kpf1j1kgsyfdrfmfixrdj0iikx25dr1mh9dc6lci07i1cx"; }; propagatedBuildInputs = [ @@ -27,10 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm -rf $out/${python.sitePackages}/azure/__init__.py - rm -rf $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 328e81c8fe79..2b1b65d60aec 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -26,11 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index ac99b98f0e5e..00480ac38bc2 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "9.0.0"; + version = "10.0.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix"; + sha256 = "3978da4641b3396d4a00c7ddd53d87ece7e7d45b5bc41a157639bdd2f2c5b9b3"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix index 37c7e46cbf3a..ad8a2a0fbe23 100644 --- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-policyinsights"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; + sha256 = "ed229e3845c477e88dde413825d4fba0d38b3a5ffab4e694c7d0da995f3db0f3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 6a7b6df24185..858bde764402 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "19z0lpq6bpidlflwa263y51549xgcg4m040k872m7fmy7jm2xcbb"; + sha256 = "7826601507878e77f5d5cd805c6ad1d6483c375b545d5e9e1694b5a6c5e12fe3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 990f494ecedc..ece93025b571 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; + sha256 = "6355d9234d87422d57bf2ea8d1cc242463c203e4bb79b8930f22f29f4e025fa1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index b60a82a7b1ad..d3bf3f31fc20 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -24,11 +24,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index 5d13acb6ec83..3873f08e3ce2 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-reservations"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; + sha256 = "f65c1985a47e0ac55e7d5d9cc1bd5e95335a111566edc289d460aa2bc8f80991"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index 03084e11cf3f..47df7f05cebc 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -26,11 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # this is still needed for overriding to previous versions - # E.g azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index a81f336df066..1b6649a36f23 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1kp1wzcydgyc2mzkxigfv6rqzwzf3d0cnbqc6w7h907qbb4lw2r0"; + sha256 = "99ca085eb523a5c27933060ccb04d7a6b60864f98d87bf5b63ac17d419b43445"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 0b2442b087de..e786731dcd0b 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,22 +7,19 @@ }: buildPythonPackage rec { - version = "7.2.0"; + version = "9.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl"; + sha256 = "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; }; - postInstall = if isPy3k then "" else '' - 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 ]; + pythonNamespaces = [ "azure.mgmt" ]; + # has no tests doCheck = false; @@ -30,6 +27,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Storage Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ olcai mwilsoninsight ]; + maintainers = with maintainers; [ jonringer olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index ea6c1502123f..3b25c93a1bd1 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.44.0"; + version = "0.45.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw"; + sha256 = "04wdb7vksjhcvv0gkjjr37lmb5ads5pr00cjac8r3szimr64zspr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index dc4a011e0789..677b8bbeb124 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -16,11 +16,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-common msrest msrestazure ]; - # fix namespace issues - postInstall = '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/multiapi/__init__.py - ''; + # fix namespace + pythonNamespaces = [ "azure.multiapi" ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 78950d2971e8..a4f8e161ba3b 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.0.0"; + version = "12.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "15f5vk3vd2amggqqznx186raak9wgr57j0l1p9qa62kcl10bs9lg"; + sha256 = "661ed9669b9fbb3163899294d28f11f7c135336e1513aab6bd1ff9ef3c6febb3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix index c199fbbeb367..e2037bb7d21f 100644 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -10,20 +10,21 @@ }: buildPythonPackage rec { - version = "0.20.3"; + version = "0.36.0"; pname = "azure-storage"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; + sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; }; 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 + postPatch = '' + rm azure_bdist_wheel.py + substituteInPlace setup.cfg \ + --replace "azure-namespace-package = azure-nspkg" "" ''; meta = with pkgs.lib; { diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix new file mode 100644 index 000000000000..141dbf241f25 --- /dev/null +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub +, wheel, pytestCheckHook, pytestrunner }: + +buildPythonPackage rec { + version = "0.18.0"; + pname = "bacpypes"; + + src = fetchFromGitHub { + owner = "JoelBender"; + repo = "bacpypes"; + rev = "${version}"; + sha256 = "1nz0qi46z6n455mw2ppxgz091qh0irizlxpvkx7iw1l7f6mmgj0x"; + }; + + propagatedBuildInputs = [ wheel ]; + + # Using pytes instead of setuptools check hook allows disabling specific tests + checkInputs = [ pytestCheckHook pytestrunner ]; + dontUseSetuptoolsCheck = true; + disabledTests = [ + # Test fails with a an error: AssertionError: assert 30 == 31 + "test_recurring_task_5" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/JoelBender/bacpypes"; + description = "BACpypes provides a BACnet application layer and network layer written in Python for daemons, scripting, and graphical interfaces."; + license = licenses.mit; + maintainers = with maintainers; [ bachp ]; + }; +} diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 210fbbe2176e..b1cf34959342 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder -, pytest, glibcLocales +, pytest, nose, glibcLocales , numpy, scipy, matplotlib, h5py }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "24e1327ce241a0113abf217fbaf41ac25e04f5a01f9ed606610f2f1f2d82d34f"; }; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ pytest nose glibcLocales ]; propagatedBuildInputs = [ numpy scipy matplotlib h5py ]; checkPhase = '' diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 6470b7da859d..36361ac01182 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,21 +2,21 @@ buildPythonPackage rec { pname = "boltons"; - version = "20.0.0"; + version = "20.1.0"; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; rev = version; - sha256 = "0scdslqi28b899i42m4c9pvhwv3kkw4wpi3n9zm5n64ggn5ngfbz"; + sha256 = "0mbxc2n10mlmpbwhg0byddl1i0s6rlrr6z9xm8zzmkv62136irqh"; }; checkInputs = [ pytest ]; checkPhase = "pytest tests"; meta = with stdenv.lib; { - homepage = https://github.com/mahmoud/boltons; + homepage = "https://github.com/mahmoud/boltons"; description = "220+ constructs, recipes, and snippets extending (and relying on nothing but) the Python standard library"; longDescription = '' Boltons is a set of over 220 BSD-licensed, pure-Python utilities diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index a91be0e13ddb..73ce843cf018 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.18"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "56cc20dbe568c98c81de4990fddf5862c0d8d3ab0ad1cf7057988abc5f7686c2"; + sha256 = "1764ikgj24jjq46s50apwkydqvy5a13adb2nbszk8kbci6df0v27"; }; propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix new file mode 100644 index 000000000000..2df937f4232c --- /dev/null +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, buildPythonPackage, isPy27, requests }: + +buildPythonPackage rec { + pname = "bravia-tv"; + version = "1.0.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "dcnielsen90"; + repo = "python-bravia-tv"; + rev = "v${version}"; + sha256 = "0jlrin5qw3ny2r961y5divd5xa9giprxhhxdc84rjlq9qdmnsk68"; + }; + + propagatedBuildInputs = [ requests ]; + + # package does not include tests + doCheck = false; + + pythonImportsCheck = [ "bravia_tv" ]; + + meta = with lib; { + homepage = "https://github.com/dcnielsen90/python-bravia-tv"; + description = "Python library for Sony Bravia TV remote control"; + license = licenses.mit; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index c471240c87ad..71a7174fb23f 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -4,19 +4,21 @@ buildPythonPackage rec { pname = "carbon"; - version = "1.1.6"; - - disabled = isPy3k; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "9ecda1469e497e3fed346b23ac94fd576e1bd9962677ab88975f4f598186e851"; + sha256 = "08ndphpcbdx2ab4f5jsn2y4l5p55h9wscbg7clhbyyh03r5hianr"; }; + # Carbon-s default installation is /opt/graphite. This env variable ensures + # carbon is installed as a regular python module. + GRAPHITE_NO_PREFIX="True"; + propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ]; meta = with stdenv.lib; { - homepage = http://graphite.wikidot.com/; + homepage = "http://graphiteapp.org/"; description = "Backend data caching and persistence daemon for Graphite"; maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 811ecef1f86c..3bf660bd098c 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.0.1"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1fid6li95jx9c3v83v8c2c8lb03jgirkk9mjmck30yxcwmlxp6a2"; + sha256 = "1ai1i0wydxfbdakqnrlpgdk4l2ps7gw0r9nihv9p2jgyqbl13kj3"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python CBOR (de)serializer with extensive tag support"; - homepage = https://github.com/agronholm/cbor2; + homepage = "https://github.com/agronholm/cbor2"; license = licenses.mit; maintainers = with maintainers; [ taneb ]; }; diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix index 1fb506682baf..5256d6050490 100644 --- a/pkgs/development/python-modules/cchardet/default.nix +++ b/pkgs/development/python-modules/cchardet/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "cchardet"; - version = "2.1.5"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "240efe3f255f916769458343840b9c6403cf3192720bc5129792cbcb88bf72fb"; + sha256 = "1cs6y59qhbal8fgbyjk2lpjykh8kfjhq16clfssylsddb4hgnsmp"; }; checkInputs = [ nose ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "High-speed universal character encoding detector"; - homepage = https://github.com/PyYoshi/cChardet; + homepage = "https://github.com/PyYoshi/cChardet"; license = lib.licenses.mpl11; maintainers = with lib.maintainers; [ ivan ]; }; diff --git a/pkgs/development/python-modules/cddb/default.nix b/pkgs/development/python-modules/cddb/default.nix index f40ff08fcf42..86c6e8b0d80a 100644 --- a/pkgs/development/python-modules/cddb/default.nix +++ b/pkgs/development/python-modules/cddb/default.nix @@ -5,13 +5,14 @@ }: buildPythonPackage rec { - name = "CDDB-1.4"; + pname = "CDDB"; + version = "1.4"; disabled = isPy3k; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ]; src = pkgs.fetchurl { - url = "http://cddb-py.sourceforge.net/${name}.tar.gz"; + url = "http://cddb-py.sourceforge.net/${pname}-${version}.tar.gz"; sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w"; }; diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 7496e7e1fcce..a94b4439250e 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }: buildPythonPackage rec { - version = "0.6"; + version = "0.8"; pname = "cgroup-utils"; buildInputs = [ pep8 nose ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "peo3"; repo = "cgroup-utils"; rev = "v${version}"; - sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc"; + sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 62f3731632d7..f99905950c9a 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "f8f929f26df77285a202fb93174400230f8912c5b9c1fb061c7836a78413e325"; + sha256 = "07xzpbz7znr853xm6p27lkrcgdib3ym5dlwys0n4zvkjm5x7jn2a"; }; checkInputs = [ watchdog pytest hypothesis mock ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Serverless Microframework for AWS"; - homepage = https://github.com/aws/chalice; + homepage = "https://github.com/aws/chalice"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index d6109e8aabac..a671f0e68e83 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."; - homepage = "http://github.com/quantumlib/cirq"; + homepage = "https://github.com/quantumlib/cirq"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix new file mode 100644 index 000000000000..d0de4b320e8d --- /dev/null +++ b/pkgs/development/python-modules/ciso8601/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytz +, unittest2 +, isPy27 +}: + +buildPythonPackage rec { + pname = "ciso8601"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "closeio"; + repo = "ciso8601"; + rev = "v${version}"; + sha256 = "0g1aiyc1ayh0rnibyy416m5mmck38ksgdm3jsy0z3rxgmgb24951"; + }; + + checkInputs = [ + pytz + ] ++ lib.optional (isPy27) unittest2; + + meta = with lib; { + description = "Fast ISO8601 date time parser for Python written in C"; + homepage = "https://github.com/closeio/ciso8601"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 9951b1711b39..ac96ef32618c 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -1,31 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, locale, pytest }: +{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook }: buildPythonPackage rec { pname = "click"; - version = "7.0"; + version = "7.1.1"; src = fetchPypi { - pname = "Click"; - inherit version; - sha256 = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"; + inherit pname version; + sha256 = "1k60i2fvxf8rxazlv04mnsmlsjrj5i5sda3x1ifhr0nqi7mb864a"; }; postPatch = '' - substituteInPlace click/_unicodefun.py \ + substituteInPlace src/click/_unicodefun.py \ --replace "'locale'" "'${locale}/bin/locale'" ''; - buildInputs = [ pytest ]; - - checkPhase = '' - py.test tests - ''; - - # https://github.com/pallets/click/issues/823 - doCheck = false; + checkInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = http://click.pocoo.org/; + homepage = "https://click.palletsprojects.com/"; description = "Create beautiful command line interfaces in Python"; longDescription = '' A Python package for creating beautiful command line interfaces in a diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 46ac5be03cee..00da74929a40 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "2.17.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f5a1c6b32047aa0d272398d311fd711d41dd5e1cd5195ebe36ebb47f464416fa"; + sha256 = "0j9q6725226hdhdyy9b0qfjngdj35d3y7fxbmfxpr36ksbh0x6sj"; }; propagatedBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command Line Interface Formulation Framework"; - homepage = https://docs.openstack.org/cliff/latest/; + homepage = "https://docs.openstack.org/cliff/latest/"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 94f3fa08b138..054b6edee6da 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "clikit"; - version = "0.4.1"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "8ae4766b974d7b1983e39d501da9a0aadf118a907a0c9b50714d027c8b59ea81"; + sha256 = "0glppxx0pyppjcigzs8h16srlbxb6nci0282xfy3ayvwbq8pwbbf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index a2e5862f5401..13f68d6a3927 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GtSqmkWCHX/1t31sny3f2ek8uTS1oEMSM1rRXG9DuFI="; + sha256 = "0fjwc095y97n3a7jxl9pk4h1i5hghas7y6zhgprl5lv5ixnicffk"; }; LC_ALL="en_US.UTF-8"; @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Enhancements for standard library's cmd module"; - homepage = https://github.com/python-cmd2/cmd2; + homepage = "https://github.com/python-cmd2/cmd2"; maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 9bde31d1f13c..c0148effdf94 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0gwd79zm7196fhnbzbdpyvgzsfjfzl3pmc5hh27h7hckfpxzj9yw"; + sha256 = "118wp5sjsl99hj8pqw5n3v2lry9r949p2hv4l92p086q1n0axxk3"; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { substituteInPlace $f --replace 'shell which' 'shell command -v' done - # This can probably be removed in the next update after 1.3.0 + # This can probably be removed in the next update after 1.3.1 substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" "" ''; diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index edcd040b0665..aa39588f313e 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42"; + sha256 = "1lpk8zmfv8vz090h5d0hzb4n39wgasxdd3x3bpn3v1x1n9dfzaih"; }; checkInputs = [ pytest ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Log formatting with colors"; - homepage = https://github.com/borntyping/python-colorlog; + homepage = "https://github.com/borntyping/python-colorlog"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 82d0b43bc350..22f647b216d5 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -2,14 +2,14 @@ , buildPythonPackage , fetchPypi , fetchpatch +, isPy27 +, ipaddress , openssl , cryptography_vectors , darwin , packaging , six , pythonOlder -, enum34 -, ipaddress , isPyPy , cffi , pytest @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "2.8"; # Also update the hash in vectors.nix + version = "2.9"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "0l8nhw14npknncxdnp7n4hpmjyscly6g7fbivyxkjwvlv071zniw"; + sha256 = "0vlqy2pki0fh1h6l6cbb43z3g2n9fv0849dzb5gqwjv0bkpx7b0c"; }; outputs = [ "out" "dev" ]; @@ -35,9 +35,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging six - ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 - ++ stdenv.lib.optional (pythonOlder "3.3") ipaddress - ++ stdenv.lib.optional (!isPyPy) cffi; + ] ++ stdenv.lib.optional (!isPyPy) cffi + ++ stdenv.lib.optionals isPy27 [ ipaddress ]; checkInputs = [ cryptography_vectors @@ -48,9 +47,8 @@ buildPythonPackage rec { pytz ]; - # remove when https://github.com/pyca/cryptography/issues/4998 is fixed checkPhase = '' - py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve' + py.test --disable-pytest-warnings tests ''; # IOKit's dependencies are inconsistent between OSX versions, so this is the best we @@ -64,9 +62,11 @@ buildPythonPackage rec { common cryptographic algorithms such as symmetric ciphers, message digests, and key derivation functions. Our goal is for it to be your "cryptographic standard library". It - supports Python 2.7, Python 3.4+, and PyPy 5.3+. + supports Python 2.7, Python 3.5+, and PyPy 5.4+. ''; - homepage = https://github.com/pyca/cryptography; + homepage = "https://github.com/pyca/cryptography"; + changelog = "https://cryptography.io/en/latest/changelog/#v" + + replaceStrings [ "." ] [ "-" ] version; license = with licenses; [ asl20 bsd3 psfl ]; maintainers = with maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 86cc195b05b3..6fd8259d78fc 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "05pi3shqz0fgvy0d5yazza67bbnam8fkrx2ayrrclgkaqms23lvc"; + sha256 = "1h7dcgwrjxqk1bzkangbvlhhlgyqd7cfi894dv1cd5m2sp7csblc"; }; # No tests included @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test vectors for the cryptography package"; - homepage = https://cryptography.io/en/latest/development/test-vectors/; + homepage = "https://cryptography.io/en/latest/development/test-vectors/"; # Source: https://github.com/pyca/cryptography/tree/master/vectors; license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 315c28c74caa..4c2db1f52146 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -4,6 +4,7 @@ , ipython , ipywidgets , pytest +, nose , numpy , pandas , six @@ -30,7 +31,7 @@ buildPythonPackage rec { statsmodels ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest nose ]; # ignore tests which are incompatible with pandas>=1.0 # https://github.com/santosjorge/cufflinks/issues/236 diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 2a77f45217a0..ccb51b059d6a 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -29,7 +29,9 @@ buildPythonPackage rec { cvxopt ecos multiprocess + numpy osqp + scipy scs six ]; @@ -39,11 +41,11 @@ buildPythonPackage rec { nosetests ''; - meta = { + meta = with lib; { description = "A domain-specific language for modeling convex optimization problems in Python."; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxgrp/cvxpy/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ drewrisinger ]; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index 4f1e26e42cbf..1a1e3db46ffa 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0qqf51mphv1pqqc2ff50rkbw44sp9liifg0mg7xkh41sgnv032cs"; + sha256 = "1wr6989hq7q9vyh1qqdpbp8igk9rfca4phfpaim3nnk4swvm5m75"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-html-components/default.nix b/pkgs/development/python-modules/dash-html-components/default.nix index 4e9ef39b411b..3a07d2f9ef0a 100644 --- a/pkgs/development/python-modules/dash-html-components/default.nix +++ b/pkgs/development/python-modules/dash-html-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_html_components"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "166agkrl52j5qin2npsdl2a96jccxz5f1jvcz0hxsnjg0ix0k4l9"; + sha256 = "1fj5wlh6x9nngmz1rzb5xazc5pl34yrp4kf7a3zgy0dniap59yys"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix index d009ce192d7b..348deba7123b 100644 --- a/pkgs/development/python-modules/dash-renderer/default.nix +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.2.4"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1w6mpmvfj6nv5rdzikwc7wwhrgscbh50d0azzydhsa9jccxvkakl"; + sha256 = "07nyajjc3209ha2nbvk43sh5bnslwb2hs9wn8q5dpfngsc96wr9g"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index 3a0e0c401768..3ea04666249d 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.6.1"; + version = "4.6.2"; src = fetchPypi { inherit pname version; - sha256 = "0xwwkp7zsmrcnl3fswm5f319cxk7hk4dzacvfsarll2b47rmm434"; + sha256 = "1hn1yjz5ig2kzkk0wkr75q3l4lrfbnsh0kxzlld9sfn69d1vvsjw"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 72ae7104536d..83632ff6db68 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "0lqvcq7xaw5l1mwmgfdhr9jspq8jzkxf77862k0ca4d9zglkqp4z"; + sha256 = "18rrysfhmjfzb5b3n8fjbwk755p4slbb8fh9myq4qp76v00lfpnh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 204a14eb0da8..d08d0903886e 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.34.1"; + version = "0.35.0"; src = fetchPypi { inherit pname version; - sha256 = "1msi3wm0khmzh0ad7lwd5gigmqrxj25hd4w0qrsarihmd4ywrn1v"; + sha256 = "0qpy6mg9gfjxvjms0aaglzayhmdds4agv0lh05g2mkfw620nm8zl"; }; postPatch = '' diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 81b07eeacb43..13d105cae6bb 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -1,49 +1,52 @@ { lib , buildPythonPackage , fetchFromGitHub +, aiofiles , click , click-default-group +, janus , jinja2 , hupper , pint , pluggy -, pytest +, uvicorn +# Check Inputs +, pytestCheckHook , pytestrunner , pytest-asyncio , black , aiohttp , beautifulsoup4 -, uvicorn , asgiref -, aiofiles }: buildPythonPackage rec { pname = "datasette"; - version = "0.35"; + version = "0.39"; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; rev = version; - sha256 = "0v6af7agg27lapz1nbab07595v4hl2x5wm2f03drj81f7pm8y7hc"; + sha256 = "07d46512bc9sdan9lv39sf1bwlf7vf1bfhcsm825vk7sv7g9kczd"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ + aiofiles click click-default-group + janus jinja2 hupper pint pluggy uvicorn - aiofiles ]; checkInputs = [ - pytest + pytestCheckHook pytest-asyncio aiohttp beautifulsoup4 @@ -53,24 +56,32 @@ buildPythonPackage rec { postConfigure = '' substituteInPlace setup.py \ - --replace "click-default-group==1.2" "click-default-group" \ - --replace "Sanic==0.7.0" "Sanic" \ - --replace "hupper==1.0" "hupper" \ - --replace "pint~=0.8.1" "pint" \ - --replace "pluggy~=0.12.0" "pint" \ - --replace "Jinja2==2.10.1" "Jinja2" \ - --replace "uvicorn~=0.8.4" "uvicorn" + --replace "click~=7.1.1" "click" \ + --replace "click-default-group~=1.2.2" "click-default-group" \ + --replace "Jinja2~=2.10.3" "Jinja2" \ + --replace "hupper~=1.9" "hupper" \ + --replace "pint~=0.9" "pint" \ + --replace "pluggy~=0.13.0" "pint" \ + --replace "uvicorn~=0.11" "uvicorn" \ + --replace "aiofiles~=0.4.0" "aiofiles" \ + --replace "janus~=0.4.0" "janus" \ + --replace "PyYAML~=5.3" "PyYAML" ''; # many tests require network access # test_black fails on darwin - checkPhase = '' - pytest --ignore tests/test_api.py \ - --ignore tests/test_csv.py \ - --ignore tests/test_html.py \ - --ignore tests/test_black.py \ - -k 'not facet' - ''; + dontUseSetuptoolsCheck = true; + pytestFlagsArray = [ + "--ignore=tests/test_api.py" + "--ignore=tests/test_csv.py" + "--ignore=tests/test_html.py" + "--ignore=tests/test_docs.py" + "--ignore=tests/test_black.py" + ]; + disabledTests = [ + "facet" + "_invalid_database" # checks error message when connecting to invalid database + ]; meta = with lib; { description = "An instant JSON API for your SQLite databases"; diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix new file mode 100644 index 000000000000..f06e361dc716 --- /dev/null +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonAtLeast +, nose +, nibabel +, pydicom +}: + +buildPythonPackage rec { + pname = "dcmstack"; + version = "0.8"; + + disabled = pythonAtLeast "3.8"; + # https://github.com/moloney/dcmstack/issues/67 + + src = fetchFromGitHub { + owner = "moloney"; + repo = pname; + rev = "v${version}"; + sha256 = "1n24pp3rqz7ss1z6276fxynnppraxadbl3b9p8ijrcqnpzbzih7p"; + }; + + propagatedBuildInputs = [ nibabel pydicom ]; + + checkInputs = [ nose ]; + checkPhase = '' + runHook preCheck + nosetests + runHook postCheck + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/moloney/dcmstack"; + description = "DICOM to Nifti conversion preserving metadata"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index 9c49057398c9..5a09c42a9bbf 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib }: +{ stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }: buildPythonPackage rec { pname = "deap"; @@ -11,6 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy matplotlib ]; + checkInputs = [ nose ]; checkPhase = '' ${python.interpreter} setup.py nosetests --verbosity=3 ''; diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index e33382ffd01f..643556d8793e 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.7.12"; + version = "0.8.1"; src = fetchFromGitHub { owner = "scarface-4711"; repo = "denonavr"; rev = version; - sha256 = "1i7r0f8ldxpy9vkwjla6rfkaq37071d36zfhb1dwm9jgp6ggi34m"; + sha256 = "12g9w5674fmyf3f4plbhvpxpyhzw32pzwl0hvwswzrc2823xl6vx"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 2af9d020c955..6c338ce6dc28 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Deprecated"; - version = "1.2.7"; + version = "1.2.8"; src = fetchPypi { inherit pname version; - sha256 = "408038ab5fdeca67554e8f6742d1521cd3cd0ee0ff9d47f29318a4f4da31c308"; + sha256 = "029mr75wgah0z1ilsf3vf3dmjn65y4fy1jgq5qny2qsb9hvwbblw"; }; propagatedBuildInputs = [ wrapt ]; diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix index 2e205ce69557..218f843e11a8 100644 --- a/pkgs/development/python-modules/deskcon/default.nix +++ b/pkgs/development/python-modules/deskcon/default.nix @@ -7,7 +7,8 @@ }: buildPythonPackage { - name = "deskcon-0.3"; + pname = "deskcon"; + version = "0.3"; disabled = isPy3k; src = pkgs.fetchFromGitHub { diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix new file mode 100644 index 000000000000..939f0912fe1f --- /dev/null +++ b/pkgs/development/python-modules/dipy/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, packaging +, pytest +, cython +, numpy +, scipy +, h5py +, nibabel +}: + +buildPythonPackage rec { + pname = "dipy"; + version = "1.1.1"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "dipy"; + repo = pname; + rev = version; + sha256 = "08abx0f4li6ya62ilc59miw4mk6wndizahyylxhgcrpacb6ydw28"; + }; + + nativeBuildInputs = [ cython packaging ]; + propagatedBuildInputs = [ + numpy + scipy + h5py + nibabel + ]; + + checkInputs = [ pytest ]; + + # disable tests for now due to: + # - some tests require data download (see dipy/dipy/issues/2092); + # - running the tests manually causes a multiprocessing hang; + # - import weirdness when running the tests + doCheck = false; + + pythonImportsCheck = [ + "dipy" + "dipy.core" + "dipy.direction" + "dipy.tracking" + "dipy.reconst" + "dipy.io" + "dipy.viz" + "dipy.boots" + "dipy.data" + "dipy.utils" + "dipy.segment" + "dipy.sims" + "dipy.stats" + "dipy.denoise" + "dipy.workflows" + "dipy.nn" + ]; + + meta = with lib; { + homepage = "https://dipy.org/"; + description = "Diffusion imaging toolkit for Python"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 951593bac972..d85b4496e22a 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -3,7 +3,6 @@ , fetchPypi , pytest , pytest-repeat -, pytest-faulthandler , pytest-timeout , mock , joblib @@ -36,7 +35,7 @@ buildPythonPackage rec { sha256 = "d37a5c5be992f3b16db24b54d2801cbe370990fbc63089c6e7ef40d6f03cf5dd"; }; - checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; + checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh @@ -54,7 +53,7 @@ buildPythonPackage rec { meta = { description = "Distributed computation in Python."; - homepage = https://distributed.readthedocs.io/en/latest/; + homepage = "https://distributed.readthedocs.io/en/latest/"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; # fails on aarch64 maintainers = with lib.maintainers; [ teh costrouc ]; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index f0de263f1300..9f50a7ea22b9 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.1.0"; + version = "2.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5f48232c85ddfa33e3573153e6080526ac2eef5e7ec9cf42b5c4ba3c62afb96d"; + sha256 = "1j1fwinbkr4khn9i869r22jfdgw2kli0jqrz5shyd36jllsvrfzs"; }; propagatedBuildInputs = [ ldap django ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django authentication backend that authenticates against an LDAP service"; - homepage = https://github.com/django-auth-ldap/django-auth-ldap; + homepage = "https://github.com/django-auth-ldap/django-auth-ldap"; license = licenses.bsd2; maintainers = with maintainers; [ mmai ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 01ae357677b3..bcb39633f7ea 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "b05cf04b2c36916d15b78e24610002206529f1441e2632253a26b2db6bfd3b27"; + sha256 = "1vq5qa136h4rz4hjznnk6y8l443i41yh4w4wxg20f9b059xrsld1"; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django library for Mailman UIs"; - homepage = https://gitlab.com/mailman/django-mailman3; + homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3; maintainers = with maintainers; [ globin peti ]; }; diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index a4dcb57fe43e..3561f1d8c1cc 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-multiselectfield"; - version = "0.1.11"; + version = "0.1.12"; src = fetchPypi { inherit pname version; - sha256 = "043fa1aaddceb9b170c64c0745dc3a059165dcbc74946a434340778f63efa3c2"; + sha256 = "1ygra8s394d1szgj7yawlca17q08hygsrzvq2k3k48zvd0awg96h"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix deleted file mode 100644 index d575599cbe1d..000000000000 --- a/pkgs/development/python-modules/django/1_8.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchurl -}: - -buildPythonPackage rec { - pname = "Django"; - version = "1.8.19"; - - src = fetchurl { - url = "http://www.djangoproject.com/m/releases/1.8/${pname}-${version}.tar.gz"; - sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k"; - }; - - # too complicated to setup - doCheck = false; - - meta = with stdenv.lib; { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - license = licenses.bsd0; - knownVulnerabilities = [ - # The patches were not backported due to Django 1.8 having reached EOL - https://www.djangoproject.com/weblog/2018/aug/01/security-releases/ - https://www.djangoproject.com/weblog/2019/jan/04/security-releases/ - https://www.djangoproject.com/weblog/2019/feb/11/security-releases/ - https://www.djangoproject.com/weblog/2019/jun/03/security-releases/ - https://www.djangoproject.com/weblog/2019/jul/01/security-releases/ - ]; - }; - -} diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index 307496cc65ce..f7e620f491cb 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -7,6 +7,7 @@ , chardet , stevedore , restructuredtext_lint +, pygments }: buildPythonPackage rec { @@ -19,7 +20,14 @@ buildPythonPackage rec { }; buildInputs = [ pbr ]; - propagatedBuildInputs = [ docutils six chardet stevedore restructuredtext_lint ]; + propagatedBuildInputs = [ + docutils + six + chardet + stevedore + restructuredtext_lint + pygments + ]; doCheck = false; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 701a211a6bb4..a31ba7c69c03 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -18,9 +18,7 @@ buildPythonPackage rec { sha256 = "0bkj1xfp6mnvk1i9hl5awsmwi07q6iwwsjznd7kvrx5m19i6dbnx"; }; - nativeBuildInputs = [ - pytestCheckHook - ] ++ lib.optional isPy27 mock; + nativeBuildInputs = lib.optional isPy27 mock; propagatedBuildInputs = [ paramiko @@ -29,12 +27,15 @@ buildPythonPackage rec { websocket_client ] ++ lib.optional isPy27 backports_ssl_match_hostname; + checkInputs = [ + pytestCheckHook + ]; + pytestFlagsArray = [ "tests/unit" ]; # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket disabledTests = lib.optionals stdenv.isDarwin [ "stream_response" "socket_file" ]; - # skip setuptoolsCheckPhase - doCheck = false; + dontUseSetuptoolsCheck = true; meta = with lib; { description = "An API client for docker written in Python"; diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index ade485c91dc6..3ca9d59e27f0 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "9.4.0"; + version = "9.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0qid094qna6bl4zpd08f6snvipwjls1yadacvmwri11djgp0wvj3"; + sha256 = "0iz9hg1j7q9chka6fyzgpzqg2v4nbjx61xfvn9ixprxrdhvhr2hi"; }; # Set DROPBOX_TOKEN environment variable to a valid token. @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; - homepage = https://www.dropbox.com/developers/core/docs; + homepage = "https://www.dropbox.com/developers/core/docs"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix index fec5518f0e80..67537dd1f48b 100644 --- a/pkgs/development/python-modules/effect/default.nix +++ b/pkgs/development/python-modules/effect/default.nix @@ -1,33 +1,40 @@ { buildPythonPackage , fetchPypi , lib +, isPy3k , six , attrs , pytest , testtools }: + buildPythonPackage rec { version = "1.1.0"; pname = "effect"; + disabled = (!isPy3k); src = fetchPypi { inherit pname version; sha256 = "7affb603707c648b07b11781ebb793a4b9aee8acf1ac5764c3ed2112adf0c9ea"; }; + checkInputs = [ pytest testtools ]; + propagatedBuildInputs = [ six attrs ]; + checkPhase = '' pytest ''; + meta = with lib; { description = "Pure effects for Python"; - homepage = https://github.com/python-effect/effect; + homepage = "https://github.com/python-effect/effect"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 903e74e32786..c8b1a376f263 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.4.3"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "0dd5si2ml3srn8snp7x3y4xjamssmnp05h41aqazzd9ykwmhh919"; + sha256 = "18gqqdsrdlgwn93xnxy6ifxrk7ppaimijinflphxia2qcm8czkgf"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix index 4edf0f71cf20..47305d89540c 100644 --- a/pkgs/development/python-modules/etesync/default.nix +++ b/pkgs/development/python-modules/etesync/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "etesync"; - version = "0.10.0"; + version = "0.11.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "09sdqviv9jyd013gxjjcw6vd4si860304haylvw4dp9kljsd94qa"; + sha256 = "0yads0s84z41hf003qk5i8222fi7096whzwfp48kf369gchp39kc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index daec9218a1de..0ed9d42c3b0d 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchurl , uvicorn , starlette , pydantic @@ -12,11 +11,12 @@ , passlib , aiosqlite , peewee +, flask }: buildPythonPackage rec { pname = "fastapi"; - version = "0.49.0"; + version = "0.54.0"; format = "flit"; disabled = !isPy3k; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "1dw5f2xvn0fqqsy29ypba8v3444cy7dvc7gkpmnhshky0rmfni3n"; + sha256 = "17bicrpr801z71wrn9iimvh7qk6iwyxvr89ialf0s2rxxa2s0yb5"; }; propagatedBuildInputs = [ @@ -40,10 +40,16 @@ buildPythonPackage rec { passlib aiosqlite peewee + flask ]; + # test_default_response_class.py: requires orjson, which requires rust toolchain + # test_custom_response/test_tutorial001b.py: requires orjson + # tests/test_tutorial/test_sql_databases/test_testing_databases.py: just broken, don't know why checkPhase = '' - pytest --ignore=tests/test_default_response_class.py + pytest --ignore=tests/test_default_response_class.py \ + --ignore=tests/test_tutorial/test_custom_response/test_tutorial001b.py \ + --ignore=tests/test_tutorial/test_sql_databases/test_testing_databases.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix index d69c320ccaac..f1588690a774 100644 --- a/pkgs/development/python-modules/faulthandler/default.nix +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -1,18 +1,27 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "faulthandler"; - version = "3.1"; + version = "3.2"; src = fetchPypi { inherit pname version; - sha256 = "83301ffab03c86b291677b64b5cec7026f412cbda5ebd27e4cb3338452c40021"; + sha256 = "08ybjjdrfp01syckksxzivqhn6b0yhmc17kdxh77h0lg6rvgvk8y"; }; - meta = { + # This may be papering over a real failure where the env var activation route + # for faulthandler does not appear to work. That said, since all other tests + # pass and since this module is python 2 only (it was upstreamed into the + # interpreter itself as of python 3.3 and is disabled ) this just disables the + # test to fix the build. From inspecting Hydra logs and git bisect, the commit + # that broke it is this one: + # https://github.com/NixOS/nixpkgs/commit/90be4c2c7875c9487508d95b5c638d97e2903ada + patches = [ ./disable-env-test.patch ]; + + meta = with lib; { description = "Dump the Python traceback"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ sauyon ]; - homepage = https://faulthandler.readthedocs.io/; + license = licenses.bsd2; + maintainers = with maintainers; [ sauyon ]; + homepage = "https://faulthandler.readthedocs.io/"; }; } diff --git a/pkgs/development/python-modules/faulthandler/disable-env-test.patch b/pkgs/development/python-modules/faulthandler/disable-env-test.patch new file mode 100644 index 000000000000..5824652f6175 --- /dev/null +++ b/pkgs/development/python-modules/faulthandler/disable-env-test.patch @@ -0,0 +1,13 @@ +diff --git a/tests.py b/tests.py +index e5a2811..16e7a0f 100644 +--- a/tests.py ++++ b/tests.py +@@ -394,7 +394,7 @@ class FaultHandlerTests(unittest.TestCase): + print(faulthandler.is_enabled()) + """, + env=dict(os.environ, PYTHONFAULTHANDLER='x')) +- self.assertEqual(output, ["True"]) ++ #self.assertEqual(output, ["True"]) + self.assertEqual(exitcode, 0) + + output, exitcode = self.get_output(""" diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index 34f7ac4e4a93..40bbc688e205 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "17a3b885f19034da29640b083d767e0f13c2dcb5dcc267945c8b6e5a5a9013c7"; + sha256 = "10985zfx90m527binx3fxvm4nsqmlwf0jj8j8mpbxb8wj8ivkllr"; }; checkPhase = '' @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Infer file type and MIME type of any file/buffer"; - homepage = https://github.com/h2non/filetype.py; + homepage = "https://github.com/h2non/filetype.py"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index abc0853b4c71..cd4ed57d792c 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.13"; + version = "1.8.13.post1"; src = fetchPypi { inherit pname version; - sha256 = "5ec34898c8b983a723fb4e949dd3e0ed7e691c303e51f6bfd61e52ac9ac813ae"; + sha256 = "00366f2j21b5r4r8310sadf7jjhdr44s0381dhjqkw2nzpwjnhqs"; }; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 7fbf14cf7de0..76fda47c6a94 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -14,6 +14,8 @@ , gmsh , python , stdenv +, openssh +, fetchurl }: let @@ -21,12 +23,11 @@ let in buildPythonPackage rec { pname = "fipy"; - version = "3.3"; + version = "3.4.1"; - src = fetchPypi { - pname = "FiPy"; - inherit version; - sha256 = "11agpg3d6yrns8igkpml1mxy3mkqkjq2yrw1mw12y07dkk12ii19"; + src = fetchurl { + url = "https://github.com/usnistgov/fipy/releases/download/${version}/FiPy-${version}.tar.gz"; + sha256 = "0078yg96fknqhywn1v26ryc5z47c0j0c1qwz6p8wsjn0wmzggaqk"; }; propagatedBuildInputs = [ @@ -38,11 +39,13 @@ in mpi4py future scikit-fmm + openssh ] ++ lib.optionals isPy27 [ pysparse ] ++ not_darwin_inputs; checkInputs = not_darwin_inputs; checkPhase = '' + export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh ${python.interpreter} setup.py test --modules ''; diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 7af8d29fce73..0f0f0fd69ee7 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "fire"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "google"; repo = "python-fire"; rev = "v${version}"; - sha256 = "1r6cmihafd7mb6j3mvgk251my6ckb0sqqj1l2ny2azklv175b38a"; + sha256 = "1jwf1qv9xmr1c8nyvwqn02329vzyh9py4slx13n55ms8h1n998nr"; }; propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34; diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index c9cf3fe4ca84..0a60761b9433 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,30 +1,27 @@ -{ lib, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }: +{ lib, isPy27, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }: buildPythonPackage rec { pname = "flake8-future-import"; - version = "0.4.5"; + version = "0.4.6"; # PyPI tarball doesn't include the test suite src = fetchFromGitHub { owner = "xZise"; repo = "flake8-future-import"; rev = version; - sha256 = "00fpxa6g8cabybnciwnpsbg60zhgydc966jgwyyggw1pcg0frdqr"; + sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z"; }; - patches = [ - # Add Python 3.7 support. Remove with the next release - (fetchpatch { - url = https://github.com/xZise/flake8-future-import/commit/cace194a44d3b95c9c1ed96640bae49183acca04.patch; - sha256 = "17pkqnh035j5s5c53afs8bk49bq7lnmdwqp5k7izx7sw80z73p9r"; - }) - ]; - propagatedBuildInputs = [ flake8 six ]; - meta = { - homepage = https://github.com/xZise/flake8-future-import; + # Upstream disables this test case naturally on python 3, but it also fails + # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it + # on py2 as well. + patches = lib.optionals isPy27 [ ./skip-test.patch ]; + + meta = with lib; { description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base"; - license = lib.licenses.mit; + homepage = "https://github.com/xZise/flake8-future-import"; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/flake8-future-import/skip-test.patch b/pkgs/development/python-modules/flake8-future-import/skip-test.patch new file mode 100644 index 000000000000..300358f9158b --- /dev/null +++ b/pkgs/development/python-modules/flake8-future-import/skip-test.patch @@ -0,0 +1,13 @@ +diff --git a/test_flake8_future_import.py b/test_flake8_future_import.py +index 84fde59..345f23f 100644 +--- a/test_flake8_future_import.py ++++ b/test_flake8_future_import.py +@@ -230,7 +230,7 @@ class TestBadSyntax(TestCaseBase): + """Test using various bad syntax examples from Python's library.""" + + +-@unittest.skipIf(sys.version_info[:2] >= (3, 7), 'flake8 supports up to 3.6') ++@unittest.skip("Has issue with installed path for flake8 in python2") + class Flake8TestCase(TestCaseBase): + + """ diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 46841f68d60f..01bd180a5ae4 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "2.1.6"; + version = "2.3.0"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "a37d7d6a62407a2e0975af5305c795f2fb5c06ecc34e3cf64659d083b1b2dd5f"; + sha256 = "04bsswi7daaqda01a83rd1f2gq6asii520f9arjf7bsy24pmbprc"; }; checkInputs = [ @@ -60,12 +60,13 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace "jsonschema>=3.0.1<4" "jsonschema" \ - --replace "marshmallow>=2.18.0,<2.20" "marshmallow" \ - --replace "PyJWT>=1.7.1" "PyJWT" \ - --replace "Flask-SQLAlchemy>=2.4,<3" "Flask-SQLAlchemy" \ - --replace "Flask-JWT-Extended>=3.18,<4" "Flask-JWT-Extended" + substituteInPlace setup.py \ + --replace "apispec[yaml]>=1.1.1, <2" "apispec" \ + --replace "jsonschema>=3.0.1, <4" "jsonschema" \ + --replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \ + --replace "PyJWT>=1.7.1" "PyJWT" \ + --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \ + --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" ''; # majority of tests require network access or mongo @@ -73,8 +74,8 @@ buildPythonPackage rec { meta = with lib; { description = "Simple and rapid application development framework, built on top of Flask"; - homepage = https://github.com/dpgaspar/flask-appbuilder/; + homepage = "https://github.com/dpgaspar/flask-appbuilder/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index caaf0a61152b..307b670fa7f1 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Flask-Babel"; - version = "0.12.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii"; + sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix new file mode 100644 index 000000000000..d6912de6fe86 --- /dev/null +++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, flask +}: + +buildPythonPackage rec { + pname = "flask-reverse-proxy-fix"; + version = "0.2.1"; + + # master fixes flask import syntax and has no major changes + # new release requested: https://github.com/sublee/flask-silk/pull/6 + src = fetchFromGitHub { + owner = "antarctica"; + repo = "flask-reverse-proxy-fix"; + rev = "v${version}"; + sha256 = "1jbr67cmnryn0igv05qkvqjwrwj2rsajvvjnv3cdkm9bkgb4h5k5"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ + flask + ]; + + meta = with stdenv.lib; { + description = "Python Flask middleware for applications running under a reverse proxy"; + maintainers = with maintainers; [ matthiasbeyer ]; + homepage = "https://github.com/antarctica/flask-reverse-proxy-fix"; + + license = { + fullName = "Open Government Licence"; + url = "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"; + }; + }; +} diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix index d3a46143e6e5..db0a4377947e 100644 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ b/pkgs/development/python-modules/flaskbabel/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "Flask-Babel"; - version = "0.12.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86"; + sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn"; }; propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ]; meta = with stdenv.lib; { description = "Adds i18n/l10n support to Flask applications"; - homepage = https://github.com/mitsuhiko/flask-babel; + homepage = "https://github.com/mitsuhiko/flask-babel"; license = licenses.bsd0; maintainers = with maintainers; [ matejc ]; }; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 32e9e9393ce6..d8f1a52d465a 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -1,25 +1,38 @@ -{ stdenv, buildPythonPackage, fetchPypi, lxml, requests, tkinter }: +{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytest, requests }: buildPythonPackage rec { pname = "fritzconnection"; - version = "0.8.4"; + version = "1.2.1"; - src = fetchPypi { - inherit pname version; - sha256 = "adc629a48b50700f5478f69436e4b78c8792a9260cc674cccef15ffe68eb0643"; + src = fetchFromGitHub { + owner = "kbr"; + repo = pname; + rev = version; + hash = "sha256:17z4shs56ci9mxmilppv5xy9gbnbp6p1h2ms6x55nkvwndacrp7x"; }; + disabled = pythonOlder "3.5"; + + # Exclude test files from build, which cause ImportMismtachErrors and + # otherwise missing resources during tests. This patch can be dropped once + # https://github.com/kbr/fritzconnection/pull/39 is merged. prePatch = '' - substituteInPlace fritzconnection/test.py \ - --replace "from fritzconnection import" "from .fritzconnection import" + substituteInPlace setup.py \ + --replace 'find_packages()' 'find_packages(exclude=["*.tests"])' ''; - propagatedBuildInputs = [ lxml requests tkinter ]; + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; meta = with stdenv.lib; { description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol"; - homepage = https://bitbucket.org/kbr/fritzconnection; + homepage = "https://bitbucket.org/kbr/fritzconnection"; license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda valodim ]; }; } diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 1b8b8c17846d..7b633680b4ce 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -4,6 +4,7 @@ , fetchPypi , html5lib , wcwidth +, setuptools , pytest }: @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ html5lib wcwidth + setuptools ]; checkInputs = [ diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index d3d338a2c8d3..5e367644a1c8 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -13,10 +13,11 @@ buildPythonPackage rec { checkPhase = '' touch Makefile - # Disable tests that require network access or access /home + # Disable tests that require network access or access /home or assume execution before year 2020 py.test test \ -k "not test_public_servers and not test_real_ftp \ - and not test_set_parser and not test_repr" + and not test_set_parser and not test_repr \ + and not test_conditional_upload and not test_conditional_download_with_older_target" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix index 7a6aa659acec..372cdae8c233 100644 --- a/pkgs/development/python-modules/gateone/default.nix +++ b/pkgs/development/python-modules/gateone/default.nix @@ -8,7 +8,8 @@ }: buildPythonPackage { - name = "gateone-1.2-0d57c3"; + pname = "gateone"; + version = "1.2-0d57c3"; disabled = isPy3k; src = pkgs.fetchFromGitHub { diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 250942a84884..02d00461e26f 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.6.3"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1viq85fsb119w4lmxn2iacxf2w35b8cgzamlrb685z50pp1cdi2d"; + sha256 = "0lnmj9jky9pz227scmjxgvd8243higl24ndc0cc668mm36cnwapc"; }; propagatedBuildInputs = [ sqlalchemy shapely ]; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 45ae5fe00ded..348c32174a25 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0ggxa3av4rwva9h5idg1vfdybr7wkajw7g0sn42k04sxxa0cigwz"; + sha256 = "1fm0iqfbzd13m1lkd4h3ss4y9isp5cadd2w2k0qr3yqwfmrqqba2"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index d3f41880784d..2645c4efad80 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , attrs , audio-metadata +, importlib-metadata , marshmallow , pendulum , protobuf @@ -8,28 +9,34 @@ buildPythonPackage rec { pname = "google-music-proto"; - version = "2.5.1"; + version = "2.8.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "94cd205b3cb0d9e36f3724ace259d4c6de04db97e095577a26a5cfa5e35844c6"; + sha256 = "10qraipdr18pwnr1dz6ai5vxs9lmww5wbavbh1xyg4lsggmlsrqb"; }; + postPatch = '' + sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py + ''; + propagatedBuildInputs = [ attrs audio-metadata marshmallow pendulum protobuf + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; # No tests doCheck = false; - - disabled = pythonOlder "3.6"; + pythonImportsCheck = [ "google_music_proto" ]; meta = with lib; { - homepage = https://github.com/thebigmunch/google-music-proto; + homepage = "https://github.com/thebigmunch/google-music-proto"; description = "Sans-I/O wrapper of Google Music API calls"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index 0a3f145f131d..f9ff76cf94ca 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -2,6 +2,7 @@ , appdirs , audio-metadata , google-music-proto +, httpx , protobuf , requests_oauthlib , tenacity @@ -9,22 +10,23 @@ buildPythonPackage rec { pname = "google-music"; - version = "3.2.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "15d543ab31c981bcb9bfb10f588159848ef570fafb6b9d1347f1429a9b1f531a"; + sha256 = "1agqsbnn72gx88sk736k1pzdn2j8fi7flwqhj5g2qhz3wvkx90yq"; }; postPatch = '' substituteInPlace setup.py \ - --replace "audio-metadata>=0.3,<0.4" "audio-metadata" + --replace "audio-metadata>=0.8,<0.9" "audio-metadata" ''; propagatedBuildInputs = [ appdirs audio-metadata google-music-proto + httpx protobuf requests_oauthlib tenacity diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index e069c8f8c7b6..2197cfd9d0f7 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook +{ fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook , pkg-config, boost, expat, scipy, cgal, gmp, mpfr , gobject-introspection, pygobject3, gtk3, matplotlib, ncurses , buildPythonPackage @@ -10,18 +10,11 @@ buildPythonPackage rec { pname = "graph-tool"; format = "other"; - version = "2.29"; - - meta = with stdenv.lib; { - description = "Python module for manipulation and statistical analysis of graphs"; - homepage = https://graph-tool.skewed.de/; - license = licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.joelmo ]; - }; + version = "2.31"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "0ykzcnqc5bhqb4xlf9ahpp807vj5868xdrmcj6fggqnnpqv4633c"; + sha256 = "0z6n9xkb5yz7z6rlwl6z9gq3ac5vdsby90nhvvvskadsx2pagd7v"; }; configureFlags = [ @@ -55,4 +48,11 @@ buildPythonPackage rec { ]; enableParallelBuilding = false; + + meta = with lib; { + description = "Python module for manipulation and statistical analysis of graphs"; + homepage = "https://graph-tool.skewed.de/"; + license = licenses.gpl3; + maintainers = [ maintainers.joelmo ]; + }; } diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 88e3118d4561..9499a9a6fe2c 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,52 +1,35 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, which +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir }: -if django.version != "1.8.19" -|| django_tagging.version != "0.4.3" -then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3" -else buildPythonPackage rec { +buildPythonPackage rec { pname = "graphite-web"; version = "1.1.6"; - disabled = isPy3k; - src = fetchPypi { inherit pname version; sha256 = "f4c293008ad588456397cd125cdad7f47f4bab5b6dd82b5fb69f5467e7346a2a"; }; + patches = [ + ./update-django-tagging.patch + ]; + propagatedBuildInputs = [ django django_tagging whisper pycairo cairocffi ldap memcached pytz urllib3 scandir ]; - postInstall = '' - wrapProgram $out/bin/run-graphite-devel-server.py \ - --prefix PATH : ${which}/bin - ''; + # Carbon-s default installation is /opt/graphite. This env variable ensures + # carbon is installed as a regular python module. + GRAPHITE_NO_PREFIX="True"; preConfigure = '' - # graphite is configured by storing a local_settings.py file inside the - # graphite python package. Since that package is stored in the immutable - # Nix store we can't modify it. So how do we configure graphite? - # - # First of all we rename "graphite.local_settings" to - # "graphite_local_settings" so that the settings are not looked up in the - # graphite package anymore. Secondly we place a directory containing a - # graphite_local_settings.py on the PYTHONPATH in the graphite module - # <nixpkgs/nixos/modules/services/monitoring/graphite.nix>. - substituteInPlace webapp/graphite/settings.py \ - --replace "graphite.local_settings" " graphite_local_settings" - substituteInPlace webapp/graphite/settings.py \ --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" ''; - # error: invalid command 'test' - doCheck = false; - meta = with stdenv.lib; { - homepage = http://graphite.wikidot.com/; + homepage = "http://graphiteapp.org/"; description = "Enterprise scalable realtime graphing"; maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; diff --git a/pkgs/development/python-modules/graphite-web/update-django-tagging.patch b/pkgs/development/python-modules/graphite-web/update-django-tagging.patch new file mode 100644 index 000000000000..48d16d50f420 --- /dev/null +++ b/pkgs/development/python-modules/graphite-web/update-django-tagging.patch @@ -0,0 +1,12 @@ +diff -Nur a/setup.py b/setup.py +--- a/setup.py 2020-03-12 18:45:34.654296302 +0100 ++++ b/setup.py 2020-03-12 18:46:17.476893828 +0100 +@@ -115,7 +115,7 @@ + ['templates/*', 'local_settings.py.example']}, + scripts=glob('bin/*'), + data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, +- install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], ++ install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.6', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], + classifiers=[ + 'Intended Audience :: Developers', + 'Natural Language :: English', diff --git a/pkgs/development/python-modules/graphitepager/default.nix b/pkgs/development/python-modules/graphitepager/default.nix deleted file mode 100644 index d2ab8d547fdb..000000000000 --- a/pkgs/development/python-modules/graphitepager/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi -, jinja2, markupsafe, pagerduty, pushbullet, python_magic, python-simple-hipchat -, pyyaml, redis, requests, six, websocket_client, nose -}: -buildPythonPackage rec { - pname = "graphitepager"; - version = "0.2.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "0v3g1qcgnkpgjzh6phnv13lnk8qjrcs9sq2qg6k0dk5ik31jfk3d"; - }; - - propagatedBuildInputs = [ - jinja2 markupsafe pagerduty pushbullet python_magic python-simple-hipchat - pyyaml redis requests six websocket_client - ]; - - postPatch = '' - substituteInPlace requirements.txt --replace "==" ">=" - ''; - - checkInputs = [ nose ]; - checkPhase = "nosetests"; - - meta = with stdenv.lib; { - description = "A simple alerting application for Graphite metrics"; - homepage = https://github.com/seatgeek/graphite-pager; - maintainers = with maintainers; [ offline basvandijk ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/python-modules/graspy/default.nix b/pkgs/development/python-modules/graspy/default.nix new file mode 100644 index 000000000000..2a7fab12fa21 --- /dev/null +++ b/pkgs/development/python-modules/graspy/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytest +, pytestcov +, matplotlib +, networkx +, numpy +, scikitlearn +, scipy +, seaborn +}: + +buildPythonPackage rec { + pname = "graspy"; + version = "0.2"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "neurodata"; + repo = pname; + rev = "v${version}"; + sha256 = "1ss7d71lwblimg7ri88ir9w59j0ri13wl75091hjf7q0mchqr6yd"; + }; + + propagatedBuildInputs = [ + matplotlib + networkx + numpy + scikitlearn + scipy + seaborn + ]; + + checkInputs = [ pytest pytestcov ]; + + checkPhase = '' + runHook preCheck + # `test_autogmm` takes too long; fixed in next release (graspy/pull/328) + pytest tests -k 'not test_autogmm' + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://graspy.neurodata.io"; + description = "A package for graph statistical algorithms"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index fcfccf29efd8..f3eb93cd0605 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.27.1"; + version = "1.28.1"; src = fetchPypi { inherit pname version; - sha256 = "e29aa3f7a47d37f8a15605e97bec580baa6bb7ead7114b8d2f20d7b28da30c5c"; + sha256 = "adf089aaf6e21358b12e39d9fa7c28611340d8399a918c0b72ff122ce9b7e0af"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index a26b02ee0300..405dd7374fcc 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,52 +1,42 @@ -{ buildPythonPackage, fetchurl, meson, ninja, stdenv, pkgconfig, python, pygobject3 -, gobject-introspection, gst-plugins-base, isPy3k +{ buildPythonPackage +, fetchurl +, meson +, ninja +, stdenv +, pkgconfig +, python +, pygobject3 +, gobject-introspection +, gst-plugins-base +, isPy3k }: -let +buildPythonPackage rec { pname = "gst-python"; - version = "1.14.4"; - name = "${pname}-${version}"; -in buildPythonPackage rec { - inherit pname version; + version = "1.16.2"; + format = "other"; outputs = [ "out" "dev" ]; src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-python/${name}.tar.xz" - "mirror://gentoo/distfiles/${name}.tar.xz" - ]; - sha256 = "06ssx19fs6pg4d32p9ph9w4f0xwmxaw2dxfj17rqkn5njd7v5zfh"; + url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; + sha256 = "II3zFI1z2fQW0BZWRzdYXY6nY9kSAXMtRLX+aIxiiKg="; }; - patches = [ - # Meson build does not support Python 2 at the moment - # https://bugzilla.gnome.org/show_bug.cgi?id=796092 - (fetchurl { - name = "0002-meson-use-new-python-module.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=371989; - sha256 = "1k46nvw175c1wvkqnx783i9d4w9vn431spcl48jb3y224jj3va08"; - }) - # Fixes `from gi.repository import Gst` when gst-python's site-package is in - # PYTHONPATH - (fetchurl { - url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/d64bbc1e0c3c948c148f505cc5f856ce56732880.diff; - sha256 = "1n9pxmcl1x491mp47avpcw2a6n71lm0haz6mfas168prkgsk8q3r"; - }) - # Fixes python2 build from the above changes - (fetchurl { - url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/f79ac2d1434d7ba9717f3e943cfdc76e121eb5dd.diff; - sha256 = "17a164b0v36g0kwiqdlkjx6g0pjhcs6ilizck7iky8bgjnmiypm1"; - }) + nativeBuildInputs = [ + meson + ninja + pkgconfig + python + gobject-introspection + gst-plugins-base ]; - # TODO: First python_dep in meson.build needs to be removed - postPatch = '' - substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"} - ''; - - nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection gst-plugins-base ]; + propagatedBuildInputs = [ + gst-plugins-base + pygobject3 + ]; mesonFlags = [ "-Dpython=python${if isPy3k then "3" else "2"}" @@ -59,10 +49,8 @@ in buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/47390 installCheckPhase = "meson test --print-errorlogs"; - propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; - meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Python bindings for GStreamer"; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 87a4a21568c8..e13cae339601 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -1,14 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, acme, aiohttp, snitun, attrs, pytest-aiohttp, warrant, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch +, acme, aiohttp, snitun, attrs, pycognito, warrant +, pytest-aiohttp, asynctest, pytest }: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.31"; + version = "0.32.2"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "0hxdvdj41gq5ryafjhrcgf6y8l33lyf45a1vgwwbk0q29sir9bnr"; + sha256 = "1hfi5q222kgbgrj5yvr4lbhca49hcs6sc2yhxc4pjxqsc12bv1f1"; }; # upstreamed in https://github.com/NabuCasa/hass-nabucasa/pull/119 @@ -17,13 +19,13 @@ buildPythonPackage rec { cat setup.py ''; - propagatedBuildInputs = [ acme aiohttp snitun attrs warrant ]; + propagatedBuildInputs = [ acme aiohttp snitun attrs warrant pycognito ]; - checkInputs = [ pytest pytest-aiohttp ]; + checkInputs = [ pytest pytest-aiohttp asynctest ]; checkPhase = '' pytest tests/ - ''; + ''; meta = with lib; { homepage = "https://github.com/NabuCasa/hass-nabucasa"; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 7351b2742100..f95f6e9443f2 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.24"; + version = "0.8.25"; src = fetchPypi { inherit pname version; - sha256 = "fe31a7ea0ce2c9babd190a195e491834ff9f64c74daa4ca94fa65a88f701269a"; + sha256 = "17mi4nlifaygfw3n5ark5mfzx71pjxz3h6l455sh0i5mzh6czk4j"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index b2857eb24579..5aabc20ebd96 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "9.2.2"; + version = "9.3.0"; src = fetchPypi { inherit pname version; - sha256 = "08bjrgxv8zrrz5xxydzkjl4a8cw3g62nmzfnvdzxxcrf1c96qw76"; + sha256 = "1jqlckibf7wwrg7syx6mzqz6zsipmsl474rfpmin6j6axh4cdpn7"; }; doCheck = false; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index a4b7fb3a6520..6f2bf5d511d5 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.2.29"; + version = "2020.3.31"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "1s6f9sdr5l9dqri92s8qr7r1nyvai3vnpcaw06293kc8dribi0m2"; + sha256 = "12hncxzawvdsrssl350xxn1byfm1firgd3ziqfll4xhhw403jaa9"; }; # tests require network connection diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index c40f3453d6b9..719a6a966c64 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.15.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "a5f914f18f99cb9541660454a159e3b3c63241fc3ab60005bb88d97cc7a4fb58"; + sha256 = "0qc2vn98a4icp3h04pdhiykddz5q6wfi905f19zfxl26kyjd15ny"; }; # Needs setting up diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 04a0592d7506..56f5e144794f 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -16,18 +16,19 @@ , uvicorn , trio , brotli +, urllib3 }: buildPythonPackage rec { pname = "httpx"; - version = "0.9.5"; + version = "0.12.1"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "140z2j7b5hlcxvfb433hqv5b8irqa88hpq33lzr9m992djbhj2hb"; + sha256 = "1nrp4h1ppb5vll81fzxmks82p0hxcil9f3mja3dgya511kc703h6"; }; propagatedBuildInputs = [ @@ -39,6 +40,7 @@ buildPythonPackage rec { idna rfc3986 sniffio + urllib3 ]; checkInputs = [ diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix deleted file mode 100644 index dcf39dd24f02..000000000000 --- a/pkgs/development/python-modules/ibmquantumexperience/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, requests -, requests_ntlm -}: - -buildPythonPackage rec { - pname = "IBMQuantumExperience"; - version = "2.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "0szn743sbm3cs80982cf4994c1xcg6iz5xkhdbpm1kfv5qn1phja"; - }; - - propagatedBuildInputs = [ - requests - requests_ntlm - ]; - - # test requires an API token - doCheck = false; - - meta = { - description = "A Python library for the Quantum Experience API"; - homepage = https://github.com/QISKit/qiskit-api-py; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - pandaman - ]; - }; -} diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 1d445f83b082..1418c925ebf8 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.4"; + version = "4.0.5"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "16gjvqv0n05jrb9g228pdjgzd3amz2pdhvcgsn1jypszjg5m2w9l"; + sha256 = "14ynjj65kfmlcvpb7k097w789wvxncd3cr3xz5m1jz9yl9v6vv5q"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 7102995cdf24..c0858605bd72 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.11"; + version = "1.4.13"; src = fetchPypi { inherit pname version; - sha256 = "15kbcgqz6zf9qqvyw3pwy611knv1lyaqmc213ivmqciq3zifn96q"; + sha256 = "12adarxndb9f5kgbfch9644h86jhbf6vc1d5c5iiqnjqws9n495b"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 5de9e25bcf1f..4b234cc11ac8 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.13.0"; + version = "0.13.2"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "0nbs9m2pqg4j10m7c31vyb8h7wy29d9s8kiv0k2igbr821k1y3xr"; + sha256 = "0jcd849rx30y3wcgzsqbn06v0yjlzvb9x3076q0yxpycdwm1ryvp"; }; propagatedBuildInputs = [ ipython ]; diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index ef023727d70e..0c5da2cd7a9d 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.3.3"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0m5sh2ha9hlgigc5xxsy7nd0gdadx797h1i66i9z616p0r43gx7d"; + sha256 = "1sak58wcpikn4ww1k8gr2vf1hmwzfly31hzcnwiizp7l0vk40qh7"; }; propagatedBuildInputs = [ ipywidgets matplotlib ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Matplotlib Jupyter Extension"; - homepage = https://github.com/matplotlib/jupyter-matplotlib; + homepage = "https://github.com/matplotlib/jupyter-matplotlib"; maintainers = with maintainers; [ jluttine ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix new file mode 100644 index 000000000000..2b03fd368d92 --- /dev/null +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -0,0 +1,31 @@ +{ lib +, isPy27 +, buildPythonPackage +, fetchPypi + # Python Inputs +, ipywidgets +}: + +buildPythonPackage rec { + pname = "ipyvue"; + version = "1.3.1"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "01kp7d8iyz04d0m4njhv8rg72daqmgd93bdljwyffzxg71pwq92a"; + }; + + propagatedBuildInputs = [ ipywidgets ]; + + doCheck = false; # No tests in package or GitHub + pythonImportsCheck = [ "ipyvue" ]; + + meta = with lib; { + description = "Jupyter widgets base for Vue libraries."; + homepage = "https://github.com/mariobuikhuizen/ipyvuetify"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix new file mode 100644 index 000000000000..dc9df34c0d01 --- /dev/null +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi + # Python Inputs +, ipyvue +}: + +buildPythonPackage rec { + pname = "ipyvuetify"; + version = "1.2.2"; + + # GitHub version tries to run npm (Node JS) + src = fetchPypi { + inherit pname version; + sha256 = "0vg3sdkdhba917xs6gyzwpp10gi2gszihf45cw2llwsfgb7kpfw8"; + }; + + propagatedBuildInputs = [ ipyvue ]; + + doCheck = false; # no tests on PyPi/GitHub + pythonImportsCheck = [ "ipyvuetify" ]; + + meta = with lib; { + description = "Jupyter widgets based on Vuetify UI Components."; + homepage = "https://github.com/mariobuikhuizen/ipyvuetify"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index af12ba587d44..6b238163cb55 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.9.10"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1a389556cc5cf82b7ad95924710101e3bd06d809d6f889a3f437975b275af944"; + sha256 = "1p7iaa6ykvhalpv09svxs50hnp25j5nv1zzp42n5r7a7rw70wlf8"; }; checkInputs = [ @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; - homepage = https://github.com/xlcnd/isbnlib; + homepage = "https://github.com/xlcnd/isbnlib"; license = licenses.lgpl3; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index 98725ca4767e..b2b80e2766c7 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -1,9 +1,9 @@ { stdenv , buildPythonPackage , fetchPypi -, nose , jinja2 , pyyaml +, setuptools }: buildPythonPackage rec { @@ -15,8 +15,8 @@ buildPythonPackage rec { sha256 = "6f6f643b3fa5c0f72fbe9f07e246f8e138052b9f689e14c7c64d582c59709ae4"; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ jinja2 pyyaml ]; + doCheck = false; # tests aren't installed thus aren't found, so skip + propagatedBuildInputs = [ jinja2 pyyaml setuptools ]; meta = with stdenv.lib; { homepage = "https://github.com/kolypto/j2cli"; diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index 8e5458509c43..c9ce6915d2ec 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,12 +1,13 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, six, more-itertools }: +{ buildPythonPackage, fetchPypi, isPy27, setuptools_scm, six, more-itertools }: buildPythonPackage rec { pname = "jaraco.classes"; - version = "3.0.0"; + version = "3.1.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "886ad165d495e7d18781142d6dda4f0045053a038f9e63c38ef03e2f7127bafc"; + sha256 = "1avsxzm5mwylmy2zbxq3xvn48z5djb0qy3hwv4ryncprivzri1n3"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 0c4d2062901d..9ade29bece1b 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jc"; - version = "1.9.2"; + version = "1.9.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1zn6skiv5nm7g8cs86n152ni79ck538bwdjynlh8n2k9dvfd5i8l"; + sha256 = "1hg6h3ag4pbilpmqylnj7dflz7avk3w8ngmk6psfqrizizwx0hnj"; }; propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ]; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 4c77a07da02e..b30d2ee7e0fd 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.10.2"; + version = "1.10.3"; propagatedBuildInputs = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "a5ce5195c0b54a68eb813649829143373823ca28caa4d7aa682442b87ebea1ce"; + sha256 = "0aaxi56qm2wmccsdj4v1lc158625c2g6ikqq950yv43i0pyyi3lp"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index c0c2fe2a8ee5..df5216bdd1a6 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f1aaca95db795d6a9f7bba52ff83c7fd4139050d0df93ee3a5a448adcfa0c0ac"; + sha256 = "029gxp6f06gmba7glxfdz5xfhs5kkqph7x78k38qqvdrmca4z450"; }; nativeBuildInputs = [ pep8 ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A JSON-RPC websocket client library for asyncio"; - homepage = https://github.com/armills/jsonrpc-websocket; + homepage = "https://github.com/armills/jsonrpc-websocket"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 3faa0a2edc39..d3b67ba87bc0 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.0.0"; + version = "2.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "17p8rpihid0103fyjndk2yvg18n3ypn3hxay92ckcv10vsbiys5b"; + sha256 = "10fwpgsi996nk2hcva14k8x6znczxgfmydvfsfrs1fpmmfmrl8wc"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 9a5261694897..db9fd195ae52 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "1.0.7"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1qnqxy6812py7xklg7xfrkadm0v4z8x6n1035i26h2z7y891ff0j"; + sha256 = "0cqpyy4jr3023c47ij08djkpx526gmz8fab45mcnws0glhp7xhms"; }; checkInputs = [ requests pytest ]; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index a77a1a576b47..8b2d56277cef 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.3.4"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0jijf4a3iaskzi6frjwhd8drh7brn94r1zl7gni6d0dzr296mm93"; + sha256 = "126lmz702hbk7gyr4i6gkicmycx7zgsgjf47a6izq2d17bs0a9ji"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index ddf6cabcae94..41c165480320 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.8.2"; + version = "0.8.5"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1i585q27qlwk4rpgsh621s60im1j9ynwyz5pcc8s3ffmjam28vss"; + sha256 = "1rfybmr0rlljhc0dpd9npbw8x7r6dvnn2wvclz93rmgkzhmd3zah"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix new file mode 100644 index 000000000000..ef5da737e08c --- /dev/null +++ b/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: + +buildPythonPackage rec { + pname = "libvirt"; + version = "5.9.0"; + + src = fetchgit { + url = git://libvirt.org/libvirt-python.git; + rev = "v${version}"; + sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt lxml ]; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = http://www.libvirt.org/; + description = "libvirt Python bindings"; + license = licenses.lgpl2; + maintainers = [ maintainers.fpletz ]; + }; +} diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index f4a07b9635f0..a7c620d8d87c 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libvirt"; - version = "5.4.0"; + version = "6.2.0"; src = assert version == libvirt.version; fetchgit { url = git://libvirt.org/libvirt-python.git; rev = "v${version}"; - sha256 = "0ja35z90i3m7vsjfpzfm7awkmja3h0150376i5pzmf2q8vp61fi5"; + sha256 = "0a8crk29rmnw1kcgi72crb7syacdk03lkl05yand5cxs0l65jwdl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index 9784d3af61f6..dbbe3d252125 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.6.3"; + version = "0.6.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "161g3s3nwbkn3s101g8l4axll0kk8xxahxnvjrjdg2cghcjq9n8n"; + sha256 = "1w1f0kmiwslg1dxn7gq0ak8f5wajlwl03r5zklshjc11j34b4d5i"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for interacting with luftdaten.info"; - homepage = https://github.com/fabaff/python-luftdaten; + homepage = "https://github.com/fabaff/python-luftdaten"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 5db5c28a4cb5..9e73001a1499 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -23,18 +23,18 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.11.2"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf"; + sha256 = "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv"; }; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ]; checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ]; - postPatch = '' + postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Securely transfer data between computers"; - homepage = https://github.com/warner/magic-wormhole; + homepage = "https://github.com/warner/magic-wormhole"; license = licenses.mit; # Currently broken on Python 2.7. See # https://github.com/NixOS/nixpkgs/issues/71826 diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index cb0b9e9e60d2..3b18c10cbc31 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "marshmallow-polyfield"; - version = "5.7"; + version = "5.9"; src = fetchFromGitHub { owner = "Bachmann1234"; @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ marshmallow ]; - + # setuptools check can run, but won't find tests checkInputs = [ pytestCheckHook pytestcov ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index beca4fed17db..658388eabae4 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver + [ cycler dateutil numpy pyparsing tornado freetype kiwisolver libpng mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index d7a821915f20..ffdf97475837 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "mayavi"; - version = "4.7.0"; + version = "4.7.1"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "02rg4j1vkny2piqn3f728kg34m54kgx396g6h5y7ykz2lk3f3h44"; + sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy"; }; # Discovery of 'vtk' in setuptools is not working properly, due to a missing @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "3D visualization of scientific data in Python"; - homepage = https://github.com/enthought/mayavi; + homepage = "https://github.com/enthought/mayavi"; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 3a65ef1028af..a324c8d7d08f 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "minidb"; - version = "2.0.2"; + version = "2.0.3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "thp"; repo = "minidb"; rev = version; - sha256 = "14y5vf8vhgviczhzy9h3xv99fjvrg975nz4w1fj5c1jv37da1lq3"; + sha256 = "0c6y3x957pc5sxkl34lymhkwpn4nlsfw07fcv4y9p2zdb7kjd1gc"; }; # module imports are incompatible with python2 diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index ad3f30a66daa..c8531299620e 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.1.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "v${version}"; - sha256 = "1bnpgx629rxqf0yhn0jn68ypj3dqv6njc3981j1g8j8rsm5lycrn"; + sha256 = "1b4dkkl439rfaa86ywzc2zf9ifawhvdlaiqcg0il83cn5bzs7g5z"; }; MKLROOT = mkl; diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index a3c93978ff6a..b4aee8c61cf7 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "moderngl_window"; - version = "1.2.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; rev = version; - sha256 = "054w77lyc2nc0dyx76zsrbq2b3xbywdijhb62b2qqm99ldr1k1x5"; + sha256 = "1p03j91pk2bwycd13p0qi8kns1sf357180hd2mkaip8mfaf33x3q"; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr ]; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 427f0af45730..fb84847acff7 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -29,6 +29,13 @@ buildPythonPackage rec { checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo]; propagatedBuildInputs = [ six ruamel_yaml ]; + # test suite tries to decode bytes, but msgpack now returns a str + # https://github.com/materialsvirtuallab/monty/pull/121 + postPatch = '' + substituteInPlace tests/test_serialization.py \ + --replace ".decode('utf-8')" "" + ''; + preCheck = '' substituteInPlace tests/test_os.py \ --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' diff --git a/pkgs/development/python-modules/morphys/default.nix b/pkgs/development/python-modules/morphys/default.nix new file mode 100644 index 000000000000..8f8525f7afe9 --- /dev/null +++ b/pkgs/development/python-modules/morphys/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +}: +buildPythonPackage rec { + pname = "morphys"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "mkalinski"; + repo = "morphys"; + rev = "0642a71126c32cd26b3a443a5cac27e4e1f7240f"; + sha256 = "1da8s04m5wwih9cvkrks3ymb8v082lia47f274hxmfhi6ma3qc8b"; + }; + + pythonImportsCheck = [ "morphys" ]; + + meta = with lib; { + description = "Smart conversions between unicode and bytes types"; + homepage = "https://github.com/mkalinski/morphys"; + license = licenses.mit; + maintainers = with maintainers; [ rakesh4g ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 7e9215f33933..2daabf22d9e7 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -25,13 +25,13 @@ assert advancedProcessing -> ( buildPythonPackage rec { pname = "moviepy"; - version = "1.0.1"; + version = "1.0.2"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "1vgi9k1r4f5s9hzfzlhmmc574n80aq713ahv8cnbj3jci070lnwx"; + sha256 = "0ajw2xmcd962qw2kxxnbp08l5vgk5k78sls9bb227lw8aa51ln80"; }; # No tests, require network connection @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Video editing with Python"; - homepage = http://zulko.github.io/moviepy/; + homepage = "https://zulko.github.io/moviepy/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 0d5d8d75a368..5dd34fef112f 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -6,7 +6,8 @@ }: buildPythonPackage { - name = "mutag-0.0.2-2ffa0258ca"; + pname = "mutag"; + version = "0.0.2-2ffa0258ca"; disabled = ! isPy3k; src = fetchgit { diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 954e913c9cf0..5cc192313acd 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.16"; + version = "1.20"; src = fetchPypi { inherit pname version; - sha256 = "72ab724299aebd930b88476f6545587bff5bf480697c016097bd188841a56276"; + sha256 = "03j2i9vhpdxbvwlqg6zghlzzq46s1x2jbx20fwninb6kss0ps3rg"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 90b00ba17179..bcd0ab4a6c62 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.761"; + version = "0.770"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1gw7h84d21wmi267kmgqs9whz0l7rp62pzja2f31wq7cfj6spfl5"; + sha256 = "1bm40nx9g1n4nj1309cijnh0ns4qbhym3agyl537nc4vxw3paqla"; }; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index f641c017384b..7e774eed2962 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "nbdime"; - version = "1.1.0"; + version = "2.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0qfy7nmlg75vryvrlgd6p0rqrvcclq8n9kd0n4xv5959s9sjy0w0"; + sha256 = "0pbi22mc5al29pvsw7bhai2d58i8n77gv09r7avr1wap6ni7jvw9"; }; checkInputs = [ @@ -61,7 +61,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/jupyter/nbdime; + homepage = "https://github.com/jupyter/nbdime"; description = "Tools for diffing and merging of Jupyter notebooks."; license = licenses.bsd3; maintainers = with maintainers; [ tbenst ]; diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index dbbbc04d1413..1934317a1120 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,16 +5,16 @@ }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.3.2"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "1cbd885n3sf4qg1dv3mk1ggr5ssk48yzrzssznr92dh53g04ly7g"; + sha256 = "0l43k0lx7r6izancfhhg68x82mvws2di1a9w2y12l1a446vr9q8l"; }; - # tests not packaged with source dist as of 1.3.0/1.3.0, and + # tests not packaged with source dist as of 1.3.2/1.3.2, and # can't check tests out of GitHub easily without specific commit IDs (no tagged releases) doCheck = false; pythonImportsCheck = [ "nest_asyncio" ]; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 3a907bc8ca02..751cc1395483 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://nipy.org/nibabel/; + homepage = "https://nipy.org/nibabel"; description = "Access a multitude of neuroimaging data formats"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index a379f236f3f0..1e58aee503b2 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest +{ stdenv, buildPythonPackage, fetchPypi, pytest, nose , nibabel, numpy, pandas, scikitlearn, scipy, matplotlib, joblib }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { pytest nilearn/tests -k 'not test_cache_mixin_with_expand_user' # accesses ~/ ''; - checkInputs = [ pytest ]; + checkInputs = [ pytest nose ]; propagatedBuildInputs = [ joblib @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = http://nilearn.github.io; + homepage = "http://nilearn.github.io"; description = "A module for statistical learning on neuroimaging data"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index 5b8c1e5185da..fef24e837d1b 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://nipy.org/nipy/; + homepage = "https://nipy.org/nipy"; description = "Software for structural and functional neuroimaging analysis"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 5944e4d863f6..436c9fe63794 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -106,7 +106,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://nipy.org/nipype/; + homepage = "https://nipy.org/nipype/"; description = "Neuroimaging in Python: Pipelines and Interfaces"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index b61c3d92bc9f..8fa40465c10d 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { checkPhase = "pytest nitime/tests"; meta = with lib; { - homepage = https://nipy.org/nitime; + homepage = "https://nipy.org/nitime"; description = "Algorithms and containers for time-series analysis in time and spectral domains"; license = licenses.bsd3; maintainers = [ maintainers.bcdarwin ]; diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index 567977a84f54..5d5a85b6fdd8 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -1,20 +1,18 @@ { stdenv , buildPythonPackage -, pkgs +, notmuch , python }: buildPythonPackage { - name = "python-${pkgs.notmuch.name}"; + inherit (notmuch) pname version src; - src = pkgs.notmuch.src; + sourceRoot = notmuch.pythonSourceRoot; - sourceRoot = pkgs.notmuch.pythonSourceRoot; - - buildInputs = [ python pkgs.notmuch ]; + buildInputs = [ python notmuch ]; postPatch = '' - sed -i -e '/CDLL/s@"libnotmuch\.@"${pkgs.notmuch}/lib/libnotmuch.@' \ + sed -i -e '/CDLL/s@"libnotmuch\.@"${notmuch}/lib/libnotmuch.@' \ notmuch/globals.py ''; diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix index e4bbe0fb4302..14900d5c55db 100644 --- a/pkgs/development/python-modules/ntlm-auth/default.nix +++ b/pkgs/development/python-modules/ntlm-auth/default.nix @@ -3,22 +3,23 @@ , fetchFromGitHub , mock , pytest +, requests , unittest2 , six }: buildPythonPackage rec { pname = "ntlm-auth"; - version = "1.0.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jborean93"; repo = "ntlm-auth"; rev = "v${version}"; - sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz"; + sha256 = "168k3ygwbvnfcwn7q1nv3vvy6b9jc4cnpix0xgg5j8av7v1x0grn"; }; - checkInputs = [ mock pytest unittest2 ]; + checkInputs = [ mock pytest requests unittest2 ]; propagatedBuildInputs = [ six ]; # Functional tests require networking @@ -28,8 +29,8 @@ buildPythonPackage rec { meta = with lib; { description = "Calculates NTLM Authentication codes"; - homepage = https://github.com/jborean93/ntlm-auth; - license = licenses.lgpl3; + homepage = "https://github.com/jborean93/ntlm-auth"; + license = licenses.mit; maintainers = with maintainers; [ elasticdog ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 4c2af8a00814..5acdfd6f8c6d 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.10.1"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "f6b529b8a8112dfe456d4f7697c7aee0aca62be5a873879306afe4b26fca963c"; + sha256 = "1z6b740fpkr8fbbhw79l29hmwf76xcda6ni804sqz0jghm7883yy"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix new file mode 100644 index 000000000000..4dc4ffa68fc0 --- /dev/null +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchPypi +, lib +, click +, requests +, packaging +}: + +with lib; + +buildPythonPackage rec { + pname = "openwrt-luci-rpc"; + version = "1.1.2"; + + srcs = fetchPypi { + inherit pname version; + sha256 = "144bw7w1xvpdkad5phflpkl15ih5pvi19799wmvfv8mj1dn1yjhp"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "requests==2.21.0" "requests" + substituteInPlace setup.py --replace "packaging==19.1" "packaging" + ''; + + propagatedBuildInputs = [ click requests packaging ]; + + meta = { + description = '' + Python3 module for interacting with the OpenWrt Luci RPC interface. + Supports 15.X & 17.X & 18.X or newer releases of OpenWrt. + ''; + homepage = "https://github.com/fbradyirl/openwrt-luci-rpc"; + license = licenses.asl20; + maintainers = with maintainers; [ matt-snider ]; + }; +} diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix new file mode 100644 index 000000000000..aa7fc4add493 --- /dev/null +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage, + fetchFromGitHub, + isPy27, + libopus, + nose, + stdenv, + substituteAll, +}: + +buildPythonPackage rec { + pname = "opuslib"; + version = "3.0.3"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "orion-labs"; + repo = "opuslib"; + rev = "92109c528f9f6c550df5e5325ca0fcd4f86b0909"; + sha256 = "0kd37wimwd1g6c0w5hq2hiiljgbi1zg3rk5prval086khkzq469p"; + }; + + patches = [ + (substituteAll { + src = ./opuslib-paths.patch; + opusLibPath = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + checkInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "Python bindings to the libopus, IETF low-delay audio codec"; + homepage = "https://github.com/orion-labs/opuslib"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ thelegy ]; + }; +} diff --git a/pkgs/development/python-modules/opuslib/opuslib-paths.patch b/pkgs/development/python-modules/opuslib/opuslib-paths.patch new file mode 100644 index 000000000000..fd2cfc8dbde2 --- /dev/null +++ b/pkgs/development/python-modules/opuslib/opuslib-paths.patch @@ -0,0 +1,26 @@ +diff --git a/opuslib/api/__init__.py b/opuslib/api/__init__.py +index 323a2a4..4c8a8fe 100644 +--- a/opuslib/api/__init__.py ++++ b/opuslib/api/__init__.py +@@ -7,20 +7,12 @@ + + import ctypes # type: ignore + +-from ctypes.util import find_library # type: ignore +- + __author__ = 'Никита Кузнецов <self@svartalf.info>' + __copyright__ = 'Copyright (c) 2012, SvartalF' + __license__ = 'BSD 3-Clause License' + + +-lib_location = find_library('opus') +- +-if lib_location is None: +- raise Exception( +- 'Could not find Opus library. Make sure it is installed.') +- +-libopus = ctypes.CDLL(lib_location) ++libopus = ctypes.CDLL('@opusLibPath@') + + c_int_pointer = ctypes.POINTER(ctypes.c_int) + c_int16_pointer = ctypes.POINTER(ctypes.c_int16) diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 237ad7a7a00a..16997d667812 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -4,10 +4,9 @@ , cmake , future , numpy - # check inputs , scipy +# check inputs , pytestCheckHook -, mkl }: buildPythonPackage rec { @@ -23,16 +22,15 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; propagatedBuildInputs = [ - numpy future + numpy + scipy ]; - checkInputs = [ scipy pytestCheckHook mkl ]; pythonImportsCheck = [ "osqp" ]; - dontUseSetuptoolsCheck = true; # running setup.py fails if false - preCheck = '' - export LD_LIBRARY_PATH=${lib.strings.makeLibraryPath [ mkl ]}:$LD_LIBRARY_PATH; - ''; + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; # don't run checks twice + disabledTests = [ "mkl_" ]; meta = with lib; { description = "The Operator Splitting QP Solver"; @@ -44,8 +42,8 @@ buildPythonPackage rec { where x in R^n is the optimization variable ''; homepage = "https://osqp.org/"; - downloadPage = "https://github.com/oxfordcontrol/osqp"; + downloadPage = "https://github.com/oxfordcontrol/osqp-python/releases"; license = licenses.asl20; - maintainers = with lib.maintainers; [ drewrisinger ]; + maintainers = with maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/pam/default.nix b/pkgs/development/python-modules/pam/default.nix new file mode 100644 index 000000000000..6b5855379788 --- /dev/null +++ b/pkgs/development/python-modules/pam/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pam +}: + +buildPythonPackage rec { + pname = "python-pam"; + version = "1.8.4"; + + src = fetchFromGitHub { + owner = "FirefighterBlu3"; + repo = pname; + rev = "v${version}"; + sha256 = "0gp7vzd332j7jwndcnz7kc9j283d6lyv32bndd1nqv9ghzv69sxp"; + }; + + buildInputs = [ + pam + ]; + + postPatch = '' + sed "s|find_library(\"pam\")|\"${pam}/lib/libpam.so\"|g" -i pam.py + ''; + + meta = with lib; { + description = "Python pam module supporting py3 (and py2)"; + homepage = "https://github.com/FirefighterBlu3/python-pam"; + license = licenses.mit; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/development/python-modules/pastel/default.nix b/pkgs/development/python-modules/pastel/default.nix index 532970c62c28..a44b4253ca56 100644 --- a/pkgs/development/python-modules/pastel/default.nix +++ b/pkgs/development/python-modules/pastel/default.nix @@ -1,24 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, fetchPypi, poetry, pytest }: buildPythonPackage rec { pname = "pastel"; - version = "0.1.0"; + version = "0.2.0"; - # No tests in PyPi tarball - src = fetchFromGitHub { - owner = "sdispater"; - repo = "pastel"; - rev = version; - sha256 = "1b4ag7jr7j0sxly5g29imdq8g0d4ixhbck55dblr45mlsidydx0s"; + src = fetchPypi { + inherit pname version; + sha256 = "0dnaw44ss10i10z4ksy0xljknvjap7rb7g0b8p6yzm5x4g2my5a6"; }; checkInputs = [ pytest ]; checkPhase = '' - pytest tests -sq + pytest ''; meta = with lib; { - homepage = https://github.com/sdispater/pastel; + homepage = "https://github.com/sdispater/pastel"; description = "Bring colors to your terminal"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix new file mode 100644 index 000000000000..7cab25707984 --- /dev/null +++ b/pkgs/development/python-modules/patch-ng/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.17.4"; # note: `conan` package may require a hardcoded one + pname = "patch-ng"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kja1nn08w0k8k6j4kad48k581hh9drvjjb8x60v9j13sxdvqyk2"; + }; + + meta = with stdenv.lib; { + description = "Library to parse and apply unified diffs."; + homepage = "https://github.com/conan-io/python-patch"; + license = licenses.mit; + maintainers = with maintainers; [ HaoZeke ]; + }; + +} diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 5f3cc06b5af5..ace2b618ef22 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,19 +1,29 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, six, pycryptodome, chardet, nose, sortedcontainers }: +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers, fetchpatch }: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20191020"; + version = "20200402"; + + disabled = !isPy3k; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1fqn4ilcscvw6ws9a1yqiprha9d3rgw3d0280clkbk6s4l26wm9h"; + sha256 = "1wl64r3ifpwi7mm5pcxc0ji7w380nxcq3zrv66n95lglm4zqkf26"; }; - propagatedBuildInputs = [ six pycryptodome sortedcontainers ] - ++ stdenv.lib.optionals isPy3k [ chardet ]; + patches = [ + # Add shebang line to scripts. See: https://github.com/pdfminer/pdfminer.six/pull/408 + (fetchpatch { + url = "https://github.com/pdfminer/pdfminer.six/commit/0c2f44b6de064d9a3cea99bde5b8e9c6a525a69c.patch"; + sha256 = "1vml66grnvg4g26mya24kiyxsz809d4mr7wz8qmawjbn4ss65y21"; + excludes = [ "CHANGELOG.md" ]; + }) + ]; + + propagatedBuildInputs = [ chardet pycryptodome sortedcontainers ]; checkInputs = [ nose ]; checkPhase = '' @@ -21,8 +31,8 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "fork of PDFMiner using six for Python 2+3 compatibility"; - homepage = https://github.com/pdfminer/pdfminer.six; + description = "PDF parser and analyzer"; + homepage = "https://github.com/pdfminer/pdfminer.six"; license = licenses.mit; maintainers = with maintainers; [ psyanticy marsam ]; }; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index bc54c18ac81a..1165157feccf 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.8"; + version = "1.10"; src = fetchPypi { inherit pname version; - sha256 = "115067100fbb9eb36f530d94b64b4e1e36a8d304537af0847d562ff9ed399c05"; + sha256 = "a26ba77127b363446955e8a5317b3194defb1c1bb9d2ed5e7d4830fd4f066d97"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index ff64f9ca82df..f16bf3f014ce 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.11.4"; + version = "8.12.0"; src = fetchPypi { inherit pname version; - sha256 = "13hfcw89kppm8s2qx0s5bafzxjc0qhm9sxmpf6yqvshz2fn82pk8"; + sha256 = "0mnicas0c5av322d7k6m14j3c10axh9mcvn3vx99vhngdnb9j6hn"; }; meta = { diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix index 57fbe099071d..ca6346d1cd24 100644 --- a/pkgs/development/python-modules/picos/default.nix +++ b/pkgs/development/python-modules/picos/default.nix @@ -4,19 +4,25 @@ , numpy , cvxopt , python +, networkx }: buildPythonPackage rec { pname = "picos"; - version = "1.2.0"; + version = "2.0"; src = fetchFromGitLab { owner = "picos-api"; repo = "picos"; rev = "v${version}"; - sha256 = "018xhc7cb2crkk27lhl63c7h77w5wa37fg41i7nqr4xclr43cs9z"; + sha256 = "1k65iq791k5r08gh2kc6iz0xw1wyzqik19j6iam8ip732r7jm607"; }; + # Needed only for the tests + checkInputs = [ + networkx + ]; + propagatedBuildInputs = [ numpy cvxopt @@ -28,9 +34,8 @@ buildPythonPackage rec { meta = with lib; { description = "A Python interface to conic optimization solvers"; - homepage = https://gitlab.com/picos-api/picos; + homepage = "https://gitlab.com/picos-api/picos"; license = licenses.gpl3; maintainers = with maintainers; [ tobiasBora ]; }; } - diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix index 20e9390861dc..8e45c43954d6 100644 --- a/pkgs/development/python-modules/pid/default.nix +++ b/pkgs/development/python-modules/pid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pid"; - version = "2.2.5"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "96eb7dba326b88f5164bc1afdc986c7793e0d32d7f62366256a3903c7b0614ef"; + sha256 = "0pdp8h1m4brxalcsmzzzmjj66vj98g6wigwmcdj5sf8p7insklgn"; }; buildInputs = [ nose ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pidfile featuring stale detection and file-locking"; - homepage = https://github.com/trbs/pid/; + homepage = "https://github.com/trbs/pid/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 8bbda8bd51f1..532d9d0ede87 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -2,20 +2,40 @@ , buildPythonPackage , fetchPypi , isPy27 +, pythonOlder , funcsigs +, setuptools_scm +# Check Inputs +, pytestCheckHook +, numpy +, matplotlib +, uncertainties }: buildPythonPackage rec { pname = "pint"; - version = "0.9"; + version = "0.11"; src = fetchPypi { inherit version; pname = "Pint"; - sha256 = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2"; + sha256 = "0kfgnmcs6z9ndhzvwg2xzhpwxgyyagdsdz5dns1jy40fa1q113rh"; }; - propagatedBuildInputs = lib.optional isPy27 funcsigs; + disabled = pythonOlder "3.6"; + + propagatedBuildInputs = [ + setuptools_scm + ] ++ lib.optional isPy27 funcsigs; + + # Test suite explicitly requires pytest + checkInputs = [ + pytestCheckHook + numpy + matplotlib + uncertainties + ]; + dontUseSetuptoolsCheck = true; meta = with lib; { description = "Physical quantities module"; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 0a8d679ae5f9..20a42cddcf9c 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "4.3.0"; + version = "4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0x36mp3a3f3wandfc0g8d53gg2jkc14nhisbryzspcl9f05sbvq6"; + sha256 = "166crncd9zrk9wgk9dss9968mx2c1dzj80sjnaqrcmw7a7j30gv9"; }; LC_ALL = "en_US.UTF-8"; @@ -27,6 +27,7 @@ buildPythonPackage rec { "test_generate_hashes_with_editable" "test_generate_hashes_with_url" "test_generate_hashes_without_interfering_with_each_other" + "test_get_file_hash_without_interfering_with_each_other" "test_get_hashes_local_repository_cache_miss" "test_realistic_complex_sub_dependencies" "test_stdin" diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index d24b2dcafda8..796f94184978 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.6.8"; + version = "1.6.9"; checkInputs = [ pytest ]; @@ -14,6 +14,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "14mbyvc1y25lr72n1zh9ym5ngify7zdr57lxahidq03ycpwz4wc5"; + sha256 = "1ps37vamqav6p277dlp51jnacd5q4x4z1x8y0nfjw3y8jsfy3f8n"; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index f007ff3df1d8..481fd2c5feb7 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0y528095njf28isbcp5iwbf12j67xhxnrkac93pws0zy133v7kc1"; + sha256 = "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 22c14cc0dfb3..c69e4fc4867c 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.12"; + version = "0.7.13"; src = fetchPypi { inherit pname version; - sha256 = "02njpqwfvzxj9icabil8ycmfx8avzih3g1kcdif290qgsy57a28r"; + sha256 = "1fqc45m106xfy4hhzzwb8p7s2fh5x2x7s143dib84lbszqwp77la"; }; doCheck = true; diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index dd3c8d16a51e..4ef7f2213664 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "2.0.10"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; + sha256 = "10wpsbl1mmnvm8q63zs40633kbq93bidx4vz1p2q92w8ijqb3rpb"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix new file mode 100644 index 000000000000..ad7e4aa4af6e --- /dev/null +++ b/pkgs/development/python-modules/protego/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +, pytest +}: + +buildPythonPackage rec { + pname = "Protego"; + version = "0.1.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "a682771bc7b51b2ff41466460896c1a5a653f9a1e71639ef365a72e66d8734b4"; + }; + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest tests + ''; + + meta = with lib; { + description = "A pure-Python robots.txt parser with support for modern conventions"; + homepage = "https://github.com/scrapy/protego"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 01f9dda8f2c1..f5a37dda630d 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -1,16 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, appdirs, docopt, jedi +, pygments, isPy3k }: buildPythonPackage rec { pname = "ptpython"; - version = "2.0.6"; + version = "3.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "90e24040e82de4abae0bbe6e352d59ae6657e14e1154e742c0038679361b052f"; + sha256 = "a69cce0aa04f0075e2e65287a0ee2f3a928c0591b301ce22aa2e498af1ebcb4b"; }; - propagatedBuildInputs = [ prompt_toolkit docopt jedi pygments ]; + propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ]; # no tests to run doCheck = false; diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index c90f81ae28f8..ae2f5ae9d6db 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "py-cpuinfo"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "workhorsy"; repo = pname; rev = "v${version}"; - sha256 = "1pp561lj80jnvr2038nrzhmks2akxsbdqxvfrqa6n340x81981lm"; + sha256 = "0lxl9n6djaz5h1zrb2jca4qwl41c2plxy8chr7yhcxnzg0srddqi"; }; checkInputs = [ @@ -27,7 +27,14 @@ buildPythonPackage rec { meta = { description = "Get CPU info with pure Python 2 & 3"; - homepage = https://github.com/workhorsy/py-cpuinfo; + longDescription = '' + Py-cpuinfo gets CPU info with pure Python and should work without any + extra programs or libraries, beyond what your OS provides. It does not + require any compilation (C/C++, assembly, etc.) to use and works with + Python 2 and 3. + ''; + inherit (src.meta) homepage; + changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 3f5d3a5bd8c3..2102554faceb 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,22 +1,35 @@ -{ stdenv, fetchFromGitHub -, buildPythonPackage, python-jose, pyjwt, requests, deprecated, httpretty }: +{ stdenv +, buildPythonPackage +, cryptography +, deprecated +, fetchFromGitHub +, httpretty +, isPy3k +, parameterized +, pyjwt +, pytestCheckHook +, requests }: buildPythonPackage rec { pname = "PyGithub"; - version = "1.45"; + version = "1.47"; + disabled = !isPy3k; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "1aiyqwdxpcr7yzz7aqmmjn1g2ajs5bpbln4sax5zw19dqi6qgp9z"; + sha256 = "0zvp1gib2lryw698vxkbdv40n3lsmdlhwp7vdcg41dqqa5nfryhn"; }; - propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; + checkInputs = [ httpretty parameterized pytestCheckHook ]; + propagatedBuildInputs = [ cryptography deprecated pyjwt requests ]; + + # Test suite makes REST calls against github.com doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/PyGithub/PyGithub; + homepage = "https://github.com/PyGithub/PyGithub"; description = "A Python (2 and 3) library to access the GitHub API v3"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index ab05f49ac38f..a63e32f9da67 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: +{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; @@ -9,11 +9,21 @@ buildPythonPackage rec { inherit (_arrow-cpp) version src; + patches = [ + # Remove when updating pkgs.arrow-cpp to 0.17 + (fetchpatch { + name = "ARROW-8106-fix-conversion-test"; + url = "https://github.com/apache/arrow/commit/af20bbff30adc560d7e57dd921345d00cc8b870c.patch"; + sha256 = "0ihpw589vh35va31ajzy5zpx3bqd9gdn3342rghi03r245kch9zd"; + stripLen = 1; + }) + ]; + sourceRoot = "apache-arrow-${version}/python"; nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ hypothesis pandas pytest pytest-lazy-fixture ]; + checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; PYARROW_BUILD_TYPE = "release"; PYARROW_WITH_PARQUET = true; @@ -24,6 +34,8 @@ buildPythonPackage rec { # ourselves "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" ]; + ARROW_HOME = _arrow-cpp; + PARQUET_HOME = _arrow-cpp; dontUseCmakeConfigure = true; @@ -31,40 +43,12 @@ buildPythonPackage rec { export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; + dontUseSetuptoolsCheck = true; preCheck = '' - rm pyarrow/tests/test_jvm.py - 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" - - # runs out of memory on @grahamcofborg linux box - substituteInPlace pyarrow/tests/test_feather.py --replace "test_large_dataframe" "_disabled" - - # probably broken on python2 - substituteInPlace pyarrow/tests/test_feather.py --replace "test_unicode_filename" "_disabled" - - # fails "error: [Errno 2] No such file or directory: 'test'" because - # nix_run_setup invocation somehow manages to import deserialize_buffer.py - # when it is not intended to be imported at all - rm pyarrow/tests/deserialize_buffer.py - substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled" - - # Fails to bind a socket - # "PermissionError: [Errno 1] Operation not permitted" - substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled" - ''; - - ARROW_HOME = _arrow-cpp; - PARQUET_HOME = _arrow-cpp; - - checkPhase = '' mv pyarrow/tests tests rm -rf pyarrow mkdir pyarrow mv tests pyarrow/tests - pytest -v ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 3f427e340022..8e6678a42b96 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.34.0"; + version = "2.36.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j3f75j0zd6ca8msg7yr19qsfirqkn9fk8pqbjnlhqrpri455g4p"; + sha256 = "UTbBv5GeEB1OyQGiduhupg5Ygaj/d2PjVvGYQOX/4d0="; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 9ce934c84676..4939cd18e43a 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "4.1.1"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "13cxyxs0cl2cwbx1fkw6b26hrzpllx1wfq2q58fx298yjn3niiby"; + sha256 = "05h7ncymyh1715v2jkj312qza5qlqrz6yfpgyv4kdf1m07zh7pxh"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix new file mode 100644 index 000000000000..afc607baa405 --- /dev/null +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cryptography +, boto3 +, envs +, python-jose +, requests +, mock +, isPy27 +}: + +buildPythonPackage rec { + pname = "pycognito"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "pvizeli"; + repo = "pycognito"; + rev = version; + sha256 = "01zns522awm5yp5cbk1y7k7px534i5akiivip709i1naph3hvnfk"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'python-jose[cryptography]' 'python-jose' + ''; + + propagatedBuildInputs = [ + boto3 + envs + python-jose + requests + ]; + + disabled = isPy27; + + checkInputs = [ mock ]; + + meta = with lib; { + description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support"; + homepage = "https://GitHub.com/pvizeli/pycognito"; + license = licenses.asl20; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index cc1977546921..d73ee24f5847 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -1,26 +1,24 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, pyusb -, pyserial -}: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pyusb, pyserial }: buildPythonPackage rec { pname = "pyftdi"; - version = "0.44.2"; + version = "0.49.0"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "18k9wnpjxg71v4jm0pwr2bmksq7sckr6ylh1slf0xgpg89b27bxq"; + src = fetchFromGitHub { + owner = "eblot"; + repo = pname; + rev = "v${version}"; + sha256 = "063kwvgw7g4nn09pyqwqy72vnhzw0aajg23bi32vr0k49g8fx27s"; }; propagatedBuildInputs = [ pyusb pyserial ]; + pythonImportsCheck = [ "pyftdi" ]; + meta = { description = "User-space driver for modern FTDI devices"; homepage = "https://github.com/eblot/pyftdi"; - license = lib.licenses.lgpl2; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index e6be92c0efb5..a37872d90945 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -11,6 +11,7 @@ , gdk-pixbuf , fontconfig , freetype +, ffmpeg-full }: buildPythonPackage rec { @@ -52,6 +53,8 @@ buildPythonPackage rec { path = '${fontconfig.lib}/lib/libfontconfig${ext}' elif name == 'freetype': path = '${freetype}/lib/libfreetype${ext}' + elif name[0:2] == 'av' or name[0:2] == 'sw': + path = '${ffmpeg-full}/lib/lib' + name + '${ext}' if path is not None: return ctypes.cdll.LoadLibrary(path) raise Exception("Could not load library {}".format(names)) diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index e9cbeb422f15..b1890c73e80b 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { pname = "pygobject"; - version = "3.34.0"; + version = "3.36.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7"; + sha256 = "hoPS37W6qeUBqaZO66XCwRF+rbeBqxzXqdJVg0r22u8="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index e409282980d6..d3e0da07868b 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyhcl"; - version = "0.4.0"; + version = "0.4.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "virtuald"; repo = pname; rev = version; - sha256 = "09kwm3digbwn3kmbk76jswxgwfcfchik6cfa2xbhjanh4xs893hs"; + sha256 = "01y5fn3pis43i0w0858wmrc8azfinp07a16ixglmg28gg07c0zkd"; }; # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix deleted file mode 100644 index 26a91a313ee4..000000000000 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, fetchFromBitbucket -, isPy3k -, pkgs -, python -}: - -buildPythonPackage rec { - pname = "pyhepmc"; - version = "1.0.1"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1210fd7e20d4abc1d9166147a9f7645a2a58b655fe030ad54ab3ea0d0c6e0834"; - }; - - srcMissing = fetchFromBitbucket { - owner = "andybuckley"; - repo = "pyhepmc"; - rev = "pyhepmc-1.0.0"; - sha256 = "0vxad143pz45q94w5p0dycpk24insdsv1m5k867y56xy24bi0d4w"; - }; - - prePatch = '' - cp -r $srcMissing/hepmc . - chmod +w hepmc - ''; - - patches = [ - # merge PR https://bitbucket.org/andybuckley/pyhepmc/pull-requests/1/add-incoming-outgoing-generators-for/diff - ./pyhepmc_export_edges.patch - # add bindings to Flow class - ./pyhepmc_export_flow.patch - ]; - - # regenerate python wrapper - preConfigure = '' - swig -c++ -I${pkgs.hepmc}/include -python hepmc/hepmcwrap.i - ''; - - nativeBuildInputs = [ pkgs.swig ]; - buildInputs = [ pkgs.hepmc2 ]; - - HEPMCPATH = pkgs.hepmc2; - - checkPhase = '' - ${python.interpreter} test/test1.py - ''; - - meta = with stdenv.lib; { - description = "A simple wrapper on the main classes of the HepMC event simulation representation, making it possible to create, read and manipulate HepMC events from Python code"; - license = licenses.gpl2; - maintainers = with maintainers; [ veprbl ]; - }; - -} diff --git a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch b/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch deleted file mode 100644 index 5c6e56566a34..000000000000 --- a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch +++ /dev/null @@ -1,204 +0,0 @@ -# HG changeset patch -# User Lukas Heinrich <lukas.heinrich@gmail.com> -# Date 1430606843 14400 -# Node ID 325f89b7b72922e9add9ca9dd0f7ca4a6c83bf00 -# Parent e4fd953257e0d38511f2177de7ffaef662358af2 -add incoming/outgoing generators for GenVertex - -diff --git a/hepmc/generators.i b/hepmc/generators.i -new file mode 100644 ---- /dev/null -+++ b/hepmc/generators.i -@@ -0,0 +1,171 @@ -+/*! -+ * \file generators.i -+ * \author Seth R. Johnson -+ * \brief Define generator/iterator for any type -+ -+Example: -+\code -+ SETUP_GENERATOR( std::vector<Cell>::const_iterator ) -+ ADD_GENERATOR( Mesh, cells, -+ std::vector<Cell>::const_iterator, Cell, beginCells, endCells) -+\endcode -+would be a method to add a \c cells generator method method to the Python class -+\c Mesh, when the C++ class \c Mesh has a \c std::vector<Cell> accessed through -+methods \c beginCells and \c endCells. -+ -+The macro \c ADD_GENERATOR_P would be if the underlying storage were \c -+std::vector<Cell*> instead. -+ -+Alternatively, for containers of regular objects that provide \c begin(), \c end(), and \c const_iterator, you can use the \c ADD_CONTAINER_ITERATOR macro: -+\code -+ADD_CONTAINER_ITERATOR( QuadratureSet ) -+\endcode -+ -+\section License -+ -+Copyright (c) 2010, Seth R. Johnson -+All rights reserved. -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions are met: -+ * Redistributions of source code must retain the above copyright notice, this -+ list of conditions and the following disclaimer. -+ * Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions and the following disclaimer in the documentation -+ and/or other materials provided with the distribution. -+ * Neither the name of the this project nor the names of its contributors -+ may be used to endorse or promote products derived from this software -+ without specific prior written permission. -+ -+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+ This material is based upon work supported under a National Science -+ Foundation Graduate Research Fellowship. Any opinions, findings, conclusions -+ or recommendations expressed in this publication are those of the author -+ and do not necessarily reflect the views of the National Science -+ Foundation. -+*/ -+#ifndef tools_SWIG_generators_i -+#define tools_SWIG_generators_i -+/*----------------------------------------------------------------------------*/ -+ -+// Add a Python class to provide iterator objects -+%insert("python") %{ -+class GenericIterator: -+ def __init__(self, begin_iter_method, deref_method, incr_method): -+ self.it = begin_iter_method() -+ self.incr = incr_method -+ self.deref = deref_method -+ -+ def __iter__(self): -+ return self -+ -+ def next(self): -+ obj = self.deref( self.it ) -+ if obj is not None: -+ self.incr( self.it ) -+ return obj -+ else: -+ raise StopIteration -+%} -+ -+//============== GENERIC GENERATOR/ITERATOR WRAPPER SUPPORT ============ -+//! Thin wrapper for incrementing a certain type of iterator -+// only need to define once per iterator type, and we can use the same name -+// thanks to overloading (even though this may decrease efficiency) -+%define SETUP_GENERATOR( ITERATOR... ) -+%inline %{ -+void _iter_incr( ITERATOR* iter ) -+{ -+ ++(*iter); -+} -+%} -+%enddef -+ -+/*----------------------------------------------------------------------------*/ -+// Internal method for adding common parts of the generator -+%define PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN ) -+ %extend CLASS { -+%insert("python") %{ -+ def PYMETHOD(self): -+ "Returns an iterator for PYMETHOD." -+ return GenericIterator( -+ self._begin_ ## PYMETHOD, -+ self._deref_ ## PYMETHOD, -+ _iter_incr -+ ) -+%} -+// get the first element in the vector -+ITERATOR* _begin_ ## PYMETHOD() -+{ -+ return new ITERATOR( ($self)->CBEGIN() ); -+} -+ } -+%enddef -+/*----------------------------------------------------------------------------*/ -+// If the dereferenced iterator is an object -+%define ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, RVALUE, CBEGIN, CEND ) -+ -+// add the python and begin method -+PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN ) -+ -+ %extend CLASS { -+//! Dereference the iterator; return NULL if at the end -+const RVALUE* _deref_ ## PYMETHOD ## ( const ITERATOR* iter ) -+{ -+ // if at the end, return NULL -+ if (*iter == ($self)->CEND() ) { -+ return NULL; -+ } -+ // otherwise, return the POINTER to the dereferenced iterator -+ return &(**iter); -+} -+ } -+%enddef -+/*----------------------------------------------------------------------------*/ -+// If the dereferenced iterator is a pointer -+%define ADD_GENERATOR_P( CLASS, PYMETHOD, ITERATOR, RVALUE, CBEGIN, CEND ) -+ -+// add the python and begin method -+PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN ) -+ -+ %extend CLASS { -+//! Dereference the iterator; return NULL if at the end -+const RVALUE* _deref_ ## PYMETHOD ## ( const ITERATOR* iter ) -+{ -+ // if at the end, return NULL -+ if (*iter == ($self)->CEND() ) { -+ return NULL; -+ } -+ // otherwise, return the dereferenced iterator (a pointer) -+ return **iter; -+} -+ } -+%enddef -+/*----------------------------------------------------------------------------*/ -+//! For a regular container with "begin" and "end" and "size" -+%define ADD_CONTAINER_ITERATOR( CLASS ) -+ SETUP_GENERATOR( CLASS::const_iterator ); -+ ADD_GENERATOR( CLASS, __iter__, -+ CLASS ## ::const_iterator, CLASS ## ::value_type, -+ begin, end) -+ %extend CLASS { -+ %insert("python") %{ -+ def __len__(self): -+ return self.size() -+ %} -+ } -+%enddef -+ -+/*============================================================================*/ -+#endif -+ -diff --git a/hepmc/hepmcwrap.i b/hepmc/hepmcwrap.i ---- a/hepmc/hepmcwrap.i -+++ b/hepmc/hepmcwrap.i -@@ -1,5 +1,7 @@ - %module hepmcwrap - -+%include generators.i -+ - %{ - #include "HepMC/GenEvent.h" - #include "HepMC/GenVertex.h" -@@ -251,3 +253,9 @@ - return ss.str(); - } - } -+ -+SETUP_GENERATOR( std::vector< HepMC::GenParticle* >::const_iterator ) -+ADD_GENERATOR_P( HepMC::GenVertex, incoming, -+std::vector< HepMC::GenParticle* >::const_iterator, HepMC::GenParticle, particles_in_const_begin, particles_in_const_end) -+ADD_GENERATOR_P( HepMC::GenVertex, outgoing, -+std::vector< HepMC::GenParticle* >::const_iterator, HepMC::GenParticle, particles_out_const_begin, particles_out_const_end) diff --git a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch b/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch deleted file mode 100644 index 85e26a1a1607..000000000000 --- a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/hepmc/hepmcwrap.i b/hepmc/hepmcwrap.i -index cf35c1b..b94fbe2 100644 ---- a/hepmc/hepmcwrap.i -+++ b/hepmc/hepmcwrap.i -@@ -1,6 +1,7 @@ - %module hepmcwrap - - %{ -+ #include "HepMC/Flow.h" - #include "HepMC/GenEvent.h" - #include "HepMC/GenVertex.h" - #include "HepMC/GenParticle.h" -@@ -93,6 +94,7 @@ namespace HepMC { - // headers before importing headers that use those classes. - // Result is that headers should probably be %included in an order - // which sees "contents before containers" -+%include "HepMC/Flow.h" - %include "HepMC/HepMCDefs.h" - %include "HepMC/SimpleVector.h" - // #ifdef HEPMC_HAS_ITERATOR_RANGES diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 7bc52f74701c..20fd48bcb2bd 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyicloud"; - version = "0.9.4"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "0r171wnq2g5bw7gd59vh6flm0104ix1a6s2vhdrf8s74hipw57si"; + sha256 = "1c8sdlqcmpajcpf6jfpi6amncibm9c3zrl1860r0vfimps50m34h"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index ef47699053cb..8530e6f8543d 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.0.13"; + version = "2.0.14"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "16xfn8zs5khdfh5pdsv3wjjhywzc1qhx7mxi5kpbcvmd6an9qi7s"; + sha256 = "07fkwb4phfr71dpajnq6l64phjxvljx2nf8ibs12n9gwjdvm9i52"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index b909886ddb5b..d47ea812ca8f 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.3"; + version = "2.4.6"; src = fetchPypi { inherit pname version; - sha256 = "332d3d0291b4482641a5b3cd97e879817f50eb9c2b2ddcc30d51d619bad01b51"; + sha256 = "1c8bxbm18h4idfdxqgklcz4n5bgsyl9y14gl9314fpflwa2c7ds8"; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix new file mode 100644 index 000000000000..6e72309a58d3 --- /dev/null +++ b/pkgs/development/python-modules/pymumble/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage, + fetchFromGitHub, + isPy27, + lib, + opuslib, + protobuf, +}: + +buildPythonPackage rec { + pname = "pymumble"; + version = "0.3.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "azlux"; + repo = "pymumble"; + rev = "1dd6d6d4df2fdef33202f17e2acf3ba9678a5737"; + sha256 = "1r1sch8xrpbzffsb72lhp5xjr3ac3xb599n44vsfmaam3xklz6vz"; + }; + + propagatedBuildInputs = [ opuslib protobuf ]; + + pythonImportsCheck = [ "pymumble_py3" ]; + + meta = with lib; { + description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot."; + homepage = "https://github.com/azlux/pymumble"; + license = licenses.gpl3; + maintainers = with maintainers; [ thelegy ]; + }; +} diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index a3286b31461e..2ab33fb18381 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.12"; + version = "1.16.16"; src = fetchPypi { inherit pname version; - sha256 = "0mywnhn8ylm9xy23yfgnxiq4akk1rq3n7bl1m7pw6imsgbdhzrwg"; + sha256 = "1rw4wjbsp8pnkkqcn097psjd6qinv70pjzvrbns04maybhn4ni6v"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pynanoleaf/default.nix b/pkgs/development/python-modules/pynanoleaf/default.nix new file mode 100644 index 000000000000..40e2783aa577 --- /dev/null +++ b/pkgs/development/python-modules/pynanoleaf/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: + +buildPythonPackage rec { + pname = "pynanoleaf"; + version = "0.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "2ced000e3c37f4e2ce0ea177d924af71c97007de9e4fd0ef37dcd7b4a6d1b622"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ requests ]; + + # pynanoleaf does not contain tests + doCheck = false; + + pythonImportsCheck = [ + "pynanoleaf" + ]; + + meta = with lib; { + homepage = "https://github.com/Oro/pynanoleaf"; + description = "A Python3 wrapper for the Nanoleaf API, capable of controlling both Nanoleaf Aurora and Nanoleaf Canvas"; + license = licenses.mit; + maintainers = with maintainers; [ oro ]; + }; +} diff --git a/pkgs/development/python-modules/pyproj/001.proj.patch b/pkgs/development/python-modules/pyproj/001.proj.patch index b024c28156c1..52e0a80f739d 100644 --- a/pkgs/development/python-modules/pyproj/001.proj.patch +++ b/pkgs/development/python-modules/pyproj/001.proj.patch @@ -1,47 +1,62 @@ -diff a/pyproj/datadir.py b/pyproj/datadir.py ---- a/pyproj/datadir.py -+++ b/pyproj/datadir.py -@@ -52,6 +52,7 @@ def get_data_dir(): - str: The valid data directory. - - """ -+ return "@proj@/share/proj" - # to avoid re-validating - global _VALIDATED_PROJ_DATA +diff -Nur a/pyproj/datadir.py b/pyproj/datadir.py +--- a/pyproj/datadir.py 2020-03-24 12:53:39.417440608 +0100 ++++ b/pyproj/datadir.py 2020-03-24 12:56:19.870089479 +0100 +@@ -66,9 +66,7 @@ if _VALIDATED_PROJ_DATA is not None: -diff a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -16,7 +16,7 @@ INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ - + return _VALIDATED_PROJ_DATA + global _USER_PROJ_DATA +- internal_datadir = os.path.join( +- os.path.dirname(os.path.abspath(__file__)), "proj_dir", "share", "proj" +- ) ++ internal_datadir = "@proj@/share/proj" + proj_lib_dirs = os.environ.get("PROJ_LIB", "") + prefix_datadir = os.path.join(sys.prefix, "share", "proj") + +diff -Nur a/setup.py b/setup.py +--- a/setup.py 2020-03-24 12:53:39.415440624 +0100 ++++ b/setup.py 2020-03-24 12:52:05.311232522 +0100 +@@ -11,7 +11,7 @@ + PROJ_MIN_VERSION = parse_version("6.2.0") + CURRENT_FILE_PATH = os.path.dirname(os.path.abspath(__file__)) + BASE_INTERNAL_PROJ_DIR = "proj_dir" +-INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ_DIR) ++INTERNAL_PROJ_DIR = "@proj@" + + def check_proj_version(proj_dir): - """checks that the PROJ library meets the minimum version""" -- proj = os.path.join(proj_dir, "bin", "proj") -+ proj = "@proj@/bin/proj" - proj_ver_bytes = subprocess.check_output(proj, stderr=subprocess.STDOUT) - proj_ver_bytes = (proj_ver_bytes.decode("ascii").split()[1]).strip(",") - proj_version = parse_version(proj_ver_bytes) -@@ -33,6 +33,7 @@ def get_proj_dir(): - """ - This function finds the base PROJ directory. - """ -+ return "@proj@" - proj_dir = os.environ.get("PROJ_DIR") - if proj_dir is None and os.path.exists(INTERNAL_PROJ_DIR): - proj_dir = INTERNAL_PROJ_DIR -@@ -56,6 +57,7 @@ def get_proj_libdirs(proj_dir): - """ - This function finds the library directories - """ -+ return ["@proj@/lib"] - proj_libdir = os.environ.get("PROJ_LIBDIR") - libdirs = [] - if proj_libdir is None: -@@ -77,6 +79,7 @@ def get_proj_incdirs(proj_dir): - """ - This function finds the include directories - """ -+ return ["@proj@/include"] - proj_incdir = os.environ.get("PROJ_INCDIR") - incdirs = [] - if proj_incdir is None: +@@ -146,7 +146,7 @@ + # By default we'll try to get options PROJ_DIR or the local version of proj + proj_dir = get_proj_dir() + library_dirs = get_proj_libdirs(proj_dir) +- include_dirs = get_proj_incdirs(proj_dir) ++ include_dirs = get_proj_incdirs("@projdev@") + + # setup extension options + ext_options = { +diff -Nur a/test/conftest.py b/test/conftest.py +--- a/test/conftest.py 2020-03-24 12:53:39.417440608 +0100 ++++ b/test/conftest.py 2020-03-24 23:16:47.373972786 +0100 +@@ -1,6 +1,7 @@ + import os + import shutil + import tempfile ++import stat + + import pytest + +@@ -17,6 +18,15 @@ + with tempfile.TemporaryDirectory() as tmpdir: + tmp_data_dir = os.path.join(tmpdir, "proj") + shutil.copytree(data_dir, tmp_data_dir) ++ ++ # Data copied from the nix store is readonly (causes cleanup problem). ++ # Make it writable. ++ for r, d, files in os.walk(tmp_data_dir): ++ os.chmod(r, os.stat(r).st_mode | stat.S_IWUSR) ++ for f in files: ++ fpath = os.path.join(r, f) ++ os.chmod(fpath, os.stat(fpath).st_mode | stat.S_IWUSR) ++ + try: + os.remove(os.path.join(str(tmp_data_dir), "ntv2_0.gsb")) + except OSError: diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 0f2763faf609..b23cb010f017 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -1,20 +1,22 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, pkgs, pythonOlder, substituteAll +{ lib, buildPythonPackage, fetchFromGitHub, python, pkgs, pythonOlder, isPy27, substituteAll , aenum , cython , pytest , mock , numpy +, shapely }: buildPythonPackage rec { pname = "pyproj"; - version = "2.2.2"; + version = "2.6.0"; + disabled = isPy27; src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; rev = "v${version}rel"; - sha256 = "0mb0jczgqh3sma69k7237i38h09gxgmvmddls9hpw4f3131f5ax7"; + sha256 = "0fyggkbr3kp8mlq4c0r8sl5ah58bdg2mj4kzql9p3qyrkcdlgixh"; }; # force pyproj to use ${pkgs.proj} @@ -22,13 +24,14 @@ buildPythonPackage rec { (substituteAll { src = ./001.proj.patch; proj = pkgs.proj; + projdev = pkgs.proj.dev; }) ]; buildInputs = [ cython pkgs.proj ]; propagatedBuildInputs = [ - numpy + numpy shapely ] ++ lib.optional (pythonOlder "3.6") aenum; checkInputs = [ pytest mock ]; @@ -38,6 +41,9 @@ buildPythonPackage rec { checkPhase = '' pytest . -k 'not alternative_grid_name \ and not transform_wgs84_to_alaska \ + and not transformer_group__unavailable \ + and not transform_group__missing_best \ + and not datum \ and not repr' \ --ignore=test/test_doctest_wrapper.py \ --ignore=test/test_datadir.py diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index f3578459b9d0..a9d78960fc43 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -80,6 +80,9 @@ in buildPythonPackage rec { passthru = { inherit sip; + multimediaEnabled = withMultimedia; + webKitEnabled = withWebKit; + WebSocketsEnabled = withWebSockets; }; configurePhase = '' diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index e13472dafb4f..5a49fa10fbf4 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.9"; + version = "0.5.11"; src = fetchPypi { inherit pname version; - sha256 = "1dymaa3rif05k42sh4c3g2m057v2dsc2f3f49hl2rw5yz8bd23i4"; + sha256 = "1wjamijkg2pp9mgj5k4qw3jl2i3ajikkps0zp5c52wcxm3qmks85"; }; # requires root priviledges @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Netlink library"; - homepage = https://github.com/svinota/pyroute2; + homepage = "https://github.com/svinota/pyroute2"; license = licenses.asl20; maintainers = [maintainers.mic92]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index 18ee419e8e5a..99a9f01d4b09 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -3,13 +3,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.0.18"; + version = "1.0.19"; pname = "pysmbc"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "5da8aef1e3edaaffb1fbe2afe3772ba0a5f5bf666a28ae5db7b59ef96e465bdf"; + sha256 = "0dwffbfp3ay8y35hhc37ip61xdh522f5rfs097f3ia121h9x1mvj"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "libsmbclient binding for Python"; - homepage = https://github.com/hamano/pysmbc; + homepage = "https://github.com/hamano/pysmbc"; license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/pkgs/development/python-modules/pytest-faulthandler/default.nix deleted file mode 100644 index b9ac354abfd7..000000000000 --- a/pkgs/development/python-modules/pytest-faulthandler/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools_scm -, pytest -, pytest-mock -, pythonOlder -, faulthandler -}: - -buildPythonPackage rec { - pname = "pytest-faulthandler"; - version = "2.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "ed72bbce87ac344da81eb7d882196a457d4a1026a3da4a57154dacd85cd71ae5"; - }; - - nativeBuildInputs = [ setuptools_scm pytest ]; - checkInputs = [ pytest-mock ]; - propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Py.test plugin that activates the fault handler module for tests"; - homepage = https://github.com/pytest-dev/pytest-faulthandler; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix new file mode 100644 index 000000000000..2c0c23ebdca1 --- /dev/null +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +, pytest, pytest-metadata, setuptools_scm }: + +buildPythonPackage rec { + pname = "pytest-html"; + version = "2.1.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1iap9rzxx9pkvz6im3px8xj37pb098lvvf9yiqh93qq5w68w6jka"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pytest pytest-metadata ]; + + meta = with stdenv.lib; { + description = "Plugin for generating HTML reports"; + homepage = "https://github.com/pytest-dev/pytest-html"; + license = licenses.mpl20; + maintainers = with maintainers; [ mpoquet ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix new file mode 100644 index 000000000000..369ddf2c4767 --- /dev/null +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pytest, setuptools_scm }: + +buildPythonPackage rec { + pname = "pytest-metadata"; + version = "1.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fk6icip2x1nh4kzhbc8cnqrs77avpqvj7ny3xadfh6yhn9aaw90"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Plugin for accessing test session metadata"; + homepage = "https://github.com/pytest-dev/pytest-metadata"; + license = licenses.mpl20; + maintainers = with maintainers; [ mpoquet ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 52eeccc7cd07..40ab69c5735d 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , pytest , pylint , six @@ -9,11 +10,12 @@ buildPythonPackage rec { pname = "pytest-pylint"; - version = "0.14.1"; + version = "0.15.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1v6jqxbvzaw6v3xxwd689agy01k0j06q5c3q8gn2f3jlkrvylf4c"; + sha256 = "0sbmnw3bly4pry5lp6q6g0r8xzaxwbdlf0k19k8pygkhllnj6gnx"; }; buildInputs = [ pytestrunner ]; @@ -29,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "pytest plugin to check source code with pylint"; - homepage = https://github.com/carsongee/pytest-pylint; + homepage = "https://github.com/carsongee/pytest-pylint"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix new file mode 100644 index 000000000000..6bdf1089d5d5 --- /dev/null +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, greenlet +, pytest +, decorator +}: + +buildPythonPackage rec { + pname = "pytest-twisted"; + version = "1.12"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "bb9af117c5c6063d9ef20ffdf2fa297caaf57de5a687e4d3607db7b0a6f74fea"; + }; + + propagatedBuildInputs = [ greenlet pytest decorator ]; + + meta = with lib; { + description = "A twisted plugin for py.test"; + homepage = "https://github.com/pytest-dev/pytest-twisted"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/python-baseconv/default.nix b/pkgs/development/python-modules/python-baseconv/default.nix new file mode 100644 index 000000000000..f9ac014919c2 --- /dev/null +++ b/pkgs/development/python-modules/python-baseconv/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: +buildPythonPackage rec { + pname = "python-baseconv"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version ; + sha256 = "0539f8bd0464013b05ad62e0a1673f0ac9086c76b43ebf9f833053527cd9931b"; + }; + + pythonImportsCheck = [ "baseconv" ]; + + meta = with lib; { + description = "Python module to convert numbers from base 10 integers to base X strings and back again"; + homepage = "https://github.com/semente/python-baseconv"; + license = licenses.psfl; + maintainers = with maintainers; [ rakesh4g ]; + }; +} diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index a9377c4a1c21..df7e07e55239 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-jose"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mpdavis"; repo = "python-jose"; rev = version; - sha256 = "1ahq4m86z504bnlk9z473r7r3dprg5m39900rld797hbczdhqa4f"; + sha256 = "1gnn0zy03pywj65ammy3sd07knzhjv8n5jhx1ir9bikgra9v0iqh"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 74eadd9b2de3..c8bb1b5fa6f8 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -21,13 +21,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.31.8"; + version = "0.31.9"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "sha256:1h0w7x7d9g3z7vmxn5w7qxdkjya3sl0xfnklfaaaj8dkb5mjldpi"; + sha256 = "06hd6a1hhd57hrq4vbwfs0saplkhsrz2krv8kq9kw4fz4hx7zj74"; }; # The tests require all the providers, disable otherwise. @@ -53,8 +53,7 @@ buildPythonPackage rec { "test_pandas_completions" "test_matplotlib_completions" "test_snippet_parsing" - - ]; + ] ++ stdenv.lib.optional isPy27 "test_flake8_lint"; # checkPhase = '' # HOME=$TEMPDIR pytest -k "not test_pyqt_completion and not # ''; diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 8b46b105d69a..9f9818350bf2 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "python-mpv-jsonipc"; - version = "1.1.7"; + version = "1.1.8"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "iwalton3"; repo = "python-mpv-jsonipc"; rev = "v${version}"; - sha256 = "1a8lcvgwf7a19d4dj1wkkpxk44c2z9gsyz1xv4wpxi3gxlplcmcz"; + sha256 = "0f4nfzfka5n76n6dxmgcz0rkaws7a3jrgyh00va6lnfi7h6dsmx4"; }; # 'mpv-jsonipc' does not have any tests diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix index 2b08bbffa450..d83d25972450 100644 --- a/pkgs/development/python-modules/python-otr/default.nix +++ b/pkgs/development/python-modules/python-otr/default.nix @@ -24,10 +24,13 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure python implementation of OTR"; - homepage = https://github.com/AGProjects/otr; + homepage = "https://github.com/AGProjects/python-otr"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ edwtjo ]; + # The package itself does not support python3, and its transitive + # dependencies rely on namespace package support that does not work in + # Nix's python2 infra. See #74619 for details. + broken = true; }; - } diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 556be12872b5..39153f4a4daa 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.12"; + version = "1.13"; pname = "python-stdnum"; src = fetchPypi { inherit pname version; - sha256 = "19fb5asv0ngnbpiz1bqzq2jhgn845kv9hjcjajsgzgfp2k24f4sc"; + sha256 = "0q4128rjdgavywhzlm2gz2n5ybc9b9sxs81g50dvxf5q7z9q63qj"; }; checkInputs = [ nose ]; @@ -15,7 +15,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://arthurdejong.org/python-stdnum/; + homepage = "https://arthurdejong.org/python-stdnum/"; description = "Python module to handle standardized numbers and codes"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index 30c6dff048a0..ca82f8aa1870 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, lxml , oath , pycryptodome , requests @@ -10,15 +9,14 @@ buildPythonPackage rec { pname = "python-vipaccess"; - version = "0.10.3"; + version = "0.12"; src = fetchPypi { inherit pname version; - sha256 = "1m6b7qipiaj6pz86kjhyq5m5jxxijpk58gpsdkj5bn0wjl6x1pg2"; + sha256 = "0g6mmf896wp036263zkkvi3ff59zcrzssjsw7csfmbisiszgdnrj"; }; propagatedBuildInputs = [ - lxml oath pycryptodome requests diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix index a1893c88e0e0..6b9b94b603f4 100644 --- a/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "qdarkstyle"; - version = "2.8"; + version = "2.8.1"; src = fetchPypi { inherit version; pname = "QDarkStyle"; - sha256 = "6a967c4b664446f8bed9df12d1032cf68cb54f186bfc9cbfdbbc756bf9a5d475"; + sha256 = "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"; }; # No tests available @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "A dark stylesheet for Python and Qt applications"; - homepage = https://github.com/ColinDuquesnoy/QDarkStyleSheet; + homepage = "https://github.com/ColinDuquesnoy/QDarkStyleSheet"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix new file mode 100644 index 000000000000..7c36328f557b --- /dev/null +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -0,0 +1,103 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, cmake +, cvxpy +, cython +, numpy +, openblas +, pybind11 +, scikit-build +, spdlog + # Check Inputs +, qiskit-terra +, pytestCheckHook +, python +}: + +buildPythonPackage rec { + pname = "qiskit-aer"; + version = "0.4.1"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "Qiskit"; + repo = pname; + rev = version; + fetchSubmodules = true; # fetch muparserx and other required libraries + sha256 = "1j2pv6jx5dlzanjp1qnf32s53d8jrlpv96nvymznkcnjvqn60gv9"; + }; + + nativeBuildInputs = [ + cmake + scikit-build + ]; + + buildInputs = [ + openblas + spdlog + ]; + + propagatedBuildInputs = [ + cvxpy + cython # generates some cython files at runtime that need to be cython-ized + numpy + pybind11 + ]; + + prePatch = '' + # remove dependency on PyPi cmake package, which isn't in Nixpkgs + substituteInPlace setup.py --replace "'cmake'" "" + ''; + + dontUseCmakeConfigure = true; + + cmakeFlags = [ + "-DBUILD_TESTS=True" + "-DAER_THRUST_BACKEND=OMP" + ]; + + # Needed to find qiskit.providers.aer modules in cython. This exists in GitHub, don't know why it isn't copied by default + postFixup = '' + touch $out/${python.sitePackages}/qiskit/__init__.pxd + ''; + + # *** Testing *** + + pythonImportsCheck = [ + "qiskit.providers.aer" + "qiskit.providers.aer.backends.qasm_simulator" + "qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output + ]; + checkInputs = [ + qiskit-terra + pytestCheckHook + ]; + dontUseSetuptoolsCheck = true; # Otherwise runs tests twice + + preCheck = '' + # Tests include a compiled "circuit" which is auto-built in $HOME + export HOME=$(mktemp -d) + # move tests b/c by default try to find (missing) cython-ized code in /build/source dir + cp -r test $HOME + + # Add qiskit-aer compiled files to cython include search + pushd $HOME + ''; + postCheck = '' + popd + ''; + + meta = with lib; { + description = "High performance simulators for Qiskit"; + homepage = "https://github.com/QISKit/qiskit-aer"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + # Doesn't build on aarch64 (libmuparserx issue). + # Can fix by building muparserx from source (https://github.com/beltoforion/muparserx) + # or in future updates (e.g. Raspberry Pi enabled via https://github.com/Qiskit/qiskit-aer/pull/651 & https://github.com/Qiskit/qiskit-aer/pull/660) + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix new file mode 100644 index 000000000000..ee01a5c4cb56 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -0,0 +1,131 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, cvxopt +, dlx +, docplex +, fastdtw +, h5py +, networkx +, numpy +, psutil +, qiskit-ignis +, qiskit-terra +, quandl +, scikitlearn + # Check Inputs +, parameterized +, pytestCheckHook +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-aqua"; + version = "0.6.5"; + + disabled = pythonOlder "3.5"; + + # Pypi's tarball doesn't contain tests + src = fetchFromGitHub { + owner = "Qiskit"; + repo = "qiskit-aqua"; + rev = version; + sha256 = "03c0gl2qxyngf3cccjghjb0bhp0w78sdbvhim08cimf3cd577ldz"; + }; + + # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. + propagatedBuildInputs = [ + cvxopt + docplex + dlx # Python Dancing Links package + fastdtw + h5py + networkx + numpy + psutil + qiskit-terra + qiskit-ignis + quandl + scikitlearn + ]; + + # *** NOTE *** + # We make pyscf optional in this package, due to difficulties packaging it in Nix (test failures, complicated flags, etc). + # See nixpkgs#78772, nixpkgs#83447. You are welcome to try to package it yourself, + # or use the Nix User Repository version (https://github.com/drewrisinger/nur-packages). + # It can also be installed at runtime from the pip wheel. + # We disable appropriate tests below to allow building without pyscf installed + + postPatch = '' + substituteInPlace setup.py \ + --replace "pyscf; sys_platform == 'linux' or (python_version < '3.8' and sys_platform != 'win32')" "" + + # Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included + echo -e "\nimport warnings\ntry: import pyscf;\nexcept:\n " \ + "warnings.warn('pyscf is not supported on Nixpkgs so some qiskit features will fail." \ + "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ + "See https://github.com/NixOS/nixpkgs/pull/83447 for details', ImportWarning)\n" \ + >> qiskit/chemistry/__init__.py + ''; + + checkInputs = [ parameterized qiskit-aer pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + pythonImportsCheck = [ + "qiskit.aqua" + "qiskit.aqua.algorithms" + "qiskit.chemistry" + "qiskit.finance" + "qiskit.ml" + "qiskit.optimization" + ]; + pytestFlagsArray = [ + # Disabled b/c missing pyscf + "--ignore=test/chemistry/test_qeom_ee.py" + "--ignore=test/chemistry/test_qeom_vqe.py" + "--ignore=test/chemistry/test_vqe_uccsd_adapt.py" + + # Following tend to be slow tests, all pass + "--ignore=test/aqua/test_vqc.py" + "--ignore=test/aqua/test_hhl.py" + "--ignore=test/aqua/test_qgan.py" + "--ignore=test/aqua/test_mcr.py" + "--ignore=test/aqua/test_mcu1.py" + "--ignore=test/aqua/test_vqe.py" + ]; + disabledTests = [ + # Disabled due to missing pyscf + "test_validate" # test/chemistry/test_inputparser.py + + # Disabling slow tests > 10 seconds + "test_clique_vqe" + "test_delta_3_qasm" + "test_evaluate_qasm_mode" + "test_evolve_1_suzuki" + "test_exact_cover_vqe" + "test_exchangedata" + "test_expected_value_0_statevector" + "test_expected_value_1_qasm" + "test_expected_value_2_statevector" + "test_graph_partition_vqe" + "test_lookup_rotation" + "test_mct_with_dirty_ancillae_15" + "test_mcrz_11" + "test_measurement_error_mitigation_auto_refresh" + "test_qgan_training" + "test_qsvm_multiclass" + "test_shor_factoring_0" + "test_vertex_cover_vqe" + "test_vqc_with_raw_feature_vector_on_wine" + "test_vqe_2_iqpe" + "test_vqe_qasm" + "test_wikipedia" + ]; + + meta = with lib; { + description = "An extensible library of quantum computing algorithms"; + homepage = "https://github.com/QISKit/qiskit-aqua"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix new file mode 100644 index 000000000000..bed1bffe1a67 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -0,0 +1,91 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, arrow +, nest-asyncio +, qiskit-terra +, requests +, requests_ntlm +, websockets + # Visualization inputs +, ipykernel +, ipyvuetify +, ipywidgets +, matplotlib +, nbconvert +, nbformat +, plotly +, pyperclip +, seaborn + # check inputs +, pytestCheckHook +, pproxy +, vcrpy +}: + +buildPythonPackage rec { + pname = "qiskit-ibmq-provider"; + version = "0.6.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Qiskit"; + repo = pname; + rev = version; + sha256 = "0arbhwaa2kx04jbrj6hk3vvn92wdk6lrr9zx36pr6p22r0yyxnj9"; + }; + + propagatedBuildInputs = [ + arrow + nest-asyncio + qiskit-terra + requests + requests_ntlm + websockets + # Visualization/Jupyter inputs + ipykernel + ipyvuetify + ipywidgets + matplotlib + nbconvert + nbformat + plotly + pyperclip + seaborn + ]; + + # websockets seems to be pinned b/c in v8+ it drops py3.5 support. Not an issue here (usually py3.7+, and disabled for older py3.6) + prePatch = '' + substituteInPlace requirements.txt --replace "websockets>=7,<8" "websockets" + substituteInPlace setup.py --replace "websockets>=7,<8" "websockets" + ''; + + # Most tests require credentials to run on IBMQ + checkInputs = [ + pytestCheckHook + pproxy + vcrpy + ]; + dontUseSetuptoolsCheck = true; + + pythonImportsCheck = [ "qiskit.providers.ibmq" ]; + # These disabled tests require internet connection, aren't skipped elsewhere + disabledTests = [ + "test_old_api_url" + "test_non_auth_url" + "test_non_auth_url_with_hub" + ]; + + # Skip tests that rely on internet access (mostly to IBM Quantum Experience cloud). + # Options defined in qiskit.terra.test.testing_options.py::get_test_options + QISKIT_TESTS = "skip_online"; + + meta = with lib; { + description = "Qiskit provider for accessing the quantum devices and simulators at IBMQ"; + homepage = "https://github.com/Qiskit/qiskit-ibmq-provider"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix new file mode 100644 index 000000000000..2f0a99dc0f82 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -0,0 +1,62 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, numpy +, qiskit-terra +, scipy + # Check Inputs +, pytestCheckHook +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-ignis"; + version = "0.2.0"; + + disabled = pythonOlder "3.5"; + + # Pypi's tarball doesn't contain tests + src = fetchFromGitHub { + owner = "Qiskit"; + repo = pname; + rev = version; + sha256 = "08a60xk5dq5wmqc23r4hr2v2nsf9hs0ybz832vbnd6d80dl6izyc"; + }; + + patches = [ + # Update tests for compatibility with qiskit-aer 0.4 (#342). Remove in version > 0.2.0 + (fetchpatch { + url = "https://github.com/Qiskit/qiskit-ignis/commit/d78c494579f370058e68e360f10149db81b52477.patch"; + sha256 = "0ygkllf95c0jfvjg7gn399a5fd0wshsjpcn279kj7855m8j306h6"; + }) + # Fix statevector test over-eager validation (PR #333) + (fetchpatch { + url = "https://github.com/Qiskit/qiskit-ignis/commit/7cc8eb2e852b383ea429233fa43d3728931f1707.patch"; + sha256 = "0mdygykilg4qivdaa731z3y56l3ax4jp1sil9npqv0gn4p03c9g5"; + }) + ]; + + propagatedBuildInputs = [ + numpy + qiskit-terra + scipy + ]; + + # Tests + pythonImportsCheck = [ "qiskit.ignis" ]; + dontUseSetuptoolsCheck = true; + preCheck = ''export HOME=$TMPDIR''; + checkInputs = [ + pytestCheckHook + qiskit-aer + ]; + + meta = with lib; { + description = "Qiskit tools for quantum hardware verification, noise characterization, and error correction"; + homepage = "https://github.com/QISKit/qiskit-ignis"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 89d02f7b8034..3b5c9e706dc4 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -1,65 +1,49 @@ -{ stdenv -, isPy3k +{ lib +, pythonOlder , buildPythonPackage -, fetchPypi -, numpy -, scipy -, sympy -, matplotlib -, networkx -, ply -, pillow -, cffi -, requests -, requests_ntlm -, IBMQuantumExperience -, jsonschema -, psutil -, cmake -, llvmPackages +, fetchFromGitHub + # Python Inputs +, qiskit-aer +, qiskit-aqua +, qiskit-ibmq-provider +, qiskit-ignis +, qiskit-terra + # Check Inputs +, pytestCheckHook }: buildPythonPackage rec { pname = "qiskit"; - version = "0.14.0"; + # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history + version = "0.17.0"; - disabled = !isPy3k; + disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "d086a21d0eee61bb12e1f2cd6148a7292005fd10584ca33d6c404dd5c53ba95f"; + src = fetchFromGitHub { + owner = "Qiskit"; + repo = "qiskit"; + rev = version; + sha256 = "1cnjcvvzklyq102fipqnwd5ham0sp0451gp7j79cwwsxzvji6pcc"; }; - buildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp; - propagatedBuildInputs = [ - numpy - matplotlib - networkx - ply - scipy - sympy - pillow - cffi - requests - requests_ntlm - IBMQuantumExperience - jsonschema - psutil + qiskit-aer + qiskit-aqua + qiskit-ibmq-provider + qiskit-ignis + qiskit-terra ]; - # Pypi's tarball doesn't contain tests - doCheck = false; + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + # following doesn't work b/c they are distributed across different nix sitePackages dirs. Tested with pytest though. + # pythonImportsCheck = [ "qiskit" "qiskit.terra" "qiskit.ignis" "qiskit.aer" "qiskit.aqua" ]; meta = { - description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications"; - homepage = https://github.com/QISKit/qiskit-terra; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ - pandaman - ]; - # Needs to be updated and have its new dependencies added - broken = true; + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit/releases"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drewrisinger pandaman ]; }; } diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index bd73a0213310..2d78b626092d 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -10,12 +10,13 @@ buildPythonPackage rec { pname = "quandl"; - version = "3.4.8"; + version = "3.5.0"; + disabled = !isPy3k; src = fetchPypi { inherit version; pname = "Quandl"; - sha256 = "179knz21filz6x6qk66b7dk2pj1x4jnvxxd5x71ap19f367dkkb3"; + sha256 = "0zpw0nwqr4g56l9z4my0fahfgpcmfx74acbmv6nfx1dmq5ggraf3"; }; doCheck = true; @@ -46,10 +47,10 @@ buildPythonPackage rec { pyasn1 ]; - meta = { - homepage = "https://github.com/quandl/quandl-python"; + meta = with lib; { description = "Quandl Python client library"; - maintainers = [ lib.maintainers.ilya-kolpakov ]; - license = lib.licenses.mit; + homepage = "https://github.com/quandl/quandl-python"; + license = licenses.mit; + maintainers = with maintainers; [ ilya-kolpakov ]; }; } diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix new file mode 100644 index 000000000000..6cdfa2aa15b1 --- /dev/null +++ b/pkgs/development/python-modules/roku/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27 +}: + +buildPythonPackage rec { + version = "4.1"; + pname = "roku"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "jcarbaugh"; + repo = "python-roku"; + rev = "v${version}"; + sha256 = "09mq59kjll7gj1srw4qc921ncsm7cld95sbz5v3p2bwmgckpqza7"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytest flask ]; + pythonImportsCheck = [ "roku" ]; + + meta = with stdenv.lib; { + description = "Screw remotes. Control your Roku with Python."; + homepage = "https://github.com/jcarbaugh/python-roku"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 66340f917704..6bcc05fb34d6 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,12 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose }: +{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: buildPythonPackage rec { pname = "rope"; - version = "0.14.0"; + version = "0.16.0"; + + disabled = pythonAtLeast "3.8"; # 0.17 should support Python 3.8 src = fetchPypi { inherit pname version; - sha256 = "1bwayj0hh459s3yh0sdrxksr9wfilgi3a49izfaj06kvgyladif5"; + sha256 = "1zlxdrs6ww2hm41izz67h67z9dkm0rlgw8m04vygaip0q91030yj"; }; checkInputs = [ nose ]; @@ -17,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python refactoring library"; - homepage = https://github.com/python-rope/rope; + homepage = "https://github.com/python-rope/rope"; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index afd915ed8407..92def3935e72 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,22 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose, dnspython -, chardet, lmtpd, python-daemon, six, jinja2, mock }: +{ stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd +, python-daemon, six, jinja2, mock, click }: buildPythonPackage rec { pname = "salmon-mail"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0ddd9nwdmiibk3jaampznm8nai5b7zalp0f8c65l71674300bqnw"; + sha256 = "0q2m6xri1b7qv46rqpv2qfdgk2jvswj8lpaacnxwjna3m685fhfx"; }; - checkInputs = [ nose jinja2 mock ]; - propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six ]; + checkInputs = [ jinja2 mock ]; + propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six click ]; + + # Darwin tests fail without this. See: + # https://github.com/NixOS/nixpkgs/pull/82166#discussion_r399909846 + __darwinAllowLocalNetworking = true; # The tests use salmon executable installed by salmon itself so we need to add # that to PATH checkPhase = '' - PATH=$out/bin:$PATH nosetests . + PATH=$out/bin:$PATH python setup.py test ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 8d459e249848..745723a01bc7 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -1,7 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi, wheel, setuptools, packaging -, cmake, ninja, cython, codecov, coverage, six, virtualenv, pathpy -, pytest, pytestcov, pytest-virtualenv, pytest-mock, pytestrunner -, requests, flake8 }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, distro +, packaging +, setuptools +, wheel +# Test Inputs +, cmake +, codecov +, coverage +, cython +, flake8 +, ninja +, pathpy +, pytest +, pytestcov +, pytest-mock +, pytestrunner +, pytest-virtualenv +, requests +, six +, virtualenv +}: buildPythonPackage rec { pname = "scikit-build"; @@ -12,15 +33,41 @@ buildPythonPackage rec { sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526"; }; - propagatedBuildInputs = [ wheel setuptools packaging ]; - checkInputs = [ - cmake ninja cython codecov coverage six pathpy - pytest pytestcov pytest-mock pytest-virtualenv pytestrunner - requests flake8 + propagatedBuildInputs = [ + distro + packaging + setuptools + wheel + ]; + checkInputs = [ + cmake + codecov + coverage + cython + flake8 + ninja + pathpy + pytest + pytestcov + pytest-mock + pytestrunner + pytest-virtualenv + requests + six + virtualenv ]; dontUseCmakeConfigure = true; + # scikit-build PR #458. Remove in version > 0.10.0 + patches = [ + (fetchpatch { + name = "python38-platform_linux_distribution-fix-458"; + url = "https://github.com/scikit-build/scikit-build/commit/faa7284e5bc4c72bc8744987acdf3297b5d2e7e4.patch"; + sha256 = "1hgl3cnkf266zaw534b64c88waxfz9721wha0m6j3hsnxk76ayjv"; + }) + ]; + disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ "test_hello_develop" # tries setuptools develop install "test_source_distribution" # pip has no way to install missing dependencies @@ -35,9 +82,9 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = http://scikit-build.org/; description = "Improved build system generator for CPython C/C++/Fortran/Cython extensions"; + homepage = "http://scikit-build.org/"; license = with licenses; [ mit bsd2 ]; # BSD due to reuses of PyNE code - maintainers = [ maintainers.FlorianFranzen ]; + maintainers = with maintainers; [ FlorianFranzen ]; }; } diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 8fee4b6631ab..05c0c43c15c7 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,13 +1,60 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore, - testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, - service-identity, parsel, pydispatcher, cssselect, lib }: +{ stdenv +, buildPythonPackage +, isPy27 +, fetchPypi +, glibcLocales +, pytest +, testfixtures +, pillow +, twisted +, cryptography +, w3lib +, lxml +, queuelib +, pyopenssl +, service-identity +, parsel +, pydispatcher +, cssselect +, zope_interface +, protego +, lib +, jmespath +, sybil +, pytest-twisted +, botocore +}: + buildPythonPackage rec { - version = "1.8.0"; + version = "2.0.1"; pname = "Scrapy"; - checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; + disabled = isPy27; + + checkInputs = [ + glibcLocales + jmespath + pytest + sybil + testfixtures + pillow + pytest-twisted + botocore + ]; + propagatedBuildInputs = [ - six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher + twisted + cryptography + cssselect + lxml + parsel + pydispatcher + pyopenssl + queuelib + service-identity + w3lib + zope_interface + protego ]; patches = [ @@ -18,20 +65,20 @@ buildPythonPackage rec { ./permissions-fix.patch ]; - LC_ALL="en_US.UTF-8"; + LC_ALL = "en_US.UTF-8"; # Disable doctest plugin—enabled in the shipped pytest.ini—because it causes pytest to hang # Ignore proxy tests because requires mitmproxy # Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean" # Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396 checkPhase = '' - substituteInPlace pytest.ini --replace "addopts = --doctest-modules" "addopts =" + substituteInPlace pytest.ini --replace "--doctest-modules" "" pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"} ''; src = fetchPypi { inherit pname version; - sha256 = "fe06576f9a4971de9dc0175c60fd92561e8275f2bad585c1cb5d65c5181b2db0"; + sha256 = "85581a01f4160a103ca9906ffa4e44474f4ecd1685f0934728892c58ebf111f6"; }; postInstall = '' @@ -42,7 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; - homepage = https://scrapy.org/; + homepage = "https://scrapy.org/"; license = licenses.bsd3; maintainers = with maintainers; [ drewkett marsam ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 8555c024c76a..7cf062765d3b 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -6,8 +6,9 @@ }: ## Usage -# In NixOS, simply add the `udev` multiple output to services.udev.packages: -# services.udev.packages = [ pkgs.python3Packages.seabreeze.udev ]; +# In NixOS, add the package to services.udev.packages for non-root plugdev +# users to get device access permission: +# services.udev.packages = [ pkgs.python3Packages.seabreeze ]; buildPythonPackage rec { pname = "seabreeze"; @@ -20,11 +21,9 @@ buildPythonPackage rec { sha256 = "0bc2s9ic77gz9m40w89snixphxlzib60xa4f49n4zasjrddfz1l8"; }; - outputs = [ "out" "udev" ]; - postInstall = '' - mkdir -p $udev/lib/udev/rules.d - cp misc/10-oceanoptics.rules $udev/lib/udev/rules.d/10-oceanoptics.rules + mkdir -p $out/etc/udev/rules.d + cp misc/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules ''; # underlying c libraries are tested and fail diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 36f4f82cb3fe..6a7bb38a74d1 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { name = "sfepy_${version}"; - version = "2019.2"; + version = "2019.4"; src = fetchurl { url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz"; - sha256 = "17dj0wbchcfa6x27yx4d4jix4z4nk6r2640xkqcsw0mf62x5l1pj"; + sha256 = "1l9vgcw09l6bwhgfzlbn68fzpvns25r6nkd1pcp7hz5165hs6zzn"; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { postPatch = '' # broken test rm tests/test_homogenization_perfusion.py + rm tests/test_splinebox.py # slow tests rm tests/test_input_*.py diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 220726733dcb..d895f00285d4 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.6.4.post2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f"; + sha256 = "07lmrihj6pa7f99m97hbf2anqlhhwippcdz03bqkyihnlkhry6p2"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch index f75ad7a9486e..4081936abe36 100644 --- a/pkgs/development/python-modules/shapely/library-paths.patch +++ b/pkgs/development/python-modules/shapely/library-paths.patch @@ -1,9 +1,9 @@ diff --git a/shapely/geos.py b/shapely/geos.py -index 09bf1ab..837aa98 100644 +index d5a67d2..19b7ffc 100644 --- a/shapely/geos.py +++ b/shapely/geos.py -@@ -55,100 +55,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): - "Could not find lib {0} or load any of its variants {1}.".format( +@@ -61,123 +61,11 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): + "Could not find lib {} or load any of its variants {}.".format( libname, fallbacks or [])) -_lgeos = None @@ -16,15 +16,25 @@ index 09bf1ab..837aa98 100644 - if len(geos_whl_so) == 1: - _lgeos = CDLL(geos_whl_so[0]) - LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- elif hasattr(sys, 'frozen'): +- geos_pyinstaller_so = glob.glob(os.path.join(sys.prefix, 'libgeos_c-*.so.*')) +- if len(geos_pyinstaller_so) == 1: +- _lgeos = CDLL(geos_pyinstaller_so[0]) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- elif os.getenv('CONDA_PREFIX', ''): +- # conda package. +- _lgeos = CDLL(os.path.join(sys.prefix, 'lib', 'libgeos_c.so')) - else: - alt_paths = [ - 'libgeos_c.so.1', - 'libgeos_c.so', -- # anaconda -- os.path.join(sys.prefix, "lib", "libgeos_c.so"), - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) -- free = load_dll('c').free +- # Necessary for environments with only libc.musl +- c_alt_paths = [ +- 'libc.musl-x86_64.so.1' +- ] +- free = load_dll('c', fallbacks=c_alt_paths).free - free.argtypes = [c_void_p] - free.restype = None - @@ -32,10 +42,19 @@ index 09bf1ab..837aa98 100644 - # Test to see if we have a delocated wheel with a GEOS dylib. - geos_whl_dylib = os.path.abspath(os.path.join(os.path.dirname( - __file__), '.dylibs/libgeos_c.1.dylib')) +- - if os.path.exists(geos_whl_dylib): -- _lgeos = CDLL(geos_whl_dylib) -- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- handle = CDLL(None) +- if hasattr(handle, "initGEOS_r"): +- LOG.debug("GEOS already loaded") +- _lgeos = handle +- else: +- _lgeos = CDLL(geos_whl_dylib) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) - +- elif os.getenv('CONDA_PREFIX', ''): +- # conda package. +- _lgeos = CDLL(os.path.join(sys.prefix, 'lib', 'libgeos_c.dylib')) - else: - if hasattr(sys, 'frozen'): - try: @@ -52,12 +71,12 @@ index 09bf1ab..837aa98 100644 - os.path.join(sys._MEIPASS, 'libgeos_c.1.dylib')) - else: - alt_paths = [ -- # anaconda -- os.path.join(sys.prefix, "lib", "libgeos_c.dylib"), - # The Framework build from Kyng Chaos - "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS", - # macports - '/opt/local/lib/libgeos_c.dylib', +- # homebrew +- '/usr/local/lib/libgeos_c.dylib', - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - @@ -66,30 +85,34 @@ index 09bf1ab..837aa98 100644 - free.restype = None - -elif sys.platform == 'win32': -- try: -- egg_dlls = os.path.abspath( -- os.path.join(os.path.dirname(__file__), 'DLLs')) -- if hasattr(sys, "frozen"): -- wininst_dlls = os.path.normpath( -- os.path.abspath(sys.executable + '../../DLLS')) -- else: -- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") -- original_path = os.environ['PATH'] -- os.environ['PATH'] = "%s;%s;%s" % \ -- (egg_dlls, wininst_dlls, original_path) -- _lgeos = load_dll("geos_c.dll", fallbacks=[ -- os.path.join(sys.prefix, "Library", "lib", "geos_c.dll"), -- ]) -- except (ImportError, WindowsError, OSError): -- raise -- -- def free(m): +- if os.getenv('CONDA_PREFIX', ''): +- # conda package. +- _lgeos = CDLL(os.path.join(sys.prefix, 'Library', 'bin', 'geos_c.dll')) +- else: - try: -- cdll.msvcrt.free(m) -- except WindowsError: -- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 -- pass +- egg_dlls = os.path.abspath( +- os.path.join(os.path.dirname(__file__), 'DLLs')) +- if hasattr(sys, '_MEIPASS'): +- wininst_dlls = sys._MEIPASS +- elif hasattr(sys, "frozen"): +- wininst_dlls = os.path.normpath( +- os.path.abspath(sys.executable + '../../DLLS')) +- else: +- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") +- original_path = os.environ['PATH'] +- os.environ['PATH'] = "%s;%s;%s" % \ +- (egg_dlls, wininst_dlls, original_path) +- _lgeos = load_dll("geos_c.dll") +- except (ImportError, WindowsError, OSError): +- raise - +- def free(m): +- try: +- cdll.msvcrt.free(m) +- except WindowsError: +- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 +- pass + -elif sys.platform == 'sunos5': - _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) - free = CDLL('libc.so.1').free diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 0c88dcd0fe20..4db1172e0410 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.21.3"; + version = "1.22.0"; src = fetchPypi { inherit pname version; - sha256 = "1mbqdk3jdga4r08dg66j7kawmb40rs0y3nnwb9vh3c1safgqjmiz"; + sha256 = "0pgkd0pngmygafld283zfx7whlv6yp3ldgd4sjv8bxjcsb19iw59"; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library and command-line utility for Shodan"; - homepage = https://github.com/achillean/shodan-python; + homepage = "https://github.com/achillean/shodan-python"; license = licenses.mit; maintainers = with maintainers; [ lihop ]; }; diff --git a/pkgs/development/python-modules/simplekml/default.nix b/pkgs/development/python-modules/simplekml/default.nix index be149e7edea4..4f6cc190f0ef 100644 --- a/pkgs/development/python-modules/simplekml/default.nix +++ b/pkgs/development/python-modules/simplekml/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "simplekml"; - version = "1.3.3"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "08l24gfql83yjcdqb51nnnvckbnfb7bl89am4q9zr0fslrbcn3vf"; + sha256 = "17h48r1dsfz4g9xcxh1xq85h20hiz7qzzymc1gla96bj2wh4wyv5"; }; - doCheck = false; # no tests are defined in 1.3.3 + doCheck = false; # no tests are defined in 1.3.5 meta = with lib; { description = "Generate KML with as little effort as possible"; diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 8a6971ceb8f8..48400f910c4f 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -7,8 +7,8 @@ }: buildPythonPackage { - name = "slob"; - verison = "unstable-2016-11-03"; + pname = "slob"; + version = "unstable-2016-11-03"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix index 011fa1799abd..273972cbe4ee 100644 --- a/pkgs/development/python-modules/sly/default.nix +++ b/pkgs/development/python-modules/sly/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "sly"; - version = "0.3"; + version = "0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "be6a3825b042a9e1b6f5730fc747e6d983c917f0f002d798d0b9f86ca5c05ad9"; + sha256 = "0an31bm5m8wqwphanmcsbbnmycy6l4xkmg4za4bwq8hk4dm2dwp5"; }; checkInputs = [ pytest ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "An improved PLY implementation of lex and yacc for Python 3"; - homepage = https://github.com/dabeaz/sly; + homepage = "https://github.com/dabeaz/sly"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index 18a7c2bb209f..9f0b805a19da 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "snscrape"; - version = "0.3.0"; + version = "0.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1f3lyq06l8s4kcsmwbxcwcxnv6mvz9c3zj70np8vnx149p3zi983"; + sha256 = "11jv5mv3l11qjlsjihd74gc1jafq0i7360cksqjkx1wv2hcc32rf"; }; # There are no tests; make sure the executable works. @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ]; meta = with lib; { - homepage = https://github.com/JustAnotherArchivist/snscrape; + homepage = "https://github.com/JustAnotherArchivist/snscrape"; description = "A social networking service scraper in Python"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ivan ]; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 4a44b7d0b7aa..0af09cc01ce7 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "soco"; - version = "0.18.1"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "de033ad69f86a655f50d407648b3aa2dd9647c69fd7bb317e9adfcd38a1adf4b"; + sha256 = "0dgca286vhrabm4r4jj545k895z6w2c70ars06vrjhf9cpgg7qck"; }; postPatch = '' @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; meta = { - homepage = http://python-soco.com/; + homepage = "http://python-soco.com/"; description = "A CLI and library to control Sonos speakers"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index f052da2bf7b0..306737c40028 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.0.4"; + version = "2.0.5"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "126jaslg8cfap2is3sy3v13xpl9drb80yc5lfsm1nw5s2xcxklqw"; + sha256 = "01zvmqilnndh2b257z7bhcc7av5vhjm1g8gmdiiw15gcd2xfmqjs"; }; propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 4d7eff7fd025..1f1558b23c39 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,43 +1,43 @@ [{ "pname": "de_core_news_md", - "version": "2.2.0", - "sha256": "1n61jg0mxpl5mqpydclq9d2xds14v0blnb0plmnf7qhzzfhrmxq9", + "version": "2.2.5", + "sha256": "1jkc4r0f1916k5qpmpnwawsbnrbscq250q7b1llgxi70f2xyw9gk", "license": "cc-by-sa-40" }, { "pname": "de_core_news_sm", - "version": "2.2.0", - "sha256": "06g2snm57k64il3plgn20l27a00dsr9dcxkyyqj6pq5ih91mfycb", + "version": "2.2.5", + "sha256": "10z30hirfwa692m0zp6wk60ccvqj84i5vjaiyyzd21innysb5y3g", "license": "cc-by-sa-40" }, { "pname": "el_core_news_md", - "version": "2.2.0", - "sha256": "0xgyh5wj9mpbl2mdrk60i3m8wmgaxbf5qviy78qk8zb1jvnxzc2n", + "version": "2.2.5", + "sha256": "1jjmf6rf1hjgqswhpqq2l5w7s351k4kk93c7rr85iv2754f71h36", "license": "cc-by-sa-40" }, { "pname": "el_core_news_sm", - "version": "2.2.0", - "sha256": "0qbf16g6s1xfm2clnmrwr3m3vgmvvsziyhy6jbm6axh8c0fy0j8p", + "version": "2.2.5", + "sha256": "00h55fc27d3jfm3knyidz7a4rasiz7qs4wfs3sl0ndq815yvag0l", "license": "cc-by-sa-40" }, { "pname": "en_core_web_lg", - "version": "2.2.0", - "sha256": "1dxy43kf3vbz4jxc7jkr315hyzmi44v41lf09rax53f3s1jghsbh", + "version": "2.2.5", + "sha256": "1shd4gkshr4a92fhvrjhzn1abywnrcf548cv3dz8dhmi0wxa4klr", "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "2.2.0", - "sha256": "13fvr8z7fjhyzc9mm55ah6c2snpj27lrrc0rzgyb0hcg7ghd6v58", + "version": "2.2.5", + "sha256": "1x32vl2a75ps2iyhysjvdygd366zs546s82yzqwj2m7jcsdszrxy", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "2.2.0", - "sha256": "197afra99lhh84yi6wxvxdxibd1ikaybqfsq2nsmm7ahsw9s3kk5", + "version": "2.2.5", + "sha256": "1vna6zik7863hahxdgz0s80kbbfyw42h4c1k5jby9lkzr5jr1dk0", "license": "cc-by-sa-40" }, { @@ -48,44 +48,44 @@ }, { "pname": "es_core_news_md", - "version": "2.2.0", - "sha256": "0sdps0cdmsd2l3irsg63d874sba9vpn0san0n89rk8h3pa49dpab", + "version": "2.2.5", + "sha256": "0b50gd2mx1klr6ss0fsj58qmw2wpbawwv015pr9vq3j7jq805scl", "license": "cc-by-sa-40" }, { "pname": "es_core_news_sm", - "version": "2.2.0", - "sha256": "073dgna796lk4rm7f25gyyl2ml7dfsb4azd4jkk03kxkcy6ypnag", + "version": "2.2.5", + "sha256": "19hrpxg1a5bvf9j9wlm03rkxfkgrldky7alsgl8bdwnwq3vpbgfi", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_md", - "version": "2.2.0", - "sha256": "0061hnw03189z3ya1gb6506bq8yxrg17v9cywg7zbk6izakxcasr", + "version": "2.2.5", + "sha256": "1y4dqbcwa7gg6z8q84n0j4my7gyia7a2z7pln71sqa78pin06r9b", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_sm", - "version": "2.2.0", - "sha256": "0kj31kx4q9mm7ms622ph2i6pkl1ifm8s5ng3f3khf9ia0vr31vbq", + "version": "2.2.5", + "sha256": "1q2kvznbylyz4frxy5rbvpm5jvm7bfin8g3dks0c1k9hhdymv35y", "license": "cc-by-sa-40" }, { "pname": "it_core_news_sm", - "version": "2.2.0", - "sha256": "0gxmknd68kajak8jr443799bfd69pp5j0jnmcbnyx5abzyq6wkzx", + "version": "2.2.5", + "sha256": "02r3x308s5kn62xpa2cizxfw7cyjk48zm9i6r4vhs8kycmp9z0px", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "2.2.0", - "sha256": "1j63xnp96qavg8c960y83z752mmvp9qx92r458lydrg1ixmffx9r", + "version": "2.2.5", + "sha256": "0vy0cff1fw33srqyi93vj03rnzqr8f62p1hwi565b0sb8v3n4p08", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_sm", - "version": "2.2.0", - "sha256": "0s0wf3kxrhdzfkgrbxjc53hzin3w8v06iivazh6bpf6rhbiwzfr0", + "version": "2.2.5", + "sha256": "1kdn3qwlmmd52sjrvi97aiv7xp260bka009jjal79l3qrz4czrw1", "license": "mit" }, { @@ -96,8 +96,8 @@ }, { "pname": "pt_core_news_sm", - "version": "2.2.0", - "sha256": "1fi4wick1x96sj46idic1ad26l9zd2p5smi4v7mkry71xp7d9s13", + "version": "2.2.5", + "sha256": "02p617ybh6wqmq1scch9dgim44rhhj0k81sbw8nysv20pc6wb89a", "license": "cc-by-sa-40" }, { diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 58b24f0dd73e..a60a36413ac1 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2a5883456c0caba0dad90f07968c75a50d5fc425a3aa06d1c538472ddf8c7e22"; + sha256 = "02pkzcmxikcfvkvcfsclnhymzl1lc84jz6vmdaslbgh4j5vlp5ym"; }; propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ikalnytskyi/sphinxcontrib-openapi; + homepage = "https://github.com/ikalnytskyi/sphinxcontrib-openapi"; description = "OpenAPI (fka Swagger) spec renderer for Sphinx"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index e733c269cd0e..74ab81c2f08a 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "163z3j0sd9a7cc9pv9hcrh230gisvvi2fxabh1f6nzhfr8avrncr"; + sha256 = "0s2f9yxhfkfipbb06965gfjq4lg0khp5vcykijrx6dzxyh20vggm"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index f4d57ce579e7..1f9455c8087d 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a782fc5961a9dd48d520ddc1c868b960d54b8edb1116c21fc2e3c347fe5a4474"; + sha256 = "1sqjagabqccrc73a423smfjmiph7lfjzj26r6hn3j3vf3drm3rpj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 65fabc6c7bc4..82c45f3cb649 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -1,17 +1,19 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, intervaltree, jedi, pycodestyle, +{ stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server -, pyqtwebengine +, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch }: buildPythonPackage rec { pname = "spyder"; - version = "4.0.1"; + version = "4.1.2"; + + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4b279c16487d224368dd2213e1517185fa59fc528f539601fffb34ea97accb7b"; + sha256 = "0qyisrs9xkzx4hbyin9nasvl10qk7jlxrmyasxycz4zwnvzfvxzf"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; @@ -20,6 +22,7 @@ buildPythonPackage rec { intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server + atomicwrites pyxdg diff-match-patch ]; # There is no test for spyder @@ -32,7 +35,7 @@ buildPythonPackage rec { comment = "Scientific Python Development Environment"; desktopName = "Spyder"; genericName = "Python IDE"; - categories = "Application;Development;Editor;IDE;"; + categories = "Application;Development;IDE;"; }; postPatch = '' @@ -42,8 +45,12 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" ''; - # Create desktop item postInstall = '' + # add Python libs to env so Spyder subprocesses + # created to run compute kernels don't fail with ImportErrors + wrapProgram $out/bin/spyder3 --prefix PYTHONPATH : "$PYTHONPATH" + + # Create desktop item mkdir -p $out/share/icons cp spyder/images/spyder.svg $out/share/icons cp -r $desktopItem/share/applications/ $out/share @@ -66,6 +73,5 @@ buildPythonPackage rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 1e35d4024eb8..e6227e4ced3e 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "0qp9j8c92zbkwlbv5ywrszil6kvlkkf3wkc4krh2vdsrwd9cnf2g"; + sha256 = "0chnb421g4bsshbkx6d1xnhsda4250jsn8zyklg5p1vqyr12mhik"; }; postPatch = '' diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index a6d93465ffc2..cad0aa79705f 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { # https://github.com/tiangolo/fastapi/issues/683. Please update when # possible. FastAPI is currently Starlette's only dependent. - version = "0.12.9"; + version = "0.13.2"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0w44s8ynzy8w8dgm755c8jina9i4dd87vqkcv7jc1kwkg384w9i5"; + sha256 = "1ls8d121zyyhry5ji7gf7vjvhyqdpr4za3qx1llq48943fmaxxpq"; }; propagatedBuildInputs = [ @@ -59,7 +59,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://www.starlette.io/; + homepage = "https://www.starlette.io/"; description = "The little ASGI framework that shines"; license = licenses.bsd3; maintainers = with maintainers; [ wd15 ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 4acc694a572e..ff520c5ffe39 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.43.0"; + version = "2.44.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0jikvcapg2xp3w824wz0wn74mx91nl3vmd92a10il3gli2p4wcnp"; + sha256 = "0aaaf8dp989im2n0cdmslq0ys4ia970yl1irhxiwwqarmh6fap5i"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index eeef94e6c765..f46226891877 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -1,22 +1,33 @@ { buildPythonPackage -, pkgs -, testtools +# pkgs dependencies +, check +, cppunit +, pkg-config +, subunit + +# python dependencies +, fixtures +, hypothesis +, pytest , testscenarios +, testtools }: buildPythonPackage { - name = pkgs.subunit.name; - src = pkgs.subunit.src; + inherit (subunit) name src meta; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ check cppunit ]; propagatedBuildInputs = [ testtools ]; - checkInputs = [ testscenarios ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ pkgs.check pkgs.cppunit ]; - patchPhase = '' - sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py + checkInputs = [ testscenarios hypothesis fixtures pytest ]; + # ignore tests which call shell code, or call methods which haven't been implemented + checkPhase = '' + pytest python/subunit \ + --ignore=python/subunit/tests/test_{output_filter,test_protocol{,2}}.py ''; - meta = pkgs.subunit.meta; - + patchPhase = '' + sed -i 's/version=VERSION/version="${subunit.version}"/' setup.py + ''; } diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 8b1677a7b843..358c70d34254 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -1,31 +1,28 @@ -{ stdenv, buildPythonApplication, fetchPypi, fetchpatch -, pytest, nose }: +{ lib +, buildPythonApplication +, fetchPypi +, pytest +, nose +}: buildPythonApplication rec { - pname = "sybil"; - version = "1.0.9"; + pname = "sybil"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "41d2f1dba8fd1d8ead5e9b1220b590fab8b0d1ca01d43da08555b1fb08d4d8e8"; + sha256 = "0x34mzxvxj1kkld7sz9n90pdcinxcan56jg6cnnwkv87v7s1vna6"; }; - patches = [ - (fetchpatch { - url = https://github.com/cjw296/sybil/commit/6461d8156cfb68bd073ec613a5a516916e97e549.patch; - sha256 = "0aqny0i7l6g6d7vr025b90zz8wzszqdbmi05mp67dxw5xqjqvxj2"; - }) - ]; - checkInputs = [ pytest nose ]; checkPhase = '' py.test tests ''; - meta = with stdenv.lib; { - description = "Automated testing for the examples in your documentation."; - homepage = https://github.com/cjw296/sybil/; - license = licenses.mit; + meta = with lib; { + description = "Automated testing for the examples in your documentation"; + homepage = "https://github.com/cjw296/sybil"; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index f0593ba1bcce..5c63121812a6 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -10,28 +10,23 @@ buildPythonPackage rec { pname = "tbm-utils"; - version = "1.0.0"; + version = "2.5.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "08fb86b5ab469bafdbef19751abb6dc1e08a3043c373ea915e1b6e20d023b529"; + sha256 = "02bmra9f0p1irhbrklxk9nhkvgwkn8042hx7z6c00qlhac1wlba2"; }; - postPatch = '' - substituteInPlace setup.py --replace ",<19.3" "" - ''; + propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; # No tests in archive. doCheck = false; - disabled = pythonOlder "3.6"; - - propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; - meta = { - homepage = https://github.com/thebigmunch/tbm-utils; - license = with lib.licenses; [ mit ]; description = "A commonly-used set of utilities"; + homepage = "https://github.com/thebigmunch/tbm-utils"; + license = with lib.licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix b/pkgs/development/python-modules/tensorflow-estimator/1/default.nix index 39c667357c8f..3e3d50bc6f42 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/1/default.nix @@ -6,6 +6,9 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; + # This is effectively 1.15.0. Upstream tagged 1.15.0 by mistake before + # actually updating the version in setup.py, which is why this tag is called + # 1.15.1. version = "1.15.1"; format = "wheel"; diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/2/default.nix index 47ce0f83b02d..47ce0f83b02d 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/2/default.nix diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 99a3a978a4e7..b585ab4f81b5 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -42,7 +42,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "0135nxxvkmjzpd80r1g9fdkk9h62g0xlvp32g5zgk0hkma5kq0bx"; + sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix new file mode 100644 index 000000000000..e0108aed5ef6 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix @@ -0,0 +1,66 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k +, numpy +, wheel +, werkzeug +, protobuf +, grpcio +, markdown +, futures +, absl-py +}: + +# tensorflow/tensorboard is built from a downloaded wheel, because +# https://github.com/tensorflow/tensorboard/issues/719 blocks +# buildBazelPackage. + +buildPythonPackage rec { + pname = "tensorflow-tensorboard"; + version = "1.15.0"; + format = "wheel"; + + src = fetchPypi ({ + pname = "tensorboard"; + inherit version; + format = "wheel"; + } // (if isPy3k then { + python = "py3"; + sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac"; + } else { + python = "py2"; + sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1"; + })); + + propagatedBuildInputs = [ + numpy + werkzeug + protobuf + markdown + grpcio + absl-py + # not declared in install_requires, but used at runtime + # https://github.com/NixOS/nixpkgs/issues/73840 + wheel + ] ++ lib.optional (!isPy3k) futures; + + # in the absence of a real test suite, run cli and imports + checkPhase = '' + $out/bin/tensorboard --help > /dev/null + ''; + + pythonImportsCheck = [ + "tensorboard" + "tensorboard.backend" + "tensorboard.compat" + "tensorboard.data" + "tensorboard.plugins" + "tensorboard.summary" + "tensorboard.util" + ]; + + meta = with lib; { + description = "TensorFlow's Visualization Toolkit"; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix index 202b167c7e6c..202b167c7e6c 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix diff --git a/pkgs/development/python-modules/tensorflow/1/bin.nix b/pkgs/development/python-modules/tensorflow/1/bin.nix new file mode 100644 index 000000000000..05d59f9ed0ae --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/1/bin.nix @@ -0,0 +1,121 @@ +{ stdenv +, lib +, fetchurl +, buildPythonPackage +, isPy3k, pythonOlder, isPy38 +, astor +, gast +, google-pasta +, wrapt +, numpy +, six +, termcolor +, protobuf +, absl-py +, grpcio +, mock +, backports_weakref +, tensorflow-estimator_1 +, tensorflow-tensorboard +, cudaSupport ? false +, cudatoolkit ? null +, cudnn ? null +, nvidia_x11 ? null +, zlib +, python +, symlinkJoin +, keras-applications +, keras-preprocessing +, addOpenGLRunpath +}: + +# We keep this binary build for two reasons: +# - the source build doesn't work on Darwin. +# - the source build is currently brittle and not easy to maintain + +assert cudaSupport -> cudatoolkit != null + && cudnn != null + && nvidia_x11 != null; + +# unsupported combination +assert ! (stdenv.isDarwin && cudaSupport); + +let + packages = import ./binary-hashes.nix; + + variant = if cudaSupport then "-gpu" else ""; + pname = "tensorflow${variant}"; + +in buildPythonPackage { + inherit pname; + inherit (packages) version; + format = "wheel"; + + disabled = isPy38; + + src = let + pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; + pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot; + platform = if stdenv.isDarwin then "mac" else "linux"; + unit = if cudaSupport then "gpu" else "cpu"; + key = "${platform}_py_${pyver}_${unit}"; + in fetchurl packages.${key}; + + propagatedBuildInputs = [ + protobuf + numpy + termcolor + grpcio + six + astor + absl-py + gast + google-pasta + wrapt + tensorflow-estimator_1 + tensorflow-tensorboard + keras-applications + keras-preprocessing + ] ++ lib.optional (!isPy3k) mock + ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ]; + + nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; + + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow + # and the propageted input tensorflow-tensorboard which causes environment collisions. + # another possibility would be to have tensorboard only in the buildInputs + # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 + postInstall = '' + rm $out/bin/tensorboard + ''; + + # Note that we need to run *after* the fixup phase because the + # libraries are loaded at runtime. If we run in preFixup then + # patchelf --shrink-rpath will remove the cuda libraries. + postFixup = let + rpath = stdenv.lib.makeLibraryPath + ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); + in + lib.optionalString stdenv.isLinux '' + 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 -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + patchelf --set-rpath "$rrPath" "$lib" + ${lib.optionalString cudaSupport '' + addOpenGLRunpath "$lib" + ''} + done + ''; + + + meta = with stdenv.lib; { + description = "Computation using data flow graphs for scalable machine learning"; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ jyp abbradar ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + # Python 2.7 build uses different string encoding. + # See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253 + broken = stdenv.isDarwin && !isPy3k; + }; +} diff --git a/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix new file mode 100644 index 000000000000..fa4809dc3f19 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix @@ -0,0 +1,43 @@ +{ +version = "1.14.0"; +linux_py_27_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp27-none-linux_x86_64.whl"; + sha256 = "0yywdrfk97dh1bxhibspg0raz70fx9lcczj6xlimqy4xb60clx7k"; +}; +linux_py_35_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp35-cp35m-linux_x86_64.whl"; + sha256 = "1xvyb6xcrjhlwvrmrhn5vs9xy7g98smqmpv4i3hhpry4qyasphhj"; +}; +linux_py_36_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl"; + sha256 = "1psd9vyxz9f39dwj77nvrg373sxv3p5vdp9fnz81dpsm0b0mwl44"; +}; +linux_py_37_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0bg2sb1n2ag27r7ww695kg5hb0mjrw4kc5893krmixx2j71860c5"; +}; +linux_py_27_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp27-none-linux_x86_64.whl"; + sha256 = "0y1x91gayg6pjddgl8ndcm63wfzhyv4s5khgl7ffzsgni1ivaqw5"; +}; +linux_py_35_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp35-cp35m-linux_x86_64.whl"; + sha256 = "03piggpbz1jx8m2b95spq3jrdff4w6xx63ji07am7hyw2nsgx3mx"; +}; +linux_py_36_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp36-cp36m-linux_x86_64.whl"; + sha256 = "0ypkp8cfhharsyyikb1qgf44cfm6284km9xswzvzymjzz75vg3gd"; +}; +linux_py_37_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0virp8nn2ysx4855hq29kas6fm6b3dsiybwzdxy9nnb9n2d8qlm2"; +}; +mac_py_2_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py2-none-any.whl"; + sha256 = "14f86k3pgq7z6i4s4im55zpp38f0drnm7xlclavsgcc0nxnj3z26"; +}; +mac_py_3_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py3-none-any.whl"; + sha256 = "0f3swpcjfgqhj6h5wnx8snc0xjkx4hnkqx83fmlrwpncs8c131d3"; +}; +} diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 7c80452b20fd..1b7c338d2a12 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -1,13 +1,13 @@ -{ stdenv, pkgs, bazel_0, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +{ stdenv, pkgs, bazel_0_26, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin , addOpenGLRunpath # Python deps , buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python # Python libraries -, numpy, tensorflow-tensorboard, backports_weakref, mock, enum34, absl-py +, numpy, tensorflow-tensorboard_1, backports_weakref, mock, enum34, absl-py , future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta , functools32 , opt-einsum -, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1_15_1 +, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1 # Common deps , git, swig, which, binutils, glibcLocales, cython # Common libraries @@ -18,6 +18,7 @@ # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 , cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null, nccl ? null +, mklSupport ? false, mkl ? null # XLA without CUDA is broken , xlaSupport ? cudaSupport # Default from ./configure script @@ -36,6 +37,8 @@ assert cudaSupport -> nvidia_x11 != null # unsupported combination assert ! (stdenv.isDarwin && cudaSupport); +assert mklSupport -> mkl != null; + let withTensorboard = pythonOlder "3.6"; @@ -94,7 +97,7 @@ let bazel-build = buildBazelPackage { name = "${pname}-${version}"; - bazel = bazel_0; + bazel = bazel_0_26; src = fetchFromGitHub { owner = "tensorflow"; @@ -105,9 +108,9 @@ let patches = [ # Work around https://github.com/tensorflow/tensorflow/issues/24752 - ./no-saved-proto.patch + ../no-saved-proto.patch # Fixes for NixOS jsoncpp - ./system-jsoncpp.patch + ../system-jsoncpp.patch # https://github.com/tensorflow/tensorflow/pull/29673 (fetchpatch { @@ -121,7 +124,6 @@ let sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz"; }) - (fetchpatch { # be compatible with gast >0.2 instead of only gast 0.2.2 name = "gast-update.patch"; @@ -132,7 +134,7 @@ let # cuda 10.2 does not have "-bin2c-path" option anymore # https://github.com/tensorflow/tensorflow/issues/34429 - ./cuda-10.2-no-bin2c-path.patch + ../cuda-10.2-no-bin2c-path.patch ]; # On update, it can be useful to steal the changes from gentoo @@ -168,6 +170,8 @@ let cudatoolkit cudnn nvidia_x11 + ] ++ lib.optionals mklSupport [ + mkl ] ++ lib.optionals stdenv.isDarwin [ Foundation Security @@ -285,7 +289,8 @@ let ]; bazelBuildFlags = [ "--config=opt" # optimize using the flags set in the configure phase - ]; + ] + ++ lib.optionals (mklSupport) [ "--config=mkl" ]; bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; @@ -373,7 +378,7 @@ in buildPythonPackage { numpy six protobuf - tensorflow-estimator_1_15_1 + tensorflow-estimator_1 termcolor wrapt grpcio @@ -385,7 +390,7 @@ in buildPythonPackage { ] ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ] ++ lib.optionals withTensorboard [ - tensorflow-tensorboard + tensorflow-tensorboard_1 ]; nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; diff --git a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch b/pkgs/development/python-modules/tensorflow/1/lift-gast-restriction.patch index 30861d923417..30861d923417 100644 --- a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch +++ b/pkgs/development/python-modules/tensorflow/1/lift-gast-restriction.patch diff --git a/pkgs/development/python-modules/tensorflow/1/prefetcher.sh b/pkgs/development/python-modules/tensorflow/1/prefetcher.sh new file mode 100755 index 000000000000..d590fb0f1732 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/1/prefetcher.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +version=1.14.0 +hashfile=binary-hashes.nix +rm -f $hashfile +echo "{" >> $hashfile +echo "version = \"$version\";" >> $hashfile +for sys in "linux" "mac"; do + for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do + for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64" "cp37-cp37m-linux_x86_64"; do + if [ $sys == "mac" ]; then + [[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]] + result=$? + pyver=${pykind:2:1} + flavour=cpu + else + [[ $pykind =~ .*linux.* ]] + result=$? + pyver=${pykind:2:2} + flavour=${tfpref:0:3} + fi + if [ $result == 0 ]; then + url=https://storage.googleapis.com/tensorflow/$sys/$tfpref-$version-$pykind.whl + hash=$(nix-prefetch-url $url) + echo "${sys}_py_${pyver}_${flavour} = {" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " sha256 = \"$hash\";" >> $hashfile + echo "};" >> $hashfile + fi + done + done +done +echo "}" >> $hashfile diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index e81dc2dbd002..95a7b2a37485 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -18,7 +18,7 @@ , wheel , opt-einsum , backports_weakref -, tensorflow-estimator +, tensorflow-estimator_2 , tensorflow-tensorboard , cudaSupport ? false , cudatoolkit ? null @@ -76,7 +76,7 @@ in buildPythonPackage { opt-einsum google-pasta wrapt - tensorflow-estimator + tensorflow-estimator_2 tensorflow-tensorboard keras-applications keras-preprocessing diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/2/binary-hashes.nix index 90848e93273f..90848e93273f 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/2/binary-hashes.nix diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix new file mode 100644 index 000000000000..2867308f9c43 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -0,0 +1,427 @@ +{ stdenv, pkgs, bazel_0_29, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +, addOpenGLRunpath +# Python deps +, buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python +# Python libraries +, numpy, tensorflow-tensorboard_2, backports_weakref, mock, enum34, absl-py +, future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta +, functools32 +, opt-einsum +, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2 +# Common deps +, git, swig, which, binutils, glibcLocales, cython +# Common libraries +, jemalloc, openmpi, astor, gast, grpc, sqlite, openssl, jsoncpp, re2 +, curl, snappy, flatbuffers, icu, double-conversion, libpng, libjpeg, giflib +# Upsteam by default includes cuda support since tensorflow 1.15. We could do +# that in nix as well. It would make some things easier and less confusing, but +# it would also make the default tensorflow package unfree. See +# https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 +, cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null, nccl ? null +, mklSupport ? false, mkl ? null +# XLA without CUDA is broken +, xlaSupport ? cudaSupport +# Default from ./configure script +, cudaCapabilities ? [ "3.5" "5.2" ] +, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] +, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +# Darwin deps +, Foundation, Security +}: + +assert cudaSupport -> nvidia_x11 != null + && cudatoolkit != null + && cudnn != null; + +# unsupported combination +assert ! (stdenv.isDarwin && cudaSupport); + +assert mklSupport -> mkl != null; + +let + withTensorboard = pythonOlder "3.6"; + + cudatoolkit_joined = symlinkJoin { + name = "${cudatoolkit.name}-merged"; + paths = [ + cudatoolkit.lib + cudatoolkit.out + # for some reason some of the required libs are in the targets/x86_64-linux + # directory; not sure why but this works around it + "${cudatoolkit}/targets/${stdenv.system}" + ]; + }; + + cudatoolkit_cc_joined = symlinkJoin { + name = "${cudatoolkit.cc.name}-merged"; + paths = [ + cudatoolkit.cc + binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip + ]; + }; + + # Needed for _some_ system libraries, grep INCLUDEDIR. + includes_joined = symlinkJoin { + name = "tensorflow-deps-merged"; + paths = [ + pkgs.protobuf + jsoncpp + ]; + }; + + tfFeature = x: if x then "1" else "0"; + + version = "2.1.0"; + variant = if cudaSupport then "-gpu" else ""; + pname = "tensorflow${variant}"; + + pythonEnv = python.withPackages (_: + [ # python deps needed during wheel build time (not runtime, see the buildPythonPackage part for that) + numpy + keras-preprocessing + protobuf + wrapt + gast + astor + absl-py + termcolor + keras-applications + setuptools + wheel + ] ++ lib.optionals (!isPy3k) + [ future + functools32 + mock + ]); + + bazel-build = buildBazelPackage { + name = "${pname}-${version}"; + bazel = bazel_0_29; + + src = fetchFromGitHub { + owner = "tensorflow"; + repo = "tensorflow"; + rev = "v${version}"; + sha256 = "1g79xi8yl4sjia8ysk9b7xfzrz83zy28v5dlb2wzmcf0k5pmz60p"; + }; + + patches = [ + # Work around https://github.com/tensorflow/tensorflow/issues/24752 + ../no-saved-proto.patch + # Fixes for NixOS jsoncpp + ../system-jsoncpp.patch + + (fetchpatch { + name = "backport-pr-18950.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/73640aaec2ab0234d9fff138e3c9833695570c0a.patch"; + sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz"; + }) + + (fetchpatch { + # Don't try to fetch things that don't exist + name = "prune-missing-deps.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/b39b1ed24b4814db27d2f748dc85c10730ae851d.patch"; + sha256 = "1skysz53nancvw1slij6s7flar2kv3gngnsq60ff4lap88kx5s6c"; + excludes = [ "tensorflow/cc/saved_model/BUILD" ]; + }) + + ./lift-gast-restriction.patch + + # cuda 10.2 does not have "-bin2c-path" option anymore + # https://github.com/tensorflow/tensorflow/issues/34429 + ../cuda-10.2-no-bin2c-path.patch + ]; + + # On update, it can be useful to steal the changes from gentoo + # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow + + nativeBuildInputs = [ + swig which pythonEnv + ] ++ lib.optional cudaSupport addOpenGLRunpath; + + buildInputs = [ + jemalloc + openmpi + glibcLocales + git + + # libs taken from system through the TF_SYS_LIBS mechanism + # grpc + sqlite + openssl + jsoncpp + pkgs.protobuf + curl + snappy + flatbuffers + icu + double-conversion + libpng + libjpeg + giflib + re2 + pkgs.lmdb + ] ++ lib.optionals cudaSupport [ + cudatoolkit + cudnn + nvidia_x11 + ] ++ lib.optionals mklSupport [ + mkl + ] ++ lib.optionals stdenv.isDarwin [ + Foundation + Security + ]; + + # arbitrarily set to the current latest bazel version, overly careful + TF_IGNORE_MAX_BAZEL_VERSION = true; + + # Take as many libraries from the system as possible. Keep in sync with + # list of valid syslibs in + # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl + TF_SYSTEM_LIBS = lib.concatStringsSep "," [ + "absl_py" + "astor_archive" + "boringssl" + # Not packaged in nixpkgs + # "com_github_googleapis_googleapis" + # "com_github_googlecloudplatform_google_cloud_cpp" + "com_google_protobuf" + "com_googlesource_code_re2" + "curl" + "cython" + "double_conversion" + "flatbuffers" + "gast_archive" + # Lots of errors, requires an older version + # "grpc" + "hwloc" + "icu" + "jpeg" + "jsoncpp_git" + "keras_applications_archive" + "lmdb" + "nasm" + # "nsync" # not packaged in nixpkgs + "opt_einsum_archive" + "org_sqlite" + "pasta" + "pcre" + "six_archive" + "snappy" + "swig" + "termcolor_archive" + "wrapt" + "zlib_archive" + ]; + + INCLUDEDIR = "${includes_joined}/include"; + + PYTHON_BIN_PATH = pythonEnv.interpreter; + + TF_NEED_GCP = true; + TF_NEED_HDFS = true; + TF_ENABLE_XLA = tfFeature xlaSupport; + + CC_OPT_FLAGS = " "; + + # https://github.com/tensorflow/tensorflow/issues/14454 + TF_NEED_MPI = tfFeature cudaSupport; + + TF_NEED_CUDA = tfFeature cudaSupport; + TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; + GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; + GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; + TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; + + postPatch = '' + # https://github.com/tensorflow/tensorflow/issues/20919 + sed -i '/androidndk/d' tensorflow/lite/kernels/internal/BUILD + + # Tensorboard pulls in a bunch of dependencies, some of which may + # include security vulnerabilities. So we make it optional. + # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560 + sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py + ''; + + preConfigure = let + opt_flags = [] + ++ lib.optionals sse42Support ["-msse4.2"] + ++ lib.optionals avx2Support ["-mavx2"] + ++ lib.optionals fmaSupport ["-mfma"]; + in '' + patchShebangs configure + + # dummy ldconfig + mkdir dummy-ldconfig + echo "#!${stdenv.shell}" > dummy-ldconfig/ldconfig + chmod +x dummy-ldconfig/ldconfig + export PATH="$PWD/dummy-ldconfig:$PATH" + + export PYTHON_LIB_PATH="$NIX_BUILD_TOP/site-packages" + export CC_OPT_FLAGS="${lib.concatStringsSep " " opt_flags}" + mkdir -p "$PYTHON_LIB_PATH" + + # To avoid mixing Python 2 and Python 3 + unset PYTHONPATH + ''; + + configurePhase = '' + runHook preConfigure + ./configure + runHook postConfigure + ''; + + # FIXME: Tensorflow uses dlopen() for CUDA libraries. + NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn"; + + hardeningDisable = [ "format" ]; + + bazelFlags = [ + # temporary fixes to make the build work with bazel 0.27 + "--incompatible_no_support_tools_in_action_inputs=false" + ]; + bazelBuildFlags = [ + "--config=opt" # optimize using the flags set in the configure phase + ] + ++ lib.optionals (mklSupport) [ "--config=mkl" ]; + + bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; + + fetchAttrs = { + # So that checksums don't depend on these. + TF_SYSTEM_LIBS = null; + + # cudaSupport causes fetch of ncclArchive, resulting in different hashes + sha256 = if cudaSupport then + "0hg3ysy644950a34j28hrb317cz8gcbb9n84d36wdailvnlshghb" + else + "1gy4pz9kn30wb9c4a9584fibb88c3h38y3dqa99yw1lbsbyyi28c"; + }; + + buildAttrs = { + outputs = [ "out" "python" ]; + + preBuild = '' + patchShebangs . + ''; + + installPhase = '' + mkdir -p "$out" + tar -xf bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz -C "$out" + # Write pkgconfig file. + mkdir "$out/lib/pkgconfig" + cat > "$out/lib/pkgconfig/tensorflow.pc" << EOF + Name: TensorFlow + Version: ${version} + Description: Library for computation using data flow graphs for scalable machine learning + Requires: + Libs: -L$out/lib -ltensorflow + Cflags: -I$out/include/tensorflow + EOF + + # build the source code, then copy it to $python (build_pip_package + # actually builds a symlink farm so we must dereference them). + bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "$PWD/dist" + cp -Lr "$PWD/dist" "$python" + ''; + + postFixup = lib.optionalString cudaSupport '' + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + addOpenGLRunpath "$lib" + done + ''; + }; + + meta = with stdenv.lib; { + description = "Computation using data flow graphs for scalable machine learning"; + homepage = http://tensorflow.org; + license = licenses.asl20; + maintainers = with maintainers; [ jyp abbradar ]; + platforms = with platforms; linux ++ darwin; + # The py2 build fails due to some issue importing protobuf. Possibly related to the fix in + # https://github.com/akesandgren/easybuild-easyblocks/commit/1f2e517ddfd1b00a342c6abb55aef3fd93671a2b + broken = !(xlaSupport -> cudaSupport) || !isPy3k; + }; + }; + +in buildPythonPackage { + inherit version pname; + disabled = isPy27 || (pythonAtLeast "3.8"); + + src = bazel-build.python; + + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow + # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # Another possibility would be to have tensorboard only in the buildInputs + # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 + postInstall = '' + rm $out/bin/tensorboard + ''; + + setupPyGlobalFlags = [ "--project_name ${pname}" ]; + + # tensorflow/tools/pip_package/setup.py + propagatedBuildInputs = [ + absl-py + astor + gast + google-pasta + keras-applications + keras-preprocessing + numpy + six + protobuf + tensorflow-estimator_2 + termcolor + wrapt + grpcio + opt-einsum + ] ++ lib.optionals (!isPy3k) [ + mock + future + functools32 + ] ++ lib.optionals (pythonOlder "3.4") [ + backports_weakref enum34 + ] ++ lib.optionals withTensorboard [ + tensorflow-tensorboard_2 + ]; + + nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; + + postFixup = lib.optionalString cudaSupport '' + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + addOpenGLRunpath "$lib" + done + ''; + + # Actual tests are slow and impure. + # TODO try to run them anyway + # TODO better test (files in tensorflow/tools/ci_build/builds/*test) + checkPhase = '' + ${python.interpreter} <<EOF + # A simple "Hello world" + import tensorflow as tf + hello = tf.constant("Hello, world!") + tf.print(hello) + + # Fit a simple model to random data + import numpy as np + np.random.seed(0) + tf.random.set_seed(0) + model = tf.keras.models.Sequential([ + tf.keras.layers.Dense(1, activation="linear") + ]) + model.compile(optimizer="sgd", loss="mse") + + x = np.random.uniform(size=(1,1)) + y = np.random.uniform(size=(1,)) + model.fit(x, y, epochs=1) + EOF + ''; + # Regression test for #77626 removed because not more `tensorflow.contrib`. + + passthru.libtensorflow = bazel-build.out; + + inherit (bazel-build) meta; +} diff --git a/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch b/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch new file mode 100644 index 000000000000..e0d367f4924f --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch @@ -0,0 +1,11 @@ +diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py +index 992f2eae22..d9386f9b13 100644 +--- a/tensorflow/tools/pip_package/setup.py ++++ b/tensorflow/tools/pip_package/setup.py +@@ -54,5 +54,5 @@ REQUIRED_PACKAGES = [ + 'enum34 >= 1.1.6;python_version<"3.4"', +- 'gast == 0.2.2', ++ 'gast >= 0.2.2', + 'google_pasta >= 0.1.6', + 'keras_applications >= 1.0.8', + 'keras_preprocessing >= 1.0.5', diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/2/prefetcher.sh index abb0faac2834..abb0faac2834 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/2/prefetcher.sh diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 2d4f9d10a8cc..df1b02283043 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0nj33mwvppacy6p5mqk9a4x26hx9ailshgad84ks60wyms6rgjiv"; + sha256 = "0cc7d4r11z26rhcwpmcc42fi9kr3f20nq5pk84jrczr18i0g99mh"; }; nativeBuildInputs = [ cython pkg-config ]; diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix index 1c59b0cae6b1..add36ccf1b62 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.9.11"; + version = "3.10.0"; pname = "thespian"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "84887f0437ec144f7266ae22678bc5dc5d2a9e60a89f1f7c1707cbea5e03022a"; + sha256 = "0n85nhj5hr8kv33jk4by8hnxm3kni5f4z1jhiw27dlf6cbgsv892"; }; # Do not run the test suite: it takes a long time and uses @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Actor concurrency library"; - homepage = http://thespianpy.com/; + homepage = "http://thespianpy.com/"; license = licenses.mit; maintainers = [ maintainers.kquick ]; }; diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix index ba910f75e199..1efebed98721 100644 --- a/pkgs/development/python-modules/tkinter/default.nix +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -6,7 +6,8 @@ }: buildPythonPackage { - name = "tkinter-${python.version}"; + pname = "tkinter"; + version = python.version; src = py; format = "other"; diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 8e7a5643d70e..617ba227c41e 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchPypi, buildPythonPackage -, traits, pyface, wxPython +{ lib, fetchPypi, buildPythonPackage +, traits, pyface, six }: buildPythonPackage rec { @@ -11,14 +11,14 @@ buildPythonPackage rec { sha256 = "0kw1xy5ax6l0lzmk7pfzjw6qs0idv78k3118my7cbvw1n5iiff28"; }; - propagatedBuildInputs = [ traits pyface wxPython ]; + propagatedBuildInputs = [ traits pyface six ]; doCheck = false; # Needs X server - meta = with stdenv.lib; { + meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/traitsui"; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 2d40ad971dbe..e7bec00863ae 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.11.6"; + version = "0.12.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1i73j812i0dgjw9n106pipc6qksd9cgs59d0as0b4j5iyl0087hh"; + sha256 = "0ycmpwjv5xp25993divjhaq5j766zgcy22xx39xfc1pcvldq5g7n"; }; propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic trezor-udev-rules ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 5c4fea3f9b1b..2bea54818c24 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -16,12 +16,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "19.10.0"; + version = "20.3.0"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"; + sha256 = "040yzha6cyshnn6ljgk2birgh6mh2cnra48xp5ina5vfsnsmab6p"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ]; diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix index d59a0bb8b8a4..db973dbffbed 100644 --- a/pkgs/development/python-modules/txamqp/default.nix +++ b/pkgs/development/python-modules/txamqp/default.nix @@ -1,22 +1,22 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchPypi , twisted }: buildPythonPackage rec { - pname = "txamqp"; - version = "0.3"; + pname = "txAMQP"; + version = "0.8.2"; - src = fetchurl { - url = "https://launchpad.net/txamqp/trunk/${version}/+download/python-txamqp_${version}.orig.tar.gz"; - sha256 = "1r2ha0r7g14i4b5figv2spizjrmgfpspdbl1m031lw9px2hhm463"; + src = fetchPypi { + inherit pname version; + sha256 = "0jd9864k3csc06kipiwzjlk9mq4054s8kzk5q1cfnxj8572s4iv4"; }; - buildInputs = [ twisted ]; + propagatedBuildInputs = [ twisted ]; meta = with stdenv.lib; { - homepage = https://launchpad.net/txamqp; + homepage = "https://github.com/txamqp/txamqp"; description = "Library for communicating with AMQP peers and brokers using Twisted"; license = licenses.asl20; maintainers = []; diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 3b60c63d964d..01a7cd3d87ac 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "19.1.0"; + version = "20.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "19ayn5w9ayxbb1m84l1s9qlb6kv7sz6sg34mzy8bnidc7qnfbn15"; + sha256 = "0yipb41w2icbj50d3z1j92d8w6xhbqd1rnmd31vzb5k3g20x0b0j"; }; # zope.interface issue @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; - homepage = https://github.com/meejah/txtorcon; + homepage = "https://github.com/meejah/txtorcon"; maintainers = with lib.maintainers; [ jluttine ]; # Currently broken on Python 2.7. See # https://github.com/NixOS/nixpkgs/issues/71826 diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 36c5af1d7180..109d8d8efab2 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -6,16 +6,17 @@ , libuv , psutil , isPy27 -, pythonAtLeast , CoreServices , ApplicationServices +# Check Inputs +, pytestCheckHook +# , pytest-asyncio }: buildPythonPackage rec { pname = "uvloop"; version = "0.14.0"; - # python 3.8 hangs on tests, assuming it's subtly broken with race condition - disabled = isPy27 || pythonAtLeast "3.8"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -28,20 +29,44 @@ buildPythonPackage rec { libuv ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; - postPatch = '' - # Removing code linting tests, which we don't care about - rm tests/test_sourcecode.py - ''; + pythonImportsCheck = [ + "uvloop" + "uvloop.loop" + ]; + + dontUseSetuptoolsCheck = true; + checkInputs = [ pytestCheckHook pyopenssl psutil ]; + + pytestFlagsArray = [ + # from pytest.ini, these are NECESSARY to prevent failures + "--capture=no" + "--assert=plain" + "--tb=native" + # ignore code linting tests + "--ignore=tests/test_sourcecode.py" + ]; - checkInputs = [ pyopenssl psutil ]; + disabledTests = [ + "test_sock_cancel_add_reader_race" # asyncio version of test is supposed to be skipped but skip doesn't happen. uvloop version runs fine + ]; + + # force using installed/compiled uvloop vs source by moving tests to temp dir + preCheck = '' + export TEST_DIR=$(mktemp -d) + cp -r tests $TEST_DIR + pushd $TEST_DIR + ''; + postCheck = '' + popd + ''; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; meta = with lib; { description = "Fast implementation of asyncio event loop on top of libuv"; - homepage = https://github.com/MagicStack/uvloop; + homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix new file mode 100644 index 000000000000..11c50646700d --- /dev/null +++ b/pkgs/development/python-modules/variants/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, isPy27 +, fetchPypi +, pytestrunner +, setuptools_scm +, singledispatch +, pytest +, lib +}: + +buildPythonPackage rec { + pname = "variants"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version ; + sha256 = "511f75b4cf7483c27e4d86d9accf2b5317267900c166d17636beeed118929b90"; + }; + + nativeBuildInputs = [ + pytestrunner + setuptools_scm + ]; + + checkInputs = [ + pytest + ] ++ lib.optionals isPy27 [ singledispatch ]; + + meta = with lib; { + description = "Library providing syntactic sugar for creating variant forms of a canonical function"; + homepage = "https://github.com/python-variants/variants"; + license = licenses.asl20; + maintainers = with maintainers; [ rakesh4g ]; + }; +} diff --git a/pkgs/development/python-modules/varint/default.nix b/pkgs/development/python-modules/varint/default.nix new file mode 100644 index 000000000000..5f32dff4aa5c --- /dev/null +++ b/pkgs/development/python-modules/varint/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: +buildPythonPackage rec { + pname = "varint"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version ; + sha256 = "a6ecc02377ac5ee9d65a6a8ad45c9ff1dac8ccee19400a5950fb51d594214ca5"; + }; + + # No tests are available + doCheck = false; + + pythonImportsCheck = [ "varint" ]; + + meta = with lib; { + description = "A basic varint implementation in python"; + homepage = "https://github.com/fmoo/python-varint"; + license = licenses.mit; + maintainers = with maintainers; [ rakesh4g ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index b1ce764c4ac4..cc68d4b7090f 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "c88ae171a11b087ea2513f260cdac9232461d8e9369bcd1dc143fc399d220557"; + sha256 = "0absh96fsxk9di7ir76f5djyfm2c214wnyk53avrhjy8akflhpk6"; }; buildInputs = [ pytest ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/edwardgeorge/virtualenv-clone; + homepage = "https://github.com/edwardgeorge/virtualenv-clone"; description = "Script to clone virtualenvs"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 65dbce862a46..ddd36a98cb6d 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.8.0"; + version = "8.8.1"; src = fetchPypi{ inherit pname version; - sha256 = "bd4c7e49a6ddaa1afedf97b22b822c7322328d686d45151b47a5127fc409c2af"; + sha256 = "17fw1g4ka9jppd41srw39zbp2b8h81izc71bbggxgf2r0xbdpga6"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix index 6b3ca778ead1..e76d1f110296 100644 --- a/pkgs/development/python-modules/waitress-django/default.nix +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -1,11 +1,11 @@ -{ buildPythonPackage, django_1_8, waitress }: +{ buildPythonPackage, django, waitress }: buildPythonPackage { pname = "waitress-django"; version = "0.0.0"; src = ./.; - pythonPath = [ django_1_8 waitress ]; + pythonPath = [ django waitress ]; doCheck = false; meta.description = "A waitress WSGI server serving django"; } diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index d0a5d6116f8e..7c3d25068e30 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 +, Babel , cssselect , dateutil , feedparser @@ -24,11 +25,11 @@ buildPythonPackage rec { pname = "weboob"; - version = "1.5"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "1c9z9gid1mbm1cakb2wj6jjkbrmji8y8ac46iqpih9x1h498bhbs"; + sha256 = "1c69vzf8sg8471lcaafpz9iw2q3rfj5hmcpqrs2k59fkgbvy32zw"; }; postPatch = '' @@ -44,13 +45,12 @@ buildPythonPackage rec { }; p' weboob/browser/browsers.py weboob/browser/pages.py ''; - setupPyBuildFlags = ["--qt" "--xdg"]; - checkInputs = [ nose ]; nativeBuildInputs = [ pyqt5 ]; propagatedBuildInputs = [ + Babel cssselect dateutil feedparser @@ -77,7 +77,7 @@ buildPythonPackage rec { ''; meta = { - homepage = http://weboob.org; + homepage = "http://weboob.org"; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; license = lib.licenses.agpl3; }; diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index 134d797ecf81..70709d3e6663 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "whisper"; - version = "1.1.6"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "8dbb3b7cf4a02a080162467fff5cd38bf77940c3e2b25f7c4f78529427ca9cfe"; + sha256 = "08biw3g6x6p2aa1nlvfazbgcs1xvf6m0hvskdjhgwnsbwxk1xq46"; }; propagatedBuildInputs = [ six ]; checkInputs = [ mock ]; meta = with stdenv.lib; { - homepage = http://graphite.wikidot.com/; + homepage = "http://graphite.wikidot.com/"; description = "Fixed size round-robin style database"; maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix new file mode 100644 index 000000000000..8b2d73b00fb8 --- /dev/null +++ b/pkgs/development/python-modules/xdg/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +, clikit +, poetry +, pytestCheckHook +}: + +buildPythonPackage rec { + version = "4.0.1"; + pname = "xdg"; + disabled = isPy27; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "srstevenson"; + repo = pname; + rev = version; + sha256 = "13kgnbwam6wmdbig0m98vmyjcqrp0j62nmfknb6prr33ns2nxbs2"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + clikit + ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "XDG Base Directory Specification for Python"; + homepage = "https://github.com/srstevenson/xdg"; + license = licenses.isc; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 831dd888fae8..b4c8e46f146d 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "4.2.2"; + version = "4.2.4"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "0d286myx6z6cbih77h8z5p9vscxvww3gy59lmi1w6y2nq6c8sqzb"; + sha256 = "0nq6ijmj48c2dk75vmb040wgvr4y7wyjxrcm2dyvcwfk2h6phwri"; }; checkInputs = [ pytest ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python cross-version byte-code disassembler and marshal routines"; - homepage = https://github.com/rocky/python-xdis/; + homepage = "https://github.com/rocky/python-xdis/"; license = licenses.gpl2; }; } diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index cf4eadd99d89..b2bd5af56c8c 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.37.3"; + version = "2.41.0"; src = fetchPypi { inherit pname version; - sha256 = "4ae4e99a4b482caac89d8ffd93d16a4510db36907475b1879713a1dc885646ad"; + sha256 = "0xmhgn62a8a7282yd003zz63mrgyajb6sg29bfyllx3mxmdlb0iz"; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; - homepage = https://tools.ietf.org/tools/xml2rfc/trac/; + homepage = "https://tools.ietf.org/tools/xml2rfc/trac/"; # Well, parts might be considered unfree, if being strict; see: # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright license = licenses.bsd3; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b4d5834b2424..b883a3d2bc8f 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.20.0"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "1gx3f9wcf8af9cz2v3x3196pab34n8mlqk5iswahhzpxc9i2p4bn"; + sha256 = "14yijcnmanyd3s2ir38sxl07rzpxgpgw9s6b8sy68jrl7n5nj7ky"; }; checkInputs = [ nose ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A linter for YAML files"; - homepage = https://github.com/adrienverge/yamllint; + homepage = "https://github.com/adrienverge/yamllint"; license = licenses.gpl3; maintainers = with maintainers; [ mikefaille ]; }; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 622de68c6d4e..25382fa19ad1 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.24.4"; + version = "0.24.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f66d38f16026097572939ab78b1f46a97f556bca415491eb0fd094d0b5827dfe"; + sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9"; }; propagatedBuildInputs = [ ifaddr ] diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index eb3c5ff135ca..85e950b830e8 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , setuptools_scm, pathpy, nbconvert , pytest }: @@ -11,11 +11,10 @@ buildPythonPackage rec { sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d"; }; - # Python 3.7 compatibility - # See https://github.com/zimmermanncode/zetup/pull/1 + # Python 3.8 compatibility postPatch = '' substituteInPlace zetup/zetup_config.py \ - --replace "'3.6']" "'3.6', '3.7']" + --replace "'3.7']" "'3.7', '3.8']" ''; checkPhase = '' @@ -25,11 +24,9 @@ buildPythonPackage rec { checkInputs = [ pytest pathpy nbconvert ]; propagatedBuildInputs = [ setuptools_scm ]; - meta = with stdenv.lib; { - description = '' - Zimmermann's Extensible Tools for Unified Project setups - ''; - homepage = https://github.com/zimmermanncode/zetup; + meta = with lib; { + description = "Zimmermann's Extensible Tools for Unified Project setups"; + homepage = "https://github.com/zimmermanncode/zetup"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 66f33f6e31f4..65416d9295b0 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -124,7 +124,7 @@ let for i in ${ruby}/bin/*; do makeWrapper "$i" $out/bin/$(basename "$i") \ --set BUNDLE_GEMFILE ${confFiles}/Gemfile \ - --set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} \ + --unset BUNDLE_PATH \ --set BUNDLE_FROZEN 1 \ --set GEM_HOME ${basicEnv}/${ruby.gemPath} \ --set GEM_PATH ${basicEnv}/${ruby.gemPath} diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index add5db56d1d0..2bf9d84caa06 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -32,10 +32,12 @@ paths.each do |path| # ENV["BUNDLE_GEMFILE"] = #{gemfile.dump} -ENV["BUNDLE_PATH"] = #{bundle_path.dump} +ENV.delete 'BUNDLE_PATH' ENV['BUNDLE_FROZEN'] = '1' -$LOAD_PATH.unshift #{bundler_path.dump} + "/lib" +Gem.paths = { 'GEM_HOME' => #{bundle_path.dump} } + +$LOAD_PATH.unshift #{File.join(bundler_path, "/lib").dump} require 'bundler' Bundler.setup(#{groups.map(&:dump).join(', ')}) diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 2fa706643234..0859f08c2f7d 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -53,7 +53,7 @@ in ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)} ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " + "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+ - "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+ + "--unset BUNDLE_PATH "+ "--set BUNDLE_FROZEN 1 "+ "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+ "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+ diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 6190b4210cd2..fc2733de3f00 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.17.3"; - source.sha256 = "0ln3gnk7cls81gwsbxvrmlidsfd78s6b2hzlm4d4a9wbaidzfjxw"; + version = "2.1.4"; + source.sha256 = "12glbb1357x91fvd004jgkw7ihlkpc9dwr349pd7j83isqhls0ah"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index c2e4840eab06..d9438a799565 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -3,41 +3,47 @@ GEM specs: ast (2.4.0) backport (1.1.2) + benchmark (0.1.0) + e2mmap (0.1.0) jaro_winkler (1.5.4) maruku (0.7.3) mini_portile2 (2.4.0) - nokogiri (1.10.5) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.6.5.0) + parser (2.7.0.5) ast (~> 2.4.0) rainbow (3.0.0) - reverse_markdown (1.3.0) + reverse_markdown (1.4.0) nokogiri - rubocop (0.77.0) + rexml (3.2.4) + rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.1) - solargraph (0.38.0) + solargraph (0.38.6) backport (~> 1.1) + benchmark bundler (>= 1.17.2) + e2mmap jaro_winkler (~> 1.5) maruku (~> 0.7, >= 0.7.3) nokogiri (~> 1.9, >= 1.9.1) parser (~> 2.3) reverse_markdown (~> 1.0, >= 1.0.5) rubocop (~> 0.52) - thor (~> 0.19, >= 0.19.4) + thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9) - thor (0.20.3) + thor (1.0.1) tilt (2.0.10) - unicode-display_width (1.6.0) - yard (0.9.20) + unicode-display_width (1.6.1) + yard (0.9.24) PLATFORMS ruby @@ -46,4 +52,4 @@ DEPENDENCIES solargraph! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index e1ea15fb4e16..a6ec78b74585 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -1,5 +1,6 @@ { ast = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -10,6 +11,7 @@ version = "2.4.0"; }; backport = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -19,7 +21,30 @@ }; version = "1.1.2"; }; + benchmark = { + dependencies = []; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jadlpsl504ql436a6bx8ihp0bkg3rvxg7fbi4r1bmra3cqz0h88"; + type = "gem"; + }; + version = "0.1.0"; + }; + e2mmap = { + dependencies = []; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5"; + type = "gem"; + }; + version = "0.1.0"; + }; jaro_winkler = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -30,6 +55,7 @@ version = "1.5.4"; }; maruku = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -40,6 +66,7 @@ version = "0.7.3"; }; mini_portile2 = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -55,12 +82,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.5"; + version = "1.10.9"; }; parallel = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -76,12 +104,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; + sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc"; type = "gem"; }; - version = "2.6.5.0"; + version = "2.7.0.5"; }; rainbow = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -97,23 +126,35 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zb9n227b5s4cg942sc0g3n1bdx9fpcvq5m6w7ap0yc116ivv5w2"; + sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; + type = "gem"; + }; + version = "1.4.0"; + }; + rexml = { + dependencies = []; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; type = "gem"; }; - version = "1.3.0"; + version = "3.2.4"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9"; + sha256 = "1i8pw7p4dk11xpahs0j6vlvqlv3rgapaccj933g0i34hbx392lj8"; type = "gem"; }; - version = "0.77.0"; + version = "0.80.1"; }; ruby-progressbar = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -124,27 +165,29 @@ version = "1.10.1"; }; solargraph = { - dependencies = ["backport" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdqpxvjj6r6gzrz9rmxfg85cmfjs4y2lyq8p5qfg3kfpqx4rhpw"; + sha256 = "06kcqm032sq1y4pgg7cl32hv74573b1vsy79x81zglar80ybgzv4"; type = "gem"; }; - version = "0.38.0"; + version = "0.38.6"; }; thor = { + dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; type = "gem"; }; - version = "0.20.3"; + version = "1.0.1"; }; tilt = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -155,23 +198,25 @@ version = "2.0.10"; }; unicode-display_width = { + dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; yard = { + dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny"; + sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp"; type = "gem"; }; - version = "0.9.20"; + version = "0.9.24"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 0b34055274d0..01706bd9b681 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -45,7 +45,7 @@ let generic = { major, version, src }: downloadPage = http://alloytools.org/download.html; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ aminb ]; + maintainers = with maintainers; [ notbandali ]; }; }; diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 5ac6c5afa913..2f3ebcbed0a6 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ameba"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "0zjv59f555q2w8ahrvmpdzasrifwjgr0mk6rly9yss4ab3rj8cy2"; + sha256 = "0g68yijbm2j4ig536fwq49d1z7x2iv9kp4g3gjklf5zn1sbqhm12"; }; nativeBuildInputs = [ crystal shards ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A static code analysis tool for Crystal"; - homepage = https://crystal-ameba.github.io; + homepage = "https://crystal-ameba.github.io"; license = licenses.mit; maintainers = with maintainers; [ kimburgess ]; }; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 8649c05d73b9..539c2f7d1910 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.30"; + version = "8.31"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1wsgpfdqasfz6chhy0w5pdjm4by6ih2g0l44lxwks9kik2lrs4av"; + sha256 = "03dn07lissr2dkhi44wlkrbsby4zfvwai8gykc3xjgs46jy05rf8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 309ba9d392bd..f722a155086f 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.0.4"; + version = "2.1.0"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "02sqs7shxqrq6c6h12ldskk30k7sisa75wjxz99xyg49m4b2lw4m"; + sha256 = "1vp4f5kwmxc4j59cdzwj0jh0n4c05hkvssvv9ii6w88phzblzpjk"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 9e7b2d5096d0..014c7dea11b7 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.121.0"; + version = "0.122.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1lx3lfn0blnwpq6iph0x6xcr4nrdhyvfvx6x8qk6axwlmg2swdcy"; + sha256 = "0a1pcrp0r7l0c8cyrg1qc1qz5dnj0mzd60v9nixgm419a7rrmp93"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 14b61eac374c..4fbf986e41a1 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.21"; + version = "4.5.22"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "0s733n3hmzpsnrvfryq7kzsvwshd1y9fzm16a64gnii8cmfalrqc"; + sha256 = "1321i9ls5k677diwfccrjinzzb5586ygdgax7ryyha3ccdj1ikda"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 85fd8c93529e..e2c174783d4b 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = with qt5; [ qt5.qtbase @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec { qtsvg qtquickcontrols2 qtgraphicaleffects - pkgconfig git ]; diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index fd5c58985cfb..e64f39a49609 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1gvsrcskcdd1hxrjpkpc657anmfs25f174vxk4wzvn385rnmrxd3"; + sha256 = "1icv56gxpzdjqn37pk3g99vgpljdc77i6k0x601iw2885s7s01n6"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index fc5244f96449..37dc9e51beab 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,7 +110,7 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "23963"; + version_commit = "24088"; gittap = "4.3.1"; gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; rev = "4.3.1"; @@ -120,12 +120,12 @@ in { cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "23963"; - gittap = "4.2.1"; - gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; - rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938"; - version = "2020-01-31"; - sha256 = "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg"; + version_commit = "24088"; + gittap = "4.3.1"; + gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; + rev = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; + version = "2020-03-05"; + sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 274418172d15..54c990ee0584 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.2"; + version = "4.2.3"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "1ac4llphh16n5ihc2hb1vggl65mbkw1xd1j3ixfskvmcy8valgqw"; + sha256 = "0apmwbh761b02z8i4s3d270ms0c1fw98d10rpczngrs2jz37s2m9"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 475ff662b85a..200df98c0a20 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -1,23 +1,21 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "tflint"; - version = "0.15.2"; + version = "0.15.4"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1wwdnqb34l0ad6hlvs74acfh0744ir3ssm8wjwpxbsy0sxkrpxcf"; + sha256 = "1z98zy04dj4hj94k9c9r1sfw167s3ywpxnjbylj7nsyxdlvwj37j"; }; - modSha256 = "1jbnsqa0ga372lhbgfnqvx8pdzrm0b2phzzwll4sgd0k1hzv2aqv"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1j6vflvg2k544r0kkdiw64n6v467c0kr7l2m39h8yjbyjbmwl5xz"; subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Terraform linter focused on possible errors, best practices, and so on"; homepage = "https://github.com/terraform-linters/tflint"; changelog = "https://github.com/terraform-linters/tflint/releases/tag/v${version}"; diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 40741d96f562..328092feafc5 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "azure-storage-azcopy"; @@ -11,8 +11,6 @@ buildGoModule rec { sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "." ]; modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb"; diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix new file mode 100644 index 000000000000..db150b2eef17 --- /dev/null +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "bazel-gazelle"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = pname; + rev = "v${version}"; + sha256 = "1rw9zq8rmc0zr91kk70xl67dl6jx4dswwisv3bd1f16yncqgv2a1"; + }; + + modSha256 = "0bfhy0ig8apxb5qzxjdj6q7jr2i6rdq0ffby0pha8viadah8v2rm"; + + subPackages = [ "cmd/gazelle" ]; + + meta = with lib; { + homepage = https://github.com/bazelbuild/bazel-gazelle; + description = '' + Gazelle is a Bazel build file generator for Bazel projects. It natively + supports Go and protobuf, and it may be extended to support new languages + and custom rule sets. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index a737ddbb0fb6..5780cf4382a7 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bazelisk"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "A user-friendly launcher for Bazel"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix index c50e57160639..ad9813cde6fb 100644 --- a/pkgs/development/tools/build-managers/alibuild/default.nix +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -2,11 +2,11 @@ python.pkgs.buildPythonApplication rec { pname = "alibuild"; - version = "1.5.4rc3"; + version = "1.5.5"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "1mnh0h9m96p78b9ln1gbl4lw1mgl16qbyfi9fj2l13p3nxaq1sib"; + sha256 = "1sh02avpab4qlyin3p928xw91l4fgs8x5x2rzl623ayqsnfjv19j"; }; doCheck = false; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix index f54868de533c..6d4ba50a9fbb 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix @@ -161,6 +161,14 @@ stdenv.mkDerivation rec { postPatch = let darwinPatches = '' + bazelLinkFlags () { + eval set -- "$NIX_LDFLAGS" + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" + done + } + # Disable Bazel's Xcode toolchain detection which would configure compilers # and linkers from Xcode instead of from PATH export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 @@ -170,14 +178,14 @@ stdenv.mkDerivation rec { # Framework search paths aren't added by bintools hook # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ + sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ scripts/bootstrap/compile.sh \ src/tools/xcode/realpath/BUILD \ src/tools/xcode/stdredirect/BUILD \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_0_26/glibc.patch index c4de48068f11..c4de48068f11 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/glibc.patch diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch b/pkgs/development/tools/build-managers/bazel/bazel_0_26/python-stub-path-fix.patch index cbc4192d2d9b..cbc4192d2d9b 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/python-stub-path-fix.patch diff --git a/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix index 6c12003b9649..19d33235a340 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, lib, fetchurl, fetchFromGitHub , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) -, bazel +, bazel_self , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater @@ -25,11 +25,11 @@ }: let - version = "2.1.0"; + version = "0.29.1"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0ijz9lxralyw18r5ra2h79jnafk5521ncr3knaip74cqa28csw9k"; + sha256 = "1rcd6xy61n07n7m6dgcw23275r8z3gkwmqdkd48nwrq8yb7m4al7"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -49,12 +49,12 @@ let srcs.io_bazel_rules_sass srcs.platforms (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v7.0.zip" - else srcs."java_tools_javac11_linux-v7.0.zip") - srcs."coverage_output_generator-v2.1.zip" + then srcs."java_tools_javac11_darwin-v4.0.zip" + else srcs."java_tools_javac11_linux-v4.0.zip") + srcs."coverage_output_generator-v1.0.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.13.tar.gz" - srcs."0.28.3.tar.gz" + srcs."android_tools_pkg-0.8.tar.gz" + srcs."0.27.1.tar.gz" srcs.rules_pkg srcs.rules_cc srcs.rules_java @@ -106,12 +106,11 @@ let # and libraries path. # We prefetch it, patch it, and override it in a global bazelrc. system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - arch = stdenv.hostPlatform.parsed.cpu.name; remote_java_tools = stdenv.mkDerivation { name = "remote_java_tools_${system}"; - src = srcDepsSet."java_tools_javac11_${system}-v7.0.zip"; + src = srcDepsSet."java_tools_javac11_${system}-v4.0.zip"; nativeBuildInputs = [ autoPatchelfHook unzip ]; buildInputs = [ gcc-unwrapped ]; @@ -161,6 +160,7 @@ stdenv.mkDerivation rec { # This is breaking the build of any C target. This patch removes the last # argument if it's found to be an empty string. ../trim-last-argument-to-gcc-if-empty.patch + ./glibc.patch # --experimental_strict_action_env (which may one day become the default # see bazelbuild/bazel#2574) hardcodes the default @@ -247,7 +247,7 @@ stdenv.mkDerivation rec { touch $out ''); - bazelWithNixHacks = bazel.override { enableNixHacks = true; }; + bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; bazel-examples = fetchFromGitHub { owner = "bazelbuild"; @@ -494,11 +494,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel - # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch} - # The binary _must_ exist with this naming if your project contains a .bazelversion - # file. + # if it can’t find something in tools, it calls $out/bin/bazel-real cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel - mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + mv ./bazel_src/output/bazel $out/bin/bazel-real # shell completion files mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions @@ -537,7 +535,7 @@ stdenv.mkDerivation rec { exec "$BAZEL_REAL" "$@" EOF - # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} + # second call succeeds because it defers to $out/bin/bazel-real hello_test ''; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_0_29/glibc.patch new file mode 100644 index 000000000000..c4de48068f11 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/glibc.patch @@ -0,0 +1,78 @@ +From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853 +From: Benjamin Peterson <benjamin@dropbox.com> +Date: Fri, 3 May 2019 08:11:00 -0700 +Subject: [PATCH] Rename gettid() functions. + +glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. +--- + src/core/lib/gpr/log_linux.cc | 6 ++---- + src/core/lib/gpr/log_posix.cc | 4 ++-- + src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 81026e5689b..8b597b4cf2f 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_linux.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,7 @@ + #include <time.h> + #include <unistd.h> + +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = sys_gettid(); + + timer = static_cast<time_t>(now.tv_sec); + final_slash = strrchr(args->file, '/'); +diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc +index b6edc14ab6b..2f7c6ce3760 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_posix.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc +@@ -31,7 +31,7 @@ + #include <string.h> + #include <time.h> + +-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } ++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { + char* prefix; + gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", + gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line); ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); + + fprintf(stderr, "%-70s %s\n", prefix, args->message); + gpr_free(prefix); +diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc +index c2d80c08ddb..4a83cb6c215 100644 +--- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc ++++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc +@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, + } + + #ifndef NDEBUG +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + #endif + + /* pollset->mu lock must be held by the caller before calling this. +@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, + #define WORKER_PTR (&worker) + #endif + #ifndef NDEBUG +- WORKER_PTR->originator = gettid(); ++ WORKER_PTR->originator = sys_gettid(); + #endif + if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { + gpr_log(GPR_INFO, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_0_29/src-deps.json new file mode 100644 index 000000000000..f93794249ec7 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/src-deps.json @@ -0,0 +1,506 @@ +{ + "0.16.2.zip": { + "name": "0.16.2.zip", + "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", + "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" + ] + }, + "0.27.1.tar.gz": { + "name": "0.27.1.tar.gz", + "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz" + ] + }, + "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": { + "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + ] + }, + "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz": { + "name": "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz" + ] + }, + "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": { + "name": "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" + ] + }, + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { + "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": { + "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" + ] + }, + "android_tools_pkg-0.8.tar.gz": { + "name": "android_tools_pkg-0.8.tar.gz", + "sha256": "a9eac6e1b27d5549edaaa724b20eb1cdae6253b84f44d5744c30372bd523cfcd", + "urls": [ + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.8.tar.gz" + ] + }, + "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz": { + "name": "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz" + ] + }, + "bazel_j2objc": { + "name": "bazel_j2objc", + "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", + "strip_prefix": "j2objc-2.5", + "urls": [ + "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", + "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" + ] + }, + "bazel_skylib": { + "name": "bazel_skylib", + "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", + "strip_prefix": "bazel-skylib-f83cb8dd6f5658bc574ccd873e25197055265d1c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" + ] + }, + "bazel_toolchains": { + "name": "bazel_toolchains", + "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330", + "strip_prefix": "bazel-toolchains-0.27.1", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz" + ] + }, + "build_bazel_rules_nodejs": { + "name": "build_bazel_rules_nodejs", + "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", + "strip_prefix": "rules_nodejs-0.16.2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", + "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" + ] + }, + "com_google_googletest": { + "name": "com_google_googletest", + "sha256": "0fb00ff413f6b9b80ccee44a374ca7a18af7315aea72a43c62f2acd1ca74e9b5", + "strip_prefix": "googletest-f13bbe2992d188e834339abe6f715b2b2f840a77", + "urls": [ + "https://mirror.bazel.build/github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz", + "https://github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz" + ] + }, + "coverage_output_generator-v1.0.zip": { + "name": "coverage_output_generator-v1.0.zip", + "sha256": "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip" + ] + }, + "desugar_jdk_libs": { + "name": "desugar_jdk_libs", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { + "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": { + "name": "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" + ] + }, + "io_bazel_rules_sass": { + "name": "io_bazel_rules_sass", + "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", + "strip_prefix": "rules_sass-8ccf4f1c351928b55d5dddf3672e3667f6978d60", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" + ] + }, + "io_bazel_skydoc": { + "name": "io_bazel_skydoc", + "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829", + "strip_prefix": "skydoc-41c28e43dffbae39c52dd4b91932d1209e5a8893", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz" + ] + }, + "java_tools_javac11_darwin-v4.0.zip": { + "name": "java_tools_javac11_darwin-v4.0.zip", + "sha256": "fbf5bf22e9aab9c622e4c8c59314a1eef5ea09eafc5672b4f3250dc0b971bbcc", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_darwin-v4.0.zip" + ] + }, + "java_tools_javac11_linux-v4.0.zip": { + "name": "java_tools_javac11_linux-v4.0.zip", + "sha256": "96e223094a12c842a66db0bb7bb6866e88e26e678f045842911f9bd6b47161f5", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_linux-v4.0.zip" + ] + }, + "java_tools_javac11_windows-v4.0.zip": { + "name": "java_tools_javac11_windows-v4.0.zip", + "sha256": "a1de51447b2ba2eab923d589ba6c72c289c16e6091e6a3bb3e67a05ef4ad200c", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_windows-v4.0.zip" + ] + }, + "java_tools_langtools_javac10": { + "name": "java_tools_langtools_javac10", + "sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.zip" + ] + }, + "java_tools_langtools_javac11": { + "name": "java_tools_langtools_javac11", + "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" + ] + }, + "java_tools_langtools_javac12": { + "name": "java_tools_langtools_javac12", + "sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip" + ] + }, + "java_tools_langtools_javac9": { + "name": "java_tools_langtools_javac9", + "sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip" + ] + }, + "jdk10-server-release-1804.tar.xz": { + "name": "jdk10-server-release-1804.tar.xz", + "sha256": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be", + "urls": [ + "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz" + ] + }, + "jdk9-server-release-1708.tar.xz": { + "name": "jdk9-server-release-1708.tar.xz", + "sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022", + "urls": [ + "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz" + ] + }, + "openjdk10_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk10_linux_archive", + "sha256": "b3c2d762091a615b0c1424ebbd05d75cc114da3bf4f25a0dec5c51ea7e84146f", + "strip_prefix": "zulu10.2+3-jdk10.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64.tar.gz" + ] + }, + "openjdk11_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk11_linux_archive", + "sha256": "ddb0fd4526089cf1ce2db36282c282263f587a9e8be373fa02f511a12923cc48", + "strip_prefix": "zulu11.31.11-ca-jdk11.0.3-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.11-ca-jdk11.0.3/zulu11.31.11-ca-jdk11.0.3-linux_x64.tar.gz" + ] + }, + "openjdk12_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk12_linux_archive", + "sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13", + "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz" + ] + }, + "openjdk9_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk9_linux_archive", + "sha256": "45f2dfbee93b91b1468cf81d843fc6d9a47fef1f831c0b7ceff4f1eb6e6851c8", + "strip_prefix": "zulu9.0.7.1-jdk9.0.7-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64.tar.gz" + ] + }, + "openjdk_linux": { + "downloaded_file_path": "zulu-linux.tar.gz", + "name": "openjdk_linux", + "sha256": "460d8a4f0c0204160b48086e341b22943c9cca471b195340e75b38ae9eb33c1c", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209950.tar.gz" + ] + }, + "openjdk_linux_aarch64": { + "downloaded_file_path": "zulu-linux-aarch64.tar.gz", + "name": "openjdk_linux_aarch64", + "sha256": "23c37c0c3a8fdcbc68e96e70ff5c5c020c14db76deaae9b547849afda4586e5e", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-allmodules-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" + ] + }, + "openjdk_linux_aarch64_minimal": { + "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", + "name": "openjdk_linux_aarch64_minimal", + "sha256": "7af2583fe5ef0a781d4a9dca0c0160d42e7db1305ec1b66f98aa44c91cc875df", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-minimal-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" + ] + }, + "openjdk_linux_aarch64_vanilla": { + "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", + "name": "openjdk_linux_aarch64_vanilla", + "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" + ] + }, + "openjdk_linux_minimal": { + "downloaded_file_path": "zulu-linux-minimal.tar.gz", + "name": "openjdk_linux_minimal", + "sha256": "5123bc8dd21886761d1fd9ca0fb1898b3372d7243064a070ec81ca9c9d1a6791", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556011926.tar.gz" + ] + }, + "openjdk_linux_vanilla": { + "downloaded_file_path": "zulu-linux-vanilla.tar.gz", + "name": "openjdk_linux_vanilla", + "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" + ] + }, + "openjdk_macos": { + "downloaded_file_path": "zulu-macos.tar.gz", + "name": "openjdk_macos", + "sha256": "8fa61d85ca6f657d646fdb50cfc8634987f8f7d8a3250ed39fb7364647633252", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209951.tar.gz" + ] + }, + "openjdk_macos_minimal": { + "downloaded_file_path": "zulu-macos-minimal.tar.gz", + "name": "openjdk_macos_minimal", + "sha256": "ac56e44db46fd56ac78b39b6823daed4faa74a2677ac340c7d217f863884ec0f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003114.tar.gz" + ] + }, + "openjdk_macos_vanilla": { + "downloaded_file_path": "zulu-macos-vanilla.tar.gz", + "name": "openjdk_macos_vanilla", + "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" + ] + }, + "openjdk_win": { + "downloaded_file_path": "zulu-win.zip", + "name": "openjdk_win", + "sha256": "e6ddb361309f8e84eb5fb5ad8b0f5cc031ba3679910139262c31efd8f7579d05", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209972.zip" + ] + }, + "openjdk_win_minimal": { + "downloaded_file_path": "zulu-win-minimal.zip", + "name": "openjdk_win_minimal", + "sha256": "8e5dada6e9ebcc9ce29b4d051449bb95d3ee1e620e166da862224bbf15211f8b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003136.zip" + ] + }, + "openjdk_win_vanilla": { + "downloaded_file_path": "zulu-win-vanilla.zip", + "name": "openjdk_win_vanilla", + "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" + ] + }, + "platforms": { + "name": "platforms", + "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", + "strip_prefix": "platforms-441afe1bfdadd6236988e9cac159df6b5a9f5a98", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" + ] + }, + "rules_cc": { + "name": "rules_cc", + "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + ] + }, + "rules_java": { + "name": "rules_java", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "rules_pkg": { + "name": "rules_pkg", + "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" + ] + }, + "rules_pkg-0.2.0.tar.gz": { + "name": "rules_pkg-0.2.0.tar.gz", + "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" + ] + }, + "rules_proto": { + "name": "rules_proto", + "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d", + "strip_prefix": "rules_proto-b0cc14be5da05168b01db282fe93bdf17aa2b9f4", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": { + "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz", + "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": { + "name": "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz", + "sha256": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": { + "name": "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip", + "sha256": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip" + ] + }, + "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": { + "name": "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz", + "sha256": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz" + ] + }, + "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": { + "name": "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz", + "sha256": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz" + ] + }, + "zulu11.2.3-jdk11.0.1-win_x64.zip": { + "name": "zulu11.2.3-jdk11.0.1-win_x64.zip", + "sha256": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz": { + "name": "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz", + "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip": { + "name": "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip", + "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-win_x64.zip": { + "name": "zulu11.29.3-ca-jdk11.0.2-win_x64.zip", + "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" + ] + }, + "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": { + "name": "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz", + "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": { + "name": "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz", + "sha256": "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz": { + "name": "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz", + "sha256": "404e7058ff91f956612f47705efbee8e175a38b505fb1b52d8c1ea98718683de", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip": { + "name": "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip", + "sha256": "e738829017f107e7a7cd5069db979398ec3c3f03ef56122f89ba38e7374f63ed", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip" + ] + } +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index ffb5714631ca..eff8aede6c16 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, lib, fetchurl, fetchFromGitHub , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) -, bazel_1 +, bazel_self , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater @@ -247,7 +247,7 @@ stdenv.mkDerivation rec { touch $out ''); - bazelWithNixHacks = bazel_1.override { enableNixHacks = true; }; + bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; bazel-examples = fetchFromGitHub { owner = "bazelbuild"; @@ -258,20 +258,20 @@ stdenv.mkDerivation rec { in (if !stdenv.hostPlatform.isDarwin then { # `extracted` doesn’t work on darwin - shebang = callPackage ./shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; } else {}) // { - bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - - bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + + bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; # downstream packages using buildBazelPackage # fixed-output hashes of the fetch phase need to be spot-checked manually diff --git a/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix new file mode 100644 index 000000000000..edda48c4b992 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix @@ -0,0 +1,561 @@ +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub +, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs +# this package (through the fixpoint glass) +, bazel_self +, lr, xe, zip, unzip, bash, writeCBin, coreutils +, which, gawk, gnused, gnutar, gnugrep, gzip, findutils +# updater +, python27, python3, writeScript +# Apple dependencies +, cctools, libcxx, CoreFoundation, CoreServices, Foundation +# Allow to independently override the jdks used to build and run respectively +, buildJdk, runJdk +, buildJdkName +, runtimeShell +# Downstream packages for tests +, bazel-watcher +# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). +# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). +, enableNixHacks ? false +, gcc-unwrapped +, autoPatchelfHook +, file +, substituteAll +, writeTextFile +}: + +let + version = "2.1.0"; + + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + sha256 = "0ijz9lxralyw18r5ra2h79jnafk5521ncr3knaip74cqa28csw9k"; + }; + + # Update with `eval $(nix-build -A bazel.updater)`, + # then add new dependencies from the dict in ./src-deps.json as required. + srcDeps = lib.attrsets.attrValues srcDepsSet; + srcDepsSet = + let + srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); + toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { + urls = d.urls; + sha256 = d.sha256; + }); + in builtins.listToAttrs (map toFetchurl [ + srcs.desugar_jdk_libs + srcs.io_bazel_skydoc + srcs.bazel_skylib + srcs.io_bazel_rules_sass + srcs.platforms + (if stdenv.hostPlatform.isDarwin + then srcs."java_tools_javac11_darwin-v7.0.zip" + else srcs."java_tools_javac11_linux-v7.0.zip") + srcs."coverage_output_generator-v2.1.zip" + srcs.build_bazel_rules_nodejs + srcs."android_tools_pkg-0.13.tar.gz" + srcs."0.28.3.tar.gz" + srcs.rules_pkg + srcs.rules_cc + srcs.rules_java + srcs.rules_proto + ]); + + distDir = runCommand "bazel-deps" {} '' + mkdir -p $out + for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done + ''; + + defaultShellPath = lib.makeBinPath + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + # + [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ]; + + # Java toolchain used for the build and tests + javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; + + platforms = lib.platforms.linux ++ lib.platforms.darwin; + + # This repository is fetched by bazel at runtime + # however it contains prebuilt java binaries, with wrong interpreter + # and libraries path. + # We prefetch it, patch it, and override it in a global bazelrc. + system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; + arch = stdenv.hostPlatform.parsed.cpu.name; + + remote_java_tools = stdenv.mkDerivation { + name = "remote_java_tools_${system}"; + + src = srcDepsSet."java_tools_javac11_${system}-v7.0.zip"; + + nativeBuildInputs = [ autoPatchelfHook unzip ]; + buildInputs = [ gcc-unwrapped ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir $out; + ''; + + installPhase = '' + cp -Ra * $out/ + touch $out/WORKSPACE + ''; + }; + + bazelRC = writeTextFile { + name = "bazel-rc"; + text = '' + build --override_repository=${remote_java_tools.name}=${remote_java_tools} + build --distdir=${distDir} + startup --server_javabase=${runJdk} + + # load default location for the system wide configuration + try-import /etc/bazel.bazelrc + ''; + }; + +in +stdenv.mkDerivation rec { + pname = "bazel"; + inherit version; + + meta = with lib; { + homepage = "https://github.com/bazelbuild/bazel/"; + description = "Build tool that builds code quickly and reliably"; + license = licenses.asl20; + maintainers = [ maintainers.mboes ]; + inherit platforms; + }; + + inherit src; + sourceRoot = "."; + + patches = [ + # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' + # This is breaking the build of any C target. This patch removes the last + # argument if it's found to be an empty string. + ../trim-last-argument-to-gcc-if-empty.patch + + # --experimental_strict_action_env (which may one day become the default + # see bazelbuild/bazel#2574) hardcodes the default + # action environment to a non hermetic value (e.g. "/usr/local/bin"). + # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. + # So we are replacing this bazel paths by defaultShellPath, + # improving hermeticity and making it work in nixos. + (substituteAll { + src = ../strict_action_env.patch; + strictActionEnvPatch = defaultShellPath; + }) + + # bazel reads its system bazelrc in /etc + # override this path to a builtin one + (substituteAll { + src = ../bazel_rc.patch; + bazelSystemBazelRCPath = bazelRC; + }) + ] ++ lib.optional enableNixHacks ../nix-hacks.patch; + + + # Additional tests that check bazel’s functionality. Execute + # + # nix-build . -A bazel.tests + # + # in the nixpkgs checkout root to exercise them locally. + passthru.tests = + let + runLocal = name: attrs: script: + let + attrs' = removeAttrs attrs [ "buildInputs" ]; + buildInputs = [ python3 ] ++ (attrs.buildInputs or []); + in + runCommandCC name ({ + inherit buildInputs; + preferLocalBuild = true; + meta.platforms = platforms; + } // attrs') script; + + # bazel wants to extract itself into $install_dir/install every time it runs, + # so let’s do that only once. + extracted = bazelPkg: + let install_dir = + # `install_base` field printed by `bazel info`, minus the hash. + # yes, this path is kinda magic. Sorry. + "$HOME/.cache/bazel/_bazel_nixbld"; + in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' + export HOME=$(mktemp -d) + touch WORKSPACE # yeah, everything sucks + install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" + # assert it’s actually below install_dir + [[ "$install_base" =~ ${install_dir} ]] \ + || (echo "oh no! $install_base but we are \ + trying to copy ${install_dir} to $out instead!"; exit 1) + cp -R ${install_dir} $out + ''; + + bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: + let + be = extracted bazelPkg; + in runLocal name { inherit buildInputs; } ( + # skip extraction caching on Darwin, because nobody knows how Darwin works + (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + # set up home with pre-unpacked bazel + export HOME=$(mktemp -d) + mkdir -p ${be.install_dir} + cp -R ${be}/install ${be.install_dir} + + # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 + # Bazel checks whether the mtime of the install dir files + # is >9 years in the future, otherwise it extracts itself again. + # see PosixFileMTime::IsUntampered in src/main/cpp/util + # What the hell bazel. + ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} + '') + + + '' + # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 + # about why to create a subdir for the workspace. + cp -r ${workspaceDir} wd && chmod u+w wd && cd wd + + ${bazelScript} + + touch $out + ''); + + bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; + + bazel-examples = fetchFromGitHub { + owner = "bazelbuild"; + repo = "examples"; + rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc"; + sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8"; + }; + + in (if !stdenv.hostPlatform.isDarwin then { + # `extracted` doesn’t work on darwin + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + } else {}) // { + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + + bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + # downstream packages using buildBazelPackage + # fixed-output hashes of the fetch phase need to be spot-checked manually + downstream = recurseIntoAttrs ({ + inherit bazel-watcher; + } + # dm-sonnet is only packaged for linux + // (lib.optionalAttrs stdenv.isLinux { + # TODO(timokau) dm-sonnet is broken currently + # dm-sonnet-linux = python3.pkgs.dm-sonnet; + })); + }; + + # update the list of workspace dependencies + passthru.updater = writeScript "update-bazel-deps.sh" '' + #!${runtimeShell} + cat ${runCommand "bazel-deps.json" {} '' + ${unzip}/bin/unzip ${src} WORKSPACE + ${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out + ''} > ${builtins.toString ./src-deps.json} + ''; + + # Necessary for the tests to pass on Darwin with sandbox enabled. + # Bazel starts a local server and needs to bind a local address. + __darwinAllowLocalNetworking = true; + + # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. + customBash = writeCBin "bash" '' + #include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include <unistd.h> + + extern char **environ; + + int main(int argc, char *argv[]) { + char *path = getenv("PATH"); + char *pathToAppend = "${defaultShellPath}"; + char *newPath; + if (path != NULL) { + int length = strlen(path) + 1 + strlen(pathToAppend) + 1; + newPath = malloc(length * sizeof(char)); + snprintf(newPath, length, "%s:%s", path, pathToAppend); + } else { + newPath = pathToAppend; + } + setenv("PATH", newPath, 1); + execve("${bash}/bin/bash", argv, environ); + return 0; + } + ''; + + postPatch = let + + darwinPatches = '' + bazelLinkFlags () { + eval set -- "$NIX_LDFLAGS" + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" + done + } + + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails + export GCOV=${coreutils}/bin/false + + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 + export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD + + # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead + sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc + + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + + sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done + ''; + + genericPatches = '' + # Substitute j2objc and objc wrapper's python shebang to plain python path. + # These scripts explicitly depend on Python 2.7, hence we use python27. + # See also `postFixup` where python27 is added to $out/nix-support + substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + + # md5sum is part of coreutils + sed -i 's|/sbin/md5|md5sum|' \ + src/BUILD + + # substituteInPlace is rather slow, so prefilter the files with grep + grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do + # If you add more replacements here, you must change the grep above! + # Only files containing /bin are taken into account. + # We default to python3 where possible. See also `postFixup` where + # python3 is added to $out/nix-support + substituteInPlace "$path" \ + --replace /bin/bash ${customBash}/bin/bash \ + --replace "/usr/bin/env bash" ${customBash}/bin/bash \ + --replace "/usr/bin/env python" ${python3}/bin/python \ + --replace /usr/bin/env ${coreutils}/bin/env \ + --replace /bin/true ${coreutils}/bin/true + done + + # bazel test runner include references to /bin/bash + substituteInPlace tools/build_rules/test_rules.bzl \ + --replace /bin/bash ${customBash}/bin/bash + + for i in $(find tools/cpp/ -type f) + do + substituteInPlace $i \ + --replace /bin/bash ${customBash}/bin/bash + done + + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/bash ${customBash}/bin/bash + + # add nix environment vars to .bazelrc + cat >> .bazelrc <<EOF + build --distdir=${distDir} + fetch --distdir=${distDir} + build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" + build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" + build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" + build --host_javabase='@local_jdk//:jdk' + build --host_java_toolchain='${javaToolchain}' + EOF + + # add the same environment vars to compile.sh + sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ + -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \ + -i scripts/bootstrap/compile.sh + + # This is necessary to avoid: + # "error: no visible @interface for 'NSDictionary' declares the selector + # 'initWithContentsOfURL:error:'" + # This can be removed when the apple_sdk is upgraded beyond 10.13+ + sed -i '/initWithContentsOfURL:versionPlistUrl/ { + N + s/error:nil\];/\];/ + }' tools/osx/xcode_locator.m + + # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash + echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp + cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp + mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash + + patchShebangs . + ''; + in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + + genericPatches; + + buildInputs = [ + buildJdk + python3 + ]; + + # when a command can’t be found in a bazel build, you might also + # need to add it to `defaultShellPath`. + nativeBuildInputs = [ + zip + python3 + unzip + makeWrapper + which + customBash + ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; + + # Bazel makes extensive use of symlinks in the WORKSPACE. + # This causes problems with infinite symlinks if the build output is in the same location as the + # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a + # subdirectory. + # Failing to do this causes "infinite symlink expansion detected" + preBuildPhases = ["preBuildPhase"]; + preBuildPhase = '' + mkdir bazel_src + shopt -s dotglob extglob + mv !(bazel_src) bazel_src + ''; + + buildPhase = '' + # Increasing memory during compilation might be necessary. + # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" + ./bazel_src/compile.sh + ./bazel_src/scripts/generate_bash_completion.sh \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.bash \ + --prepend=./bazel_src/scripts/bazel-complete-header.bash \ + --prepend=./bazel_src/scripts/bazel-complete-template.bash + ''; + + installPhase = '' + mkdir -p $out/bin + + # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel + # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch} + # The binary _must_ exist with this naming if your project contains a .bazelversion + # file. + cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + + # shell completion files + mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions + mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel + cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ + ''; + + doInstallCheck = true; + installCheckPhase = '' + export TEST_TMPDIR=$(pwd) + + hello_test () { + $out/bin/bazel test --distdir=${distDir} \ + --test_output=errors \ + --java_toolchain='${javaToolchain}' \ + examples/cpp:hello-success_test \ + examples/java-native/src/test/java/com/example/myproject:hello + } + + cd ./bazel_src + + # test whether $WORKSPACE_ROOT/tools/bazel works + + mkdir -p tools + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exit 1 + EOF + chmod +x tools/bazel + + # first call should fail if tools/bazel is used + ! hello_test + + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exec "$BAZEL_REAL" "$@" + EOF + + # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} + hello_test + ''; + + # Save paths to hardcoded dependencies so Nix can detect them. + postFixup = '' + mkdir -p $out/nix-support + echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends + # The templates get tar’d up into a .jar, + # so nix can’t detect python is needed in the runtime closure + # Some of the scripts explicitly depend on Python 2.7. Otherwise, we + # default to using python3. Therefore, both python27 and python3 are + # runtime dependencies. + echo "${python27}" >> $out/nix-support/depends + echo "${python3}" >> $out/nix-support/depends + '' + lib.optionalString stdenv.isDarwin '' + echo "${cctools}" >> $out/nix-support/depends + ''; + + dontStrip = true; + dontPatchELF = true; +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_2/src-deps.json index 7517a8c1b958..7517a8c1b958 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_2/src-deps.json diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index ec1577c51079..9e2fb13b0e7a 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { pname = "bear"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ python ]; # just for shebang of bin/bear + buildInputs = [ python3 ]; # just for shebang of bin/bear doCheck = false; # all fail diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index ed1e6a174ce4..944bbd9d4bb3 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200212"; + version = "20200318"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "134ibplk5rj7s3ig2czbhqs89l45jl6vswg3cy6xzm0anz5smhb2"; + sha256 = "10rcgv0hd5axm2b41a5xaig6iqbpyqfp2q7llr7zc3mnbacwaz35"; }; nativeBuildInputs = [ getopt ]; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 0a6335a3eb72..ac41394e6a83 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.16.5"; + version = "3.17.0"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz"; + sha256 = "0iq8y1rb5dqnzrwy4lssr76hbnnvh54q2ympl97wrshma6shak5p"; }; patches = [ diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 59b1b14ac5fa..114cdc634c8e 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,5 +1,17 @@ { lib, python3, git, pkgconfig }: +# Note: +# Conan has specific dependency demanands; check +# https://github.com/conan-io/conan/blob/master/conans/requirements.txt +# https://github.com/conan-io/conan/blob/master/conans/requirements_server.txt +# on the release branch/commit we're packaging. +# +# Two approaches are used here to deal with that: +# Pinning the specific versions it wants in `newPython`, +# and using `substituteInPlace conans/requirements.txt ...` +# in `postPatch` to allow newer versions when we know +# (e.g. from changelogs) that they are compatible. + let newPython = python3.override { packageOverrides = self: super: { distro = super.distro.overridePythonAttrs (oldAttrs: rec { @@ -16,20 +28,6 @@ let newPython = python3.override { sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0"; }; }); - future = super.future.overridePythonAttrs (oldAttrs: rec { - version = "0.16.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; - }; - }); - tqdm = super.tqdm.overridePythonAttrs (oldAttrs: rec { - version = "4.28.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1fyybgbmlr8ms32j7h76hz5g9xc6nf0644mwhc40a0s5k14makav"; - }; - }); pluginbase = super.pluginbase.overridePythonAttrs (oldAttrs: rec { version = "0.7"; src = oldAttrs.src.override { @@ -41,18 +39,34 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.12.3"; + version = "1.24.0"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "1cnfy9b57apps4bfai6r67g0mrvgnqa154z9idv0kf93k1nvx53g"; + sha256 = "0nkh4f6plamijwcfw536ydm0i04y74qmkh5l1nanyb8p0c3z3x0y"; }; propagatedBuildInputs = with newPython.pkgs; [ - colorama deprecation distro fasteners bottle - future node-semver patch pygments pluginbase - pyjwt pylint pyyaml requests six tqdm + bottle + colorama + dateutil + deprecation + distro + fasteners + future + jinja2 + node-semver + patch-ng + pluginbase + pygments + pyjwt + pylint # Not in `requirements.txt` but used in hooks, see https://github.com/conan-io/conan/pull/6152 + pyyaml + requests + six + tqdm + urllib3 ]; checkInputs = [ @@ -68,15 +82,13 @@ in newPython.pkgs.buildPythonApplication rec { webtest ]); - checkPhase = '' - export HOME=$TMPDIR - pytest conans/test/{utils,unittests} \ - -k 'not SVN and not ToolsNetTest' - ''; + # Conan 1.14.0 has removed all tests from the Pypi source dist: + # https://github.com/conan-io/conan/pull/4713 + # We have recommended they be added back: + # https://github.com/conan-io/conan/issues/4563#issuecomment-602225083 + doCheck = false; postPatch = '' - substituteInPlace conans/requirements_server.txt \ - --replace "pluginbase>=0.5, < 1.0" "pluginbase>=0.5" substituteInPlace conans/requirements.txt \ --replace "PyYAML>=3.11, <3.14.0" "PyYAML" ''; diff --git a/pkgs/development/tools/build-managers/drake/Gemfile.lock b/pkgs/development/tools/build-managers/drake/Gemfile.lock index 52060a0e6254..466133010e04 100644 --- a/pkgs/development/tools/build-managers/drake/Gemfile.lock +++ b/pkgs/development/tools/build-managers/drake/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES drake BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index ef2b155482f1..44c91e936097 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -67,10 +67,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Package and build manager for D applications and libraries"; - homepage = http://code.dlang.org/; + homepage = "https://code.dlang.org/"; license = licenses.mit; maintainers = with maintainers; [ ThomasMader ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } - diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index d8557bfcbc27..599e10af1a9a 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,31 +1,37 @@ { stdenv, lib, fetchgit, darwin, writeText -, git, ninja, python3 }: +, ninja, python3 +}: let - rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; - sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy"; + # Note: Please use the recommended version for Chromium, e.g.: + # https://git.archlinux.org/svntogit/packages.git/tree/trunk/chromium-gn-version.sh?h=packages/gn + rev = "fd3d768bcfd44a8d9639fe278581bd9851d0ce3a"; + revNum = "1718"; # git describe HEAD --match initial-commit | cut -d- -f3 + version = "2020-03-09"; + sha256 = "1asc14y8by7qcn10vbk467hvx93s30pif8r0brissl0sihsaqazr"; - shortRev = builtins.substring 0 7 rev; + revShort = builtins.substring 0 7 rev; lastCommitPosition = writeText "last_commit_position.h" '' #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION "(${shortRev})" + #define LAST_COMMIT_POSITION_NUM ${revNum} + #define LAST_COMMIT_POSITION "${revNum} (${revShort})" #endif // OUT_LAST_COMMIT_POSITION_H_ ''; -in -stdenv.mkDerivation { - pname = "gn"; - version = "20190403"; +in stdenv.mkDerivation { + pname = "gn-unstable"; + inherit version; src = fetchgit { + # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic! url = "https://gn.googlesource.com/gn"; inherit rev sha256; }; - nativeBuildInputs = [ ninja python3 git ]; + nativeBuildInputs = [ ninja python3 ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ libobjc cctools @@ -49,8 +55,8 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = with lib; { - description = "A meta-build system that generates NinjaBuild files"; - homepage = https://gn.googlesource.com/gn; + description = "A meta-build system that generates build files for Ninja"; + homepage = "https://gn.googlesource.com/gn"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ stesie matthewbauer ]; diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/pkgs/development/tools/build-managers/rake/Gemfile.lock index 992a0bc8929f..f89ceae93442 100644 --- a/pkgs/development/tools/build-managers/rake/Gemfile.lock +++ b/pkgs/development/tools/build-managers/rake/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES rake BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index 063a2c198dab..f8b649e04093 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "samurai"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "michaelforney"; repo = pname; rev = version; - sha256 = "1jsxfpwa6q893x18qlvpsiym29rrw5cj0k805wgmk2n57j9rw4f2"; + sha256 = "0k0amxpi3v9v68a8vc69r4b86xs12vhzm0wxd7f11vap1pnqz2cz"; }; makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 5d2a713cfc41..2336900bf856 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "0pcrbpsvccyxdwc7f8h87rkn0kalar0iypnh3gygw4c0fm4yvci7"; + sha256 = "06k4dyb5gjnqx70akjfb65hiafh683800bncbq33kmq77arfkm7c"; }; patchPhase = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.scala-sbt.org/; + homepage = "https://www.scala-sbt.org/"; license = licenses.bsd3; description = "A build tool for Scala, Java and more"; maintainers = with maintainers; [ nequissimus ]; diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 740d04d853f7..41ac16bed7a1 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -1,25 +1,22 @@ { version, sha256 }: -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3Packages, python2Packages, scons }: -let name = "scons"; -in python2Packages.buildPythonApplication { - name = "${name}-${version}"; +python3Packages.buildPythonApplication rec { + pname = "scons"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/scons/${pname}-${version}.tar.gz"; inherit sha256; }; - # Fix a regression in 3.0.0 (causes build errors for some packages) - patches = stdenv.lib.optional (version == "3.0.0") ./print-statements.patch; - setupHook = ./setup-hook.sh; + passthru.py2 = scons.override { python3Packages = python2Packages; }; + meta = with stdenv.lib; { - homepage = http://scons.org/; description = "An improved, cross-platform substitute for Make"; - license = licenses.mit; longDescription = '' SCons is an Open Source software construction tool. Think of SCons as an improved, cross-platform substitute for the classic @@ -28,6 +25,9 @@ in python2Packages.buildPythonApplication { SCons is an easier, more reliable and faster way to build software. ''; + homepage = "https://scons.org/"; + changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; + license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.primeos ]; }; diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 0afe2fbe9281..19b092b86bab 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,12 +1,12 @@ -{ callPackage }: +{ callPackage, python2Packages }: let mkScons = args: callPackage (import ./common.nix args) { }; in { - scons_3_0_1 = mkScons { + scons_3_0_1 = (mkScons { version = "3.0.1"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; - }; + }).override { python3Packages = python2Packages; }; scons_latest = mkScons { version = "3.1.2"; sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; diff --git a/pkgs/development/tools/build-managers/scons/print-statements.patch b/pkgs/development/tools/build-managers/scons/print-statements.patch deleted file mode 100644 index a963bf78abab..000000000000 --- a/pkgs/development/tools/build-managers/scons/print-statements.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py -index 558e28f9..8fea9c4d 100644 ---- src/engine/SCons/Script/SConscript.py -+++ src/engine/SCons/Script/SConscript.py -@@ -5,8 +5,6 @@ - - """ - --from __future__ import print_function -- - # - # __COPYRIGHT__ - # diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 38998e8db340..439350c3abc2 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -11,17 +11,23 @@ wafConfigurePhase() { fi local flagsArray=( - @crossFlags@ "${flagsArray[@]}" $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} ) + if [ -z "${dontAddWafCrossFlags:-}" ]; then + flagsArray+=(@crossFlags@) + fi echoCmd 'configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" runHook postConfigure } +if [ -z "${dontUseWafConfigure-}" -a -z "${configurePhase-}" ]; then + configurePhase=wafConfigurePhase +fi + wafBuildPhase () { runHook preBuild @@ -41,6 +47,10 @@ wafBuildPhase () { runHook postBuild } +if [ -z "${dontUseWafBuild-}" -a -z "${buildPhase-}" ]; then + buildPhase=wafBuildPhase +fi + wafInstallPhase() { runHook preInstall @@ -51,7 +61,7 @@ wafInstallPhase() { local flagsArray=( $wafFlags ${wafFlagsArray[@]} $installFlags ${installFlagsArray[@]} - ${installTargets:-install} + ${installTargets:-install} ) echoCmd 'install flags' "${flagsArray[@]}" @@ -60,6 +70,6 @@ wafInstallPhase() { runHook postInstall } -configurePhase=wafConfigurePhase -buildPhase=wafBuildPhase -installPhase=wafInstallPhase +if [ -z "${dontUseWafInstall-}" -a -z "${installPhase-}" ]; then + installPhase=wafInstallPhase +fi diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index f48aa35852b0..7fbb21ffb120 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { pname = "buildah"; - version = "1.14.3"; + version = "1.14.8"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "1qghlba8396gj9dfih8hg249gzwx0gpw9cysdw2vh8z52jhi5sx9"; + sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q"; }; outputs = [ "bin" "man" "out" ]; @@ -39,6 +39,6 @@ buildGoPackage rec { homepage = "https://buildah.io/"; changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ]; + maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; }; } diff --git a/pkgs/development/tools/cadre/Gemfile.lock b/pkgs/development/tools/cadre/Gemfile.lock index c14df9cffa61..5d22e69f31c0 100644 --- a/pkgs/development/tools/cadre/Gemfile.lock +++ b/pkgs/development/tools/cadre/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES cadre (= 1.0.4) BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/cbor-diag/Gemfile.lock b/pkgs/development/tools/cbor-diag/Gemfile.lock index 9f9a160c587f..8bebc81ebd9f 100644 --- a/pkgs/development/tools/cbor-diag/Gemfile.lock +++ b/pkgs/development/tools/cbor-diag/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES cbor-diag BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/development/tools/cddl/Gemfile.lock index cd4e1407637a..796a7743cac5 100644 --- a/pkgs/development/tools/cddl/Gemfile.lock +++ b/pkgs/development/tools/cddl/Gemfile.lock @@ -27,4 +27,4 @@ DEPENDENCIES cddl BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 47346c1bc45a..ce23018bd738 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -723,4 +723,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 8317473570da..163bfeb688a1 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ pname = "clj-kondo"; - version = "2019.12.14"; + version = "2020.03.20"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "1mprwqc5ydqn2wkssrj2g3wbpjss7flv584wss9j0jjfgy7jc4s1"; + sha256 = "05z80cdzk8aw3j0nxfynzwpb9hhpbl54bbrv18dpqj5dj893mbgm"; }; dontUnpack = true; diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index a13433e784b1..5a05b7ca7c0a 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; - version = "1.8.1"; + version = "1.8.4"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v${version}"; - sha256 = "0lh06cnjddmy5h5xvbkg8f97vw2v0wr5fi7vrs3nnidiz7x4rsja"; + sha256 = "1lllam0zgr26fbg04hnw1sy35grwrs4br8cx4r9vqjf113cyr80x"; }; - cargoSha256 = "1q7vilh0bynhdz5bbpig5ibaqvk2153n07gmc715qb80w92sjw7w"; + cargoSha256 = "0yvnqp15iqv142vcgsmcad07r5nnp417c0iqa9qgyzn39ssgpn0r"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/compass/Gemfile.lock b/pkgs/development/tools/compass/Gemfile.lock index 43790d9e7a1e..ecae8fdd7f62 100644 --- a/pkgs/development/tools/compass/Gemfile.lock +++ b/pkgs/development/tools/compass/Gemfile.lock @@ -28,4 +28,4 @@ DEPENDENCIES compass! BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index fe8d58f76827..133526c569a0 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -1,28 +1,26 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "conftest"; - version = "0.15.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "instrumenta"; repo = "conftest"; rev = "v${version}"; - sha256 = "0lb644fj80r4igxbslbd5pksirnyf6slz4yn0mznyx8i2bd1g4ic"; + sha256 = "0ial1zs5aqcwza813ny6zqn9ybq6ibrqjmaccwbbam1k9f5rplqv"; }; - modSha256 = "1p7fjg1vcrcxb4f5hd00qxx4fqcl051klcjs6ljn4v46qcpn6dcn"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "17j5fhgwfpyg9r7a5g9rmvkaz510xx9s4mbl1cmyzysvddc6f5wp"; buildFlagsArray = '' -ldflags= -X main.version=${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Write tests against structured configuration data"; - homepage = https://github.com/instrumenta/conftest; + homepage = "https://github.com/instrumenta/conftest"; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; platforms = platforms.all; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index c6e4878d52c4..a3df81d26053 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: -buildGoModule rec { +let version = "1.2.1"; +in buildGoModule rec { + inherit version; pname = "drone-cli"; - version = "1.2.1"; + revision = "v${version}"; + goPackagePath = "github.com/drone/drone-cli"; modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b"; @@ -13,12 +16,10 @@ buildGoModule rec { src = fetchFromGitHub { owner = "drone"; repo = "drone-cli"; - rev = "v${version}"; + rev = revision; sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { maintainers = with maintainers; [ bricewge ]; license = licenses.asl20; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index e1f0a8de3b87..05257f65af52 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { name = "drone.io-${version}"; @@ -14,8 +14,6 @@ buildGoModule rec { sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { maintainers = with maintainers; [ elohmeier vdemeester ]; license = licenses.asl20; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 4093e7e01728..483b8e6b30c4 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -1,17 +1,17 @@ -{ buildGoModule, fetchFromGitHub, stdenv, writeText, Security }: +{ buildGoModule, fetchFromGitHub, lib, writeText }: buildGoModule rec { pname = "fly"; - version = "5.8.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0ji3jya4b2b4l6dlvydh3k2jfh6kkhii23d6rmi49ypydhn1qmgj"; + sha256 = "0chavwymyh5kv4fkvdjvf3p5jjx4yn9aavq66333xnsl5pn7q9dq"; }; - modSha256 = "14wwspp8x6i4ry23bz8b08mfyzrwc9m7clrylxzr8j67yhg5kw6v"; + modSha256 = "1wiyfii4rmj3rp8ls0ill0sjpnpjz7l3q5fzrscm8ap1qn90gvzg"; subPackages = [ "fly" ]; @@ -20,8 +20,6 @@ buildGoModule rec { -X github.com/concourse/concourse.Version=${version} ''; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - # The fly.bash file included with this derivation can be replaced by a # call to `fly completion bash` once the `completion` subcommand has # made it into a release. Similarly, `fly completion zsh` will provide @@ -30,7 +28,7 @@ buildGoModule rec { install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line interface to Concourse CI"; homepage = "https://concourse-ci.org"; license = licenses.asl20; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 0fe4de98f1d2..ec02cb26b8e3 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 { pname = "jenkins"; - version = "2.204.5"; + version = "2.222.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "17437wshci2fyvvaznzk738m2npqa61w16aw5jslw2ifnyjkziwl"; + sha256 = "0glmx8xi99mbfr84hi4sn36qkxw00rfn8wlz5n674ygbdj1vnv2s"; }; buildCommand = '' diff --git a/pkgs/development/tools/corundum/Gemfile.lock b/pkgs/development/tools/corundum/Gemfile.lock index 40ad1948394f..596a689e3a2d 100644 --- a/pkgs/development/tools/corundum/Gemfile.lock +++ b/pkgs/development/tools/corundum/Gemfile.lock @@ -53,4 +53,4 @@ DEPENDENCIES corundum (= 0.6.2) BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/development/tools/cucumber/Gemfile.lock index a9a2d073de4e..82a972144938 100644 --- a/pkgs/development/tools/cucumber/Gemfile.lock +++ b/pkgs/development/tools/cucumber/Gemfile.lock @@ -31,4 +31,4 @@ DEPENDENCIES cucumber BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 4950e885e25c..98bf5249b626 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchgit, stdenv, Security }: +{ buildGoModule, fetchgit, stdenv }: buildGoModule rec { pname = "cue"; @@ -12,8 +12,6 @@ buildGoModule rec { modSha256 = "04dapx75zwi8cv1pj3c6266znrhwihv3df4izm3gjk34r2i07q6s"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "cmd/cue" ]; buildFlagsArray = [ diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 57aa9c654d7f..efc20b6972be 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dbmate"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Database migration tool"; homepage = https://github.com/amacneil/dbmate; diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix new file mode 100644 index 000000000000..97bfc10b20af --- /dev/null +++ b/pkgs/development/tools/database/dbmate/deps.nix @@ -0,0 +1,84 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "2cc627ac8defc45d65066ae98f898166f580f9a4"; + sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "a79fa1e548e2c689c241d10173efd51e5d689d5b"; + sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "19c8e9ad00952ce0c64489b60e8df88bb16dd514"; + sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "6c771bb9887719704b210e87e934f08be014bdb1"; + sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; + sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; + sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; + }; + } +] diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 890ef73a73f9..d66d54ef45bb 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.8.7"; + version = "3.8.8"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0gs3pmzyx2bz6af2fr5jla3s33vfaw64pgahfvj5bgpj6d7vx1wg"; + sha256 = "1pl9wgnwykvbnis0ndym0lbsj6a7lvpghrc98cw2hdnp5dglxjjl"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 8881bce1a388..fada7fd1e074 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.1.0"; + version = "1.3.2"; # Python 2 won't have prompt_toolkit 2.x.x # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0cqil2cmnbw0jvb14v6kbr7l9yarfgy253cbb8v9znp0l4qfs7ra"; + sha256 = "0bfx7fw6jnkqxa82xvd10yx1w2wbmrrqxwbh4anp5x9wnl91a9lp"; }; propagatedBuildInputs = with python3Packages; [ @@ -30,7 +30,8 @@ python3Packages.buildPythonApplication rec { preCheck = '' export XDG_CONFIG_HOME=$TMP # add missing file - echo "litecli is awesome!" > tests/test.txt + mkdir -p tests/data + echo -e "t1,11\nt2,22\n" > tests/data/import_data.csv ''; meta = with lib; { diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/development/tools/database/sqlite-web/default.nix index a1b8ece12362..9a9314fde9b1 100644 --- a/pkgs/development/tools/database/sqlite-web/default.nix +++ b/pkgs/development/tools/database/sqlite-web/default.nix @@ -4,11 +4,11 @@ python3Packages.buildPythonApplication rec { pname = "sqlite-web"; - version = "0.3.5"; + version = "0.3.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "9e0c8938434b0129423544162d4ca6975abf7042c131445f79661a4b9c885d47"; + sha256 = "17pymadm063358nji70xzma64zkfv26c3pai5i1whsfp9ahqzasg"; }; propagatedBuildInputs = with python3Packages; [ flask peewee pygments ]; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Web-based SQLite database browser"; - homepage = https://github.com/coleifer/sqlite-web; + homepage = "https://github.com/coleifer/sqlite-web"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix index 7db4db246891..dbf00ea8e05e 100644 --- a/pkgs/development/tools/distgen/default.nix +++ b/pkgs/development/tools/distgen/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "distgen"; - version = "1.4"; + version = "1.5"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "13k940xgpci754gmmnhz3j5rfvlg9hdh21j4yjh8dlr6g88qjc1x"; + sha256 = "08f9rw5irgv0gw7jizk5f9csn0yhrdnb84k40px1zbypsylvr5c5"; }; checkInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 91889e80c044..5d4de99ffdbf 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }: buildGoModule rec { pname = "dive"; @@ -15,8 +15,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/development/tools/ejson/Gemfile.lock b/pkgs/development/tools/ejson/Gemfile.lock index 52c82545bf36..d0a51c0a0623 100644 --- a/pkgs/development/tools/ejson/Gemfile.lock +++ b/pkgs/development/tools/ejson/Gemfile.lock @@ -51,4 +51,4 @@ DEPENDENCIES ronn BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 1498d179d22b..746d66c2dbe8 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.2.4"; + version = "6.3.2"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1ng4ygd44hl63amjaizldsngn72jfz5pqw7wgr1vyvdxdzjfcnwm"; + sha256 = "1av1q7znphpsi1iz4dbh0fgh3jsx9prz980b25yk5r89h518s76q"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix index 3100daae389b..71365c01bfdd 100644 --- a/pkgs/development/tools/fmbt/default.nix +++ b/pkgs/development/tools/fmbt/default.nix @@ -4,14 +4,14 @@ , tesseract, gts, libXtst }: stdenv.mkDerivation rec { - version = "0.39"; + version = "0.42"; pname = "fMBT"; src = fetchFromGitHub { owner = "intel"; repo = "fMBT"; rev = "v${version}"; - sha256 = "15sxwdcsjybq50vkla4md2ay8m67ndc4vwcsl5vwsjkim5qlxslb"; + sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/pkgs/development/tools/git-repo-updater/default.nix index 6acb628a322c..dbf83677999a 100644 --- a/pkgs/development/tools/git-repo-updater/default.nix +++ b/pkgs/development/tools/git-repo-updater/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "gitup"; - version = "0.5"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "11ilz9i2yxrbipyjzpfkj7drx9wkrn3phvd1a60jivphbqdldpgf"; + sha256 = "1pa612rcc94nc461zs9sag9p46sycc214622b06gdn35rmwp0y2g"; }; propagatedBuildInputs = [ colorama GitPython ]; diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile.lock b/pkgs/development/tools/github-changelog-generator/Gemfile.lock index b1b955cba940..d1f67ddd4747 100644 --- a/pkgs/development/tools/github-changelog-generator/Gemfile.lock +++ b/pkgs/development/tools/github-changelog-generator/Gemfile.lock @@ -46,4 +46,4 @@ DEPENDENCIES github_changelog_generator (= 1.14.3) BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index b047689b81f9..1fd17060bd4f 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -1,7 +1,6 @@ { buildGoModule -, stdenv +, lib , fetchFromGitHub -, Security }: buildGoModule rec { @@ -17,11 +16,9 @@ buildGoModule rec { sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p"; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of tools and libraries for working with Go code, including linters and static analysis"; homepage = https://staticcheck.io; license = licenses.mit; diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 26458a3ca2ef..adf0977c67d4 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -19,7 +19,8 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; - buildInputs = [ go-bindata gotools makeWrapper ]; + nativeBuildInputs = [ go-bindata gotools makeWrapper ]; + preBuild = ''go generate ./...''; postInstall = '' diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 56b81f494e15..832d30ee8e87 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.2"; + version = "3.2.1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "0f15izjl4i2xlz1xj5pcslzl9gm3rmr3c21gh256ynpi2zhhkcdd"; + sha256 = "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 00858e94bc55..14311b0c7a51 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "golangci-lint"; @@ -14,9 +14,7 @@ buildGoModule rec { modSha256 = "0ab1s8pqkpss15rd9brin39lzx2fqkvq2v3nhk8kfrgpari2addk"; subPackages = [ "cmd/golangci-lint" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = "https://golangci.com/"; license = licenses.agpl3; diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 0f42a5e34903..9b33d6e06708 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -9,7 +9,7 @@ let ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}\${PATH:+':'}$PATH" + export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+':'}$PATH ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ''; in diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index c20f3b9dc124..477a476dfe78 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "hcloud"; @@ -15,8 +15,6 @@ buildGoModule rec { modSha256 = "1zy41hi2qzrdmih3pkpng8im576lhkr64zm66w73p7jyvy0kf9sx"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; postInstall = '' diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index 210dc101a245..f703cb707e62 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -100,4 +100,4 @@ DEPENDENCIES jazzy BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock index 2a95d72c9465..d8331181652b 100644 --- a/pkgs/development/tools/jsduck/Gemfile.lock +++ b/pkgs/development/tools/jsduck/Gemfile.lock @@ -20,4 +20,4 @@ DEPENDENCIES jsduck BUNDLED WITH - 1.13.6 + 2.1.4 diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 5641a14e1ab3..b0b73d03d10c 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.4.5"; + version = "0.5.10"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0a4bml9nxvyh110a60l4lc11yr2ds5r8d3iplslccrkq1ka96av9"; + sha256 = "0s8np28glzn3kmh59dwk86yc9fb2lm9fq2325kzmy7rkb5jsdcl1"; }; - cargoSha256 = "0wp61zjws9r1aapkapvq2vmad5kylkpw03wa82qhhq30knkpvr7b"; + cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l"; + + postInstall = '' + # generate completion scripts for just + + mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + + $out/bin/just --completions bash > "$out/share/bash-completion/completions/just" + $out/bin/just --completions fish > "$out/share/fish/vendor_completions.d/just.fish" + $out/bin/just --completions zsh > "$out/share/zsh/site-functions/_just" + ''; checkInputs = [ coreutils bash dash ]; @@ -20,20 +30,25 @@ rustPlatform.buildRustPackage rec { export USER=just-user export USERNAME=just-user - sed -i tests/integration.rs \ - -e "s@/bin/echo@${coreutils}/bin/echo@g" \ - -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" - - sed -i tests/interrupts.rs \ - -e "s@/bin/echo@${coreutils}/bin/echo@g" \ - -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" - sed -i src/justfile.rs \ + -i tests/*.rs \ -e "s@/bin/echo@${coreutils}/bin/echo@g" \ -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" + -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \ + -e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g" + ''; + + # Skip "edit" when running "cargo test", + # since this test case needs "cat". + checkPhase = '' + runHook preCheck + echo "Running cargo test -- + --skip edit + ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" + cargo test -- \ + --skip edit \ + ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + runHook postCheck ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 0d42df3b5e4d..bbcb10a354cf 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kcli"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 0910c061ee50..7c6f3f3396cf 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kubeprompt"; @@ -21,8 +21,6 @@ buildGoModule rec { goPackagePath = "github.com/jlesquembre/kubeprompt"; modSha256 = "0rbpdk2dixywn3wcdgz48f3xw3b7fk8xh7mrlx27wz7fq5wj9v8f"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Kubernetes prompt"; homepage = "https://github.com/jlesquembre/kubeprompt"; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index cadaf8238b36..c1fc313fbc10 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { pname = "kubie"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "0c94ggrkzyy8zl2z5r4pgfscyhcjp4x64k3bl2byqp3ysgjwkjqx"; + sha256 = "186h5fng16gwqhsy2nxswbrrxsx0ysqrb4pqznyygbiz5cd9bgxp"; }; - cargoSha256 = "1lzyda838s9fmg8hibg2w2wszwyvvqsy20w9877skfcx370rvndi"; + cargoSha256 = "1yllpi8dp1fy39z4zmhyf1hdjpl62vwh8b8qlj0g778qsdrm9p98"; meta = with stdenv.lib; { description = diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ce173e89a2c5..e60181e9bc4c 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub, tree }: buildGoModule rec { pname = "kustomize"; @@ -25,9 +25,7 @@ buildGoModule rec { modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Customization of kubernetes YAML configurations"; longDescription = '' kustomize lets you customize raw, template-free YAML files for diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 9a27c7d44e9c..4b99cfb10e0d 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.16.2"; + version = "0.18"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "0lvhj4iz74h97lkylqg7hl18xcxcl9msxxvap7jqdj2mf2iwxi32"; + sha256 = "1zc6y386w111ygyng5s74zg49iajzs77dbrcdy33igj0hbnkwq2x"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 6a6aafaf9e5e..85a27fd9150b 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ let baseName = "metals"; - version = "0.8.2"; + version = "0.8.3"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -15,7 +15,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "09acvrfv23q1iv4sq7jhpf5frcv7dk2nq147licma5iixc726bdx"; + outputHash = "1l196glr7rbsvrqmq6i7iw532jkz8d1w5m9nh0kh5z12visc7bkk"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 921ee3d158c8..aedf2ab881dc 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: let - version = "2.4.2"; + version = "2.4.3"; in stdenv.mkDerivation { pname = "minizinc-ide"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { owner = "MiniZinc"; repo = "MiniZincIDE"; rev = version; - sha256 = "1xqs27f14r79vcxf9bx72bbnhxc913lpr5d8cv31dacbq5fyxkw7"; + sha256 = "0dfqh73rnp00336pyr1hlgl1wb4m2kh28zvdkamjgml60gmg6wdr"; }; sourceRoot = "source/MiniZincIDE"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.minizinc.org/; + homepage = "https://www.minizinc.org/"; description = "IDE for MiniZinc, a medium-level constraint modelling language"; longDescription = '' diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 17ff15265f25..885cef99111c 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "act"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn"; + sha256 = "0qx3vwsynmil1h3d2dzvqz0jzshfyy3vin14zjfmd353d915hf06"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r"; + modSha256 = "0276dngh29kzgm95d23r8ajjrrkss0v0f0wfq1ribgsxh17v0y5n"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Run your GitHub Actions locally"; homepage = "https://github.com/nektos/act"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 1e432a6e149b..d6353fc0b9cf 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { - name = "automake-1.16.1"; + name = "automake-1.16.2"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax"; + sha256 = "1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c"; }; nativeBuildInputs = [ autoconf perl ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { - branch = "1.15"; - homepage = https://www.gnu.org/software/automake/; + branch = "1.16"; + homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 0ab126b63e73..fde1c68d34d0 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "circleci-cli"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; preBuild = '' diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 4f8ae1a41498..c12d0319386c 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,19 +2,23 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200305T151710"; + version = "20200314T202821"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "0zi05skp36azv0b6spxdscal32cj5rc6g0d0gzfnsaavvxd128lg"; + sha256 = "1phfy4cw8pdx2ylfqc4gkniawlz5qn1bih64cx0hsc5i8n0v6qjz"; }; dontUnpack = true; installPhase = '' install -Dm755 $src $out/bin/clojure-lsp + sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/clojure-lsp ''; + # verify shebang patch + installCheckPhase = "PATH= clojure-lsp --version"; + meta = with stdenv.lib; { description = "Language Server Protocol (LSP) for Clojure"; homepage = "https://github.com/snoe/clojure-lsp"; diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 335cd2f25247..88c43a8c42a5 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "editorconfig-checker"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to verify that your files are in harmony with your .editorconfig"; homepage = "https://editorconfig-checker.github.io/"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 06f1e2895c02..7d6f3758fd5b 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -28,41 +28,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # This program does not cross-build fine. So I only cross-build some parts - # I need for the linux perf tool. - # On the awful cross-building: - # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005 - # - # I wrote this testing for the nanonote. - - buildPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - pushd libebl - make - popd - pushd libelf - make - popd - pushd libdwfl - make - popd - pushd libdw - make - popd - ''; - - installPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - pushd libelf - make install - popd - pushd libdwfl - make install - popd - pushd libdw - make install - popd - cp version.h $out/include - ''; - doCheck = false; # fails 3 out of 174 tests doInstallCheck = false; # fails 70 out of 174 tests diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index b021a3e222b3..d5f8cfa173b1 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { pname = "gdbgui"; - version = "0.13.1.1"; + version = "0.13.2.0"; buildInputs = [ gdb ]; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1ypxgkxwb443ndyrmsa7zx2hn0d9b3s7n2w49ngfghd3l8k0yvi2"; + sha256 = "0m1fnwafzrpk77yj3p26vszlz11cv4g2lj38kymk1ilcifh4gqw0"; }; postPatch = '' diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 00cc411dc403..0965f9fcddc3 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "gede"; - version = "2.15.4"; + version = "2.16.2"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz"; - sha256 = "0bg7vyvznn1gn6w5yn14j59xph9psf2fyxr434pk62wmbzdpmkfg"; + sha256 = "18a8n9yvhgkbc97p2995j7b5ncfdzy1fy13ahdafqmcpkl4r1hrj"; }; nativeBuildInputs = [ qmake makeWrapper python ]; diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index 7ab7ff8b742c..6675f7ed3e25 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-license-detector"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Reliable project licenses detector"; homepage = "https://github.com/src-d/go-license-detector"; license = licenses.asl20; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 88a6a52d5e8c..47af57dfb3d6 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, gettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.12"; + name = "help2man-1.47.13"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0q5ixbxz1v7wqnpg4bq7k7nbv9ssnmcvdbqsq5ycjvniz56ac2vx"; + sha256 = "08q5arxz4j4pyx5q4712c2rn7p7dw7as9xg38yvmsh1c3ynvpy5p"; }; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ‘--version’ output of other commands. ''; - homepage = https://www.gnu.org/software/help2man/; + homepage = "https://www.gnu.org/software/help2man/"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 5cdd9b0ce1d6..b585d27b710f 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za"; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ pkgconfig - openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix new file mode 100644 index 000000000000..52a91db67582 --- /dev/null +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -0,0 +1,135 @@ +{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub +, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx +, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt +, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json +, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar +, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null +, migration ? false, patches ? [] +}: + +with stdenv; + +if lib.versions.major nix.version == "1" + then throw "This Hydra version doesn't support Nix 1.x" +else + +let + perlDeps = buildEnv { + name = "hydra-perl-deps"; + paths = with perlPackages; lib.closePropagation + [ ModulePluggable + CatalystActionREST + CatalystAuthenticationStoreDBIxClass + CatalystDevel + CatalystDispatchTypeRegex + CatalystPluginAccessLog + CatalystPluginAuthorizationRoles + CatalystPluginCaptcha + CatalystPluginSessionStateCookie + CatalystPluginSessionStoreFastMmap + CatalystPluginSmartURI + CatalystPluginStackTrace + CatalystRuntime + CatalystTraitForRequestProxyBase + CatalystViewDownload + CatalystViewJSON + CatalystViewTT + CatalystXScriptServerStarman + CatalystXRoleApplicator + CryptRandPasswd + DBDPg + DBDSQLite + DataDump + DateTime + DigestSHA1 + EmailMIME + EmailSender + FileSlurp + IOCompress + IPCRun + JSON + JSONAny + JSONXS + LWP + LWPProtocolHttps + NetAmazonS3 + NetPrometheus + NetStatsd + PadWalker + Readonly + SQLSplitStatement + SetScalar + Starman + SysHostnameLong + TermSizeAny + TextDiff + TextTable + XMLSimple + nix + nix.perl-bindings + git + boehmgc + ]; + }; +in stdenv.mkDerivation rec { + pname = "hydra"; + + inherit stdenv src version patches; + + buildInputs = + [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx + gitAndTools.top-git mercurial /*darcs*/ subversion bazaar openssl bzip2 libxslt + perlDeps perl nix + postgresql # for running the tests + nlohmann_json + boost + ]; + + hydraPath = lib.makeBinPath ( + [ sqlite subversion openssh nix coreutils findutils pixz + gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused bazaar + ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; + + NIX_CFLAGS_COMPILE = "-pthread"; + + shellHook = '' + PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH + PERL5LIB=$(pwd)/src/lib:$PERL5LIB; + ''; + + enableParallelBuilding = true; + + preCheck = '' + patchShebangs . + export LOGNAME=''${LOGNAME:-foo} + ''; + + postInstall = '' + mkdir -p $out/nix-support + for i in $out/bin/*; do + read -n 4 chars < $i + if [[ $chars =~ ELF ]]; then continue; fi + wrapProgram $i \ + --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ + --prefix PATH ':' $out/bin:$hydraPath \ + --set HYDRA_RELEASE ${version} \ + --set HYDRA_HOME $out/libexec/hydra \ + --set NIX_RELEASE ${nix.name or "unknown"} + done + ''; # */ + + dontStrip = true; + + passthru = { inherit perlDeps migration; }; + + meta = with stdenv.lib; { + description = "Nix-based continuous build system"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 72aecf20ca39..9e14e16dbaaf 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,143 +1,38 @@ -{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub -, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx -, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt -, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json -, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar -, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook -}: - -with stdenv; - -if lib.versions.major nix.version == "1" - then throw "This Hydra version doesn't support Nix 1.x" -else - -let - perlDeps = buildEnv { - name = "hydra-perl-deps"; - paths = with perlPackages; lib.closePropagation - [ ModulePluggable - CatalystActionREST - CatalystAuthenticationStoreDBIxClass - CatalystDevel - CatalystDispatchTypeRegex - CatalystPluginAccessLog - CatalystPluginAuthorizationRoles - CatalystPluginCaptcha - CatalystPluginSessionStateCookie - CatalystPluginSessionStoreFastMmap - CatalystPluginStackTrace - CatalystPluginUnicodeEncoding - CatalystTraitForRequestProxyBase - CatalystViewDownload - CatalystViewJSON - CatalystViewTT - CatalystXScriptServerStarman - CatalystXRoleApplicator - CryptRandPasswd - DBDPg - DBDSQLite - DataDump - DateTime - DigestSHA1 - EmailMIME - EmailSender - FileSlurp - IOCompress - IPCRun - JSON - JSONAny - JSONXS - LWP - LWPProtocolHttps - NetAmazonS3 - NetPrometheus - NetStatsd - PadWalker - Readonly - SQLSplitStatement - SetScalar - Starman - SysHostnameLong - TermSizeAny - TestMore - TextDiff - TextTable - XMLSimple - nix - nix.perl-bindings - git - boehmgc - ]; +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch }: + +{ + # Package for phase-1 of the db migration for Hydra. + # https://github.com/NixOS/hydra/pull/711 + hydra-migration = callPackage ./common.nix { + version = "2020-02-10"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra"; + rev = "add4f610ce6f206fb44702b5a894d877b3a30e3a"; + sha256 = "1d8hdgjx2ys0zmixi2ydmimdq7ml20h1ji4amwawcyw59kssh6l3"; + }; + nix = nixStable; + migration = true; }; -in stdenv.mkDerivation rec { - pname = "hydra"; - version = "2020-02-06"; - inherit stdenv; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = pname; - rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc"; - sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick"; - }; - - buildInputs = - [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx - gitAndTools.top-git mercurial darcs subversion bazaar openssl bzip2 libxslt - guile # optional, for Guile + Guix support - perlDeps perl nix - postgresql # for running the tests - nlohmann_json - boost + # Hydra from latest master branch. Contains breaking changes, + # so when having an older version, `pkgs.hydra-migration` should be deployed first. + + hydra-unstable = callPackage ./common.nix { + version = "2020-04-07"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra"; + rev = "4cabb37ebdeade1435ad8ebf1913cdd603b9c452"; + sha256 = "1ccy639x6yyrqqqqli7vlqm6pcvcq5dx1w3ckba77rl8pd5h31f7"; + }; + patches = [ + # https://github.com/NixOS/hydra/pull/732 + (fetchpatch { + url = "https://github.com/NixOS/hydra/commit/2f9d422172235297759f2b224fe0636cad07b6fb.patch"; + sha256 = "0152nsqqc5d85qdygmwrsk88i9y6nk1b639fj2n042pjvr0kpz6k"; + }) ]; - - hydraPath = lib.makeBinPath ( - [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial darcs gnused bazaar - ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; - - NIX_CFLAGS_COMPILE = "-pthread"; - - shellHook = '' - PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH - PERL5LIB=$(pwd)/src/lib:$PERL5LIB; - ''; - - enableParallelBuilding = true; - - preCheck = '' - patchShebangs . - export LOGNAME=''${LOGNAME:-foo} - ''; - - postInstall = '' - mkdir -p $out/nix-support - for i in $out/bin/*; do - read -n 4 chars < $i - if [[ $chars =~ ELF ]]; then continue; fi - wrapProgram $i \ - --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ - --prefix PATH ':' $out/bin:$hydraPath \ - --set HYDRA_RELEASE ${version} \ - --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nix.name or "unknown"} - done - ''; # */ - - dontStrip = true; - - passthru.perlDeps = perlDeps; - - meta = with stdenv.lib; { - description = "Nix-based continuous build system"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + nix = nixFlakes; }; } diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index a5c3623b699c..e503aac5a28a 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3 }: +{ stdenv, lib, fetchurl, python3 }: stdenv.mkDerivation rec { name = "itstool-2.0.6"; @@ -8,7 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2"; }; - buildInputs = [ (python3.withPackages(ps: with ps; [ libxml2 ])) ]; + pythonPath = [ python3.pkgs.libxml2 ]; + buildInputs = [ python3 python3.pkgs.libxml2 ]; + nativeBuildInputs = [ python3.pkgs.wrapPython ]; + + postFixup = '' + wrapPythonPrograms + ''; meta = { homepage = http://itstool.org/; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index c4164b414331..1e511cc0f0b0 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -1,12 +1,16 @@ -{ lib, python2 }: +{ lib, python3 }: -python2.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.8.0"; + version = "0.9.0"; - src = python2.pkgs.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0lwx1w1vk3a0pc237chwycl8qc6lwq8bzf13036wnmk74m9kwi7c"; + sha256 = "0vkqv0ijjkfg70j26cxqz75bpn2p78all5j5cw2gfcrn4c5aldf0"; + }; + + passthru = { + python = python3; }; # Non-standard test suite. Needs custom checkPhase. @@ -14,7 +18,7 @@ python2.pkgs.buildPythonApplication rec { meta = { description = "Portable tool for executing LLVM and Clang style test suites"; - homepage = http://llvm.org/docs/CommandGuide/lit.html; + homepage = "http://llvm.org/docs/CommandGuide/lit.html"; license = lib.licenses.ncsa; maintainers = with lib.maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/development/tools/misc/mdl/Gemfile.lock index aabcd784d867..04268d3306c2 100644 --- a/pkgs/development/tools/misc/mdl/Gemfile.lock +++ b/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES mdl BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 6a114a8de8ba..ae0a4a6dfe21 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mkcert"; @@ -19,9 +19,7 @@ buildGoModule rec { -X ${goPackagePath}/main.Version=${version} ''; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/FiloSottile/mkcert; description = "A simple tool for making locally-trusted development certificates"; license = licenses.bsd3; diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/pkgs/development/tools/misc/one_gadget/Gemfile.lock index ea31cc3704fa..db20c8b0ffdc 100644 --- a/pkgs/development/tools/misc/one_gadget/Gemfile.lock +++ b/pkgs/development/tools/misc/one_gadget/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES one_gadget BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 77d03f299f4a..778d30794716 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 meta = with stdenv.lib; { - homepage = https://nixos.org/patchelf.html; + homepage = https://github.com/NixOS/patchelf/blob/master/README; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index f5ff1c74bcc9..349c6a4e1eba 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { - homepage = https://nixos.org/patchelf.html; + homepage = https://github.com/NixOS/patchelf/blob/master/README; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index aecd373f09e9..9af294716ff3 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "reviewdog"; @@ -13,13 +13,11 @@ buildGoModule rec { modSha256 = "1jf08g0xr4wknh9x15igq73y02cy2faqjdjs2v842ii4p3n4p9dw"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "cmd/reviewdog" ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; homepage = "https://github.com/reviewdog/reviewdog"; changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}"; diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 67e8df9561ff..e533b065f411 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -1,25 +1,23 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terracognita"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "1d5yi2jxmk04wcz8rjwa5kz9525j8s90d4rj2d4cbgd3lbbk45qq"; + sha256 = "0ib0p361sxh2qzxccg32pcml4by4mk45abhljwmljwybs34wh5rh"; }; - modSha256 = "0xlhp8pa5g6an10m56g237pixc4h6ay89hkp1ijdz45iyfn9fk91"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1cbhm3jwv0z9fh1q8mva56nbsp9rfyjcs03yxrc8ffkvif0gapps"; subPackages = [ "." ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; homepage = "https://github.com/cycloidio/terracognita"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index c13c9646393a..e26b31cbaf0c 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -54,4 +54,4 @@ DEPENDENCIES travis BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock index fa157d794f73..9e3c166400f3 100644 --- a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock +++ b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES watson-ruby BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix index 0c6e4f568ffc..c882d6243fa0 100644 --- a/pkgs/development/tools/misc/whatstyle/default.nix +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "whatstyle"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "mikr"; repo = pname; rev = "v${version}"; - sha256 = "16ak4g149cr764c1lqakiyzmf5s98w8bdc4gk69m8qacimfg3mzm"; + sha256 = "08lfd8h5fnvy5gci4f3an411cypad7p2yiahvbmlp51r9xwpaiwr"; }; # Fix references to previous version, to avoid confusion: @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Find a code format style that fits given source files"; - homepage = https://github.com/mikr/whatstyle; + homepage = "https://github.com/mikr/whatstyle"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index cc94692c023a..3261c8af2024 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -1,23 +1,21 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "mod"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "0aw6r90xf29wdhgnq580f837ga8yypzfhlzx1f2zj0kdhc58wbr5"; + sha256 = "1kcsdi9qls9kgklj96ycyrq5fsz5m2qj3ij63d2rwqjggqk0cab6"; }; - modSha256 = "0x7bdhvam9l23cbdqpna8kwg0v6yhgmw0hlbm48bbhjl27lg7svc"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0famjypv5qg9lgzw4pz2kz70l50cn6n6nbjyk7jrzmd6bjzd0ypl"; subPackages = [ "cmd/mod" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Automated Semantic Import Versioning Upgrades for Go"; longDescription = '' Command line tool to upgrade/downgrade Semantic Import Versioning in Go diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 683d07ed4964..ea6203e57c31 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { chmod -R u+w $out/share/nsis ''; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ scons.py2 ]; buildInputs = [ zlib ]; sconsFlags = [ diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index d6327010e30e..63c169f045f9 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -6,9 +6,14 @@ in assert stdenv.lib.versionAtLeast ocaml.version "3.12"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + if stdenv.lib.versionAtLeast ocaml.version "4.02" then + (if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + version = "1.6.6"; + sha256 = "1smcc0l6fh2n0y6bp96c69j5nw755jja99w0b206wx3yb2m4w2hs"; + } else { version = "1.6.5"; sha256 = "03c0amszy28shinvz61hm340jz446zz5763a1pdqlza36kwcj0p0"; + }) // { buildInputs = [ dune ]; extra = { inherit (dune) installPhase; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 47e71c41568d..510dd183f00d 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "096wp6aawgh1ffhbnjfxgakwqd02kfkz2i6m6cc040w1g554iw98"; + sha256 = "1nnpg0fvmp4vf5mk203xk83pkkm953pgip3yhs1x2g8pkcdndhcw"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 7738139a65a7..da134562e32b 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -2,13 +2,15 @@ with ocamlPackages; buildDunePackage rec { pname = "ocamlformat"; - version = "0.13.0"; + version = "0.14.0"; minimumOCamlVersion = "4.06"; + useDune2 = true; + src = fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}-2.tbz"; - sha256 = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; + url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; + sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; }; buildInputs = [ @@ -20,6 +22,8 @@ with ocamlPackages; buildDunePackage rec { stdio uuseg uutf + fix + menhir ]; meta = { diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 310ef0be1517..5daeb384cc51 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.34.11"; + version = "1.34.15"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0j55jrji7ya0pm91hfmyd9s6lkl35xbybr81a1gka90mlyp0gx63"; + sha256 = "16wjp89lzg33cap99jv1vgqvdx0y0xvb892fpihwg62iafh10b8m"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/development/tools/overcommit/Gemfile.lock index bf88c1bb1483..9a6441e76b89 100644 --- a/pkgs/development/tools/overcommit/Gemfile.lock +++ b/pkgs/development/tools/overcommit/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES overcommit BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index a313683f2ae5..d016d21b738c 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "16ylk125p368mcz8nandmfqlygrqjlf8mqaxlbpixqga378saidl"; - buildInputs = [ llvmPackages.libclang llvmPackages.clang ]; + nativeBuildInputs = [ llvmPackages.clang ]; + buildInputs = [ llvmPackages.libclang ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; postInstall = '' diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 41d28173da35..0fbf6a49b2f5 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "09bg544pavpsivwh175ghgm7y3mkvdxfbwq41lfbwlb7v4i27vsc"; + sha256 = "1ylls1ba8y62q78vnzawy4ajpjkk5580crgi8krvfk8g13fvdnxl"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/bison/; + homepage = "https://www.gnu.org/software/bison/"; description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index f1096e479a78..e7f4fce3c4d4 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "pet"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple command-line snippet manager, written in Go"; homepage = https://github.com/knqyf263/pet; license = licenses.mit; diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index e4b50f317763..a7fabb783951 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -1,34 +1,30 @@ -{ stdenv, python3Packages }: -with python3Packages; buildPythonApplication rec { - pname = "pew"; - version = "1.1.2"; +{ stdenv, python3 }: - src = fetchPypi { - inherit pname version; - sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; - }; +with python3.pkgs; - propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; +buildPythonApplication rec { + pname = "pew"; + version = "1.2.0"; - LC_ALL = "en_US.UTF-8"; + src = fetchPypi { + inherit pname version; + sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; + }; - postFixup = '' - set -euo pipefail - PEW_SITE="$out/lib/${python.libPrefix}/site-packages" - SETUPTOOLS="${setuptools}/lib/${python.libPrefix}/site-packages" - SETUPTOOLS_SITE=$SETUPTOOLS/$(cat $SETUPTOOLS/setuptools.pth) - CLONEVENV_SITE="${virtualenv-clone}/lib/${python.libPrefix}/site-packages" - SITE_PACKAGES="[\'$PEW_SITE\',\'$SETUPTOOLS_SITE\',\'$CLONEVENV_SITE\']" - substituteInPlace $PEW_SITE/pew/pew.py \ - --replace "from pew.pew" "import sys; sys.path.extend($SITE_PACKAGES); from pew.pew" \ - --replace 'sys.executable, "-m", "virtualenv"' "'${virtualenv}/bin/virtualenv'" - ''; + propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; - meta = with stdenv.lib; { - homepage = https://github.com/berdario/pew; - description = "Tools to manage multiple virtualenvs written in pure python"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ berdario ]; - }; - } + # no tests are packaged + checkPhase = '' + $out/bin/pew > /dev/null + ''; + + pythonImportsCheck = [ "pew" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/berdario/pew"; + description = "Tools to manage multiple virtualenvs written in pure python"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ berdario ]; + }; +} diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 87bf826f5c58..c1cb8cea8a65 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "1fqhbs7q3nxda7acbcx8dyjh99d0mv485dpmiczxia7cy1xqi63g"; + sha256 = "0n8ydj01nmnkd8glzjb0yrsyax1pmdfvaxb5xj4pkb2mf6zm94qy"; }; outputs = [ "out" ]; diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index 8aaae2b1c433..94ba95b2d92f 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }: stdenv.mkDerivation rec { pname = "pgloader"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz"; - sha256 = "1sm8xmq30d1biin5br0y3vrv4fydbrzfqglz1hnvrkdyxrg7d6f9"; + url = "https://github.com/dimitri/pgloader/releases/download/v3.6.2/pgloader-bundle-3.6.2.tgz"; + sha256 = "1jqnw6pw11kwyy8zm2g7g85r8197fy0q4l70yybw9wr87wnqqnz3"; }; nativeBuildInputs = [ git makeWrapper ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://pgloader.io/; + homepage = "https://pgloader.io/"; description = "pgloader loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL"; maintainers = with maintainers; [ mguentner ]; license = licenses.postgresql; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix index 95576b987f5c..355cebfd50c4 100755 --- a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix @@ -8,11 +8,16 @@ import json import sys -argparser = argparse.ArgumentParser(description="Generate overrides for git hashes",) -argparser.add_argument( +argparser = argparse.ArgumentParser(description="Poetry2nix CLI") + +subparsers = argparser.add_subparsers(dest="subcommand") +subparsers.required = True + +parser_lock = subparsers.add_parser("lock", help="Generate overrides for git hashes",) +parser_lock.add_argument( "--lock", default="poetry.lock", help="Path to input poetry.lock", ) -argparser.add_argument( +parser_lock.add_argument( "--out", default="poetry-git-overlay.nix", help="Output file", ) @@ -74,7 +79,7 @@ if __name__ == "__main__": indent( textwrap.dedent( """ - %s = super.%s.overrideAttrs ( + %s = super.%s.overridePythonAttrs ( _: { src = pkgs.fetchgit { url = "%s"; @@ -92,7 +97,7 @@ if __name__ == "__main__": expr = "\n".join(lines) - with open(args.out, "w") as f: - f.write(expr) + with open(args.out, "w") as fout: + fout.write(expr) print(f"Wrote {args.out}") diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix index db85d4ddd3c0..fbcee749b7cd 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix @@ -2,10 +2,8 @@ , lib ? pkgs.lib , version }: - let inherit (pkgs) python3; - in pkgs.stdenv.mkDerivation { pname = "poetry2nix"; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 7d3164fcec62..e7f718519a59 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -7,7 +7,7 @@ let inherit (poetryLib) isCompatible readTOML; # Poetry2nix version - version = "1.6.0"; + version = "1.7.1"; /* The default list of poetry2nix override overlays */ defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; }); @@ -34,91 +34,95 @@ let , overrides ? [ defaultPoetryOverrides ] , python ? pkgs.python3 , pwd ? projectDir - }@attrs: let - poetryPkg = poetry.override { inherit python; }; - - pyProject = readTOML pyproject; - poetryLock = readTOML poetrylock; - lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; + }@attrs: + let + poetryPkg = poetry.override { inherit python; }; - specialAttrs = [ - "overrides" - "poetrylock" - "pwd" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; + pyProject = readTOML pyproject; + poetryLock = readTOML poetrylock; + lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; - evalPep508 = mkEvalPep508 python; + specialAttrs = [ + "overrides" + "poetrylock" + "projectDir" + "pwd" + ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; - # Filter packages by their PEP508 markers & pyproject interpreter version - partitions = let - supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; - in - lib.partition supportsPythonVersion poetryLock.package; + evalPep508 = mkEvalPep508 python; - compatible = partitions.right; - incompatible = partitions.wrong; + # Filter packages by their PEP508 markers & pyproject interpreter version + partitions = let + supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; + in + lib.partition supportsPythonVersion poetryLock.package; + + compatible = partitions.right; + incompatible = partitions.wrong; + + # Create an overriden version of pythonPackages + # + # We need to avoid mixing multiple versions of pythonPackages in the same + # closure as python can only ever have one version of a dependency + baseOverlay = self: super: + let + getDep = depName: self.${depName}; + + lockPkgs = builtins.listToAttrs ( + builtins.map ( + pkgMeta: rec { + name = pkgMeta.name; + value = self.mkPoetryDep ( + pkgMeta // { + inherit pwd; + source = pkgMeta.source or null; + files = lockFiles.${name}; + pythonPackages = self; + sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name}; + } + ); + } + ) compatible + ); + in + lockPkgs; + overlays = builtins.map getFunctorFn ( + [ + ( + self: super: + let + hooks = self.callPackage ./hooks {}; + in + { + mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { + inherit pkgs lib python poetryLib; + }; + poetry = poetryPkg; + # The canonical name is setuptools-scm + setuptools-scm = super.setuptools_scm; + + inherit (hooks) removePathDependenciesHook poetry2nixFixupHook; + } + ) + # Null out any filtered packages, we don't want python.pkgs from nixpkgs + (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible)) + # Create poetry2nix layer + baseOverlay + ] ++ # User provided overrides + overrides + ); - # Create an overriden version of pythonPackages - # - # We need to avoid mixing multiple versions of pythonPackages in the same - # closure as python can only ever have one version of a dependency - baseOverlay = self: super: - let - getDep = depName: self.${depName}; + packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays; - lockPkgs = builtins.listToAttrs ( - builtins.map ( - pkgMeta: rec { - name = pkgMeta.name; - value = self.mkPoetryDep ( - pkgMeta // { - inherit pwd; - source = pkgMeta.source or null; - files = lockFiles.${name}; - pythonPackages = self; - } - ); - } - ) compatible - ); - in - lockPkgs; - overlays = builtins.map getFunctorFn ( - [ - ( - self: super: let - hooks = self.callPackage ./hooks {}; - in - { - mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { - inherit pkgs lib python poetryLib; - }; - poetry = poetryPkg; - # The canonical name is setuptools-scm - setuptools-scm = super.setuptools_scm; - - inherit (hooks) removePathDependenciesHook poetry2nixFixupHook; - } - ) - # Null out any filtered packages, we don't want python.pkgs from nixpkgs - (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible)) - # Create poetry2nix layer - baseOverlay - ] ++ # User provided overrides - overrides - ); - - packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays; - - py = python.override { inherit packageOverrides; self = py; }; - in - { - python = py; - poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible; - poetryLock = poetryLock; - inherit pyProject; - }; + py = python.override { inherit packageOverrides; self = py; }; + in + { + python = py; + poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible; + poetryLock = poetryLock; + inherit pyProject; + }; /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file. @@ -153,76 +157,78 @@ let , python ? pkgs.python3 , pwd ? projectDir , ... - }@attrs: let - poetryPython = mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd; - }; - py = poetryPython.python; - - inherit (poetryPython) pyProject; - - specialAttrs = [ - "overrides" - "poetrylock" - "pwd" - "pyproject" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; - - # Get dependencies and filter out depending on interpreter version - getDeps = depAttr: let - compat = isCompatible py.pythonVersion; - deps = pyProject.tool.poetry.${depAttr} or {}; - depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); - in - builtins.map ( - dep: let - pkg = py.pkgs."${dep}"; - constraints = deps.${dep}.python or ""; - isCompat = compat constraints; + }@attrs: + let + poetryPython = mkPoetryPackages { + inherit pyproject poetrylock overrides python pwd; + }; + py = poetryPython.python; + + inherit (poetryPython) pyProject; + + specialAttrs = [ + "overrides" + "poetrylock" + "projectDir" + "pwd" + "pyproject" + ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; + + # Get dependencies and filter out depending on interpreter version + getDeps = depAttr: + let + compat = isCompatible py.pythonVersion; + deps = pyProject.tool.poetry.${depAttr} or {}; + depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); in - if isCompat then pkg else null - ) depAttrs; - - getInputs = attr: attrs.${attr} or []; - mkInput = attr: extraInputs: getInputs attr ++ extraInputs; - - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pyProject; - pythonPackages = py.pkgs; - }; - - in - py.pkgs.buildPythonApplication ( - passedAttrs // { - pname = pyProject.tool.poetry.name; - version = pyProject.tool.poetry.version; + builtins.map ( + dep: + let + pkg = py.pkgs."${dep}"; + constraints = deps.${dep}.python or ""; + isCompat = compat constraints; + in + if isCompat then pkg else null + ) depAttrs; + + getInputs = attr: attrs.${attr} or []; + mkInput = attr: extraInputs: getInputs attr ++ extraInputs; + + buildSystemPkgs = poetryLib.getBuildSystemPkgs { + inherit pyProject; + pythonPackages = py.pkgs; + }; + in + py.pkgs.buildPythonApplication ( + passedAttrs // { + pname = pyProject.tool.poetry.name; + version = pyProject.tool.poetry.version; - inherit src; + inherit src; - format = "pyproject"; + format = "pyproject"; - buildInputs = mkInput "buildInputs" buildSystemPkgs; - propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); - nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; - checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); + buildInputs = mkInput "buildInputs" buildSystemPkgs; + propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); + nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; + checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); - passthru = { - python = py; - }; + passthru = { + python = py; + }; - meta = meta // { - inherit (pyProject.tool.poetry) description homepage; - inherit (py.meta) platforms; - license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); - }; + meta = meta // { + inherit (pyProject.tool.poetry) description homepage; + inherit (py.meta) platforms; + license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); + }; - } - ); + } + ); /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */ cli = import ./cli.nix { inherit pkgs lib version; }; - in { inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages cli version; @@ -236,11 +242,12 @@ in */ defaultPoetryOverrides = { __functor = defaultPoetryOverrides; - overrideOverlay = fn: self: super: let - defaultSet = defaultPoetryOverrides self super; - customSet = fn self super; - in - defaultSet // customSet; + overrideOverlay = fn: self: super: + let + defaultSet = defaultPoetryOverrides self super; + customSet = fn self super; + in + defaultSet // customSet; }; /* diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index ec3fa0afa69d..12d2bc962065 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -3,7 +3,6 @@ , makeSetupHook , yj }: - let pythonInterpreter = python.pythonForBuild.interpreter; in diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index b816feb38e89..f4497afb8bc9 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -9,29 +9,30 @@ let ); # Compare a semver expression with a version - isCompatible = version: let - operators = { - "||" = cond1: cond2: cond1 || cond2; - "," = cond1: cond2: cond1 && cond2; # , means && - "&&" = cond1: cond2: cond1 && cond2; - }; - splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")"; - in - expr: - let - tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); - combine = acc: v: - let - isOperator = builtins.typeOf v == "list"; - operator = if isOperator then (builtins.elemAt v 0) else acc.operator; - in - if isOperator then (acc // { inherit operator; }) else { - inherit operator; - state = operators."${operator}" acc.state (satisfiesSemver version v); - }; - initial = { operator = "&&"; state = true; }; - in - if expr == "" then true else (builtins.foldl' combine initial tokens).state; + isCompatible = version: + let + operators = { + "||" = cond1: cond2: cond1 || cond2; + "," = cond1: cond2: cond1 && cond2; # , means && + "&&" = cond1: cond2: cond1 && cond2; + }; + splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")"; + in + expr: + let + tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); + combine = acc: v: + let + isOperator = builtins.typeOf v == "list"; + operator = if isOperator then (builtins.elemAt v 0) else acc.operator; + in + if isOperator then (acc // { inherit operator; }) else { + inherit operator; + state = operators."${operator}" acc.state (satisfiesSemver version v); + }; + initial = { operator = "&&"; state = true; }; + in + if expr == "" then true else (builtins.foldl' combine initial tokens).state; fromTOML = builtins.fromTOML or ( @@ -88,23 +89,25 @@ let getBuildSystemPkgs = { pythonPackages , pyProject - }: let - buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject; - drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0; - in - if buildSystem == "" then [] else ( - [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] - ); + }: + let + buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject; + drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0; + in + if buildSystem == "" then [] else ( + [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] + ); # Find gitignore files recursively in parent directory stopping with .git - findGitIgnores = path: let - parent = path + "/.."; - gitIgnore = path + "/.gitignore"; - isGitRoot = builtins.pathExists (path + "/.git"); - hasGitIgnore = builtins.pathExists gitIgnore; - gitIgnores = if hasGitIgnore then [ gitIgnore ] else []; - in - lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; + findGitIgnores = path: + let + parent = path + "/.."; + gitIgnore = path + "/.gitignore"; + isGitRoot = builtins.pathExists (path + "/.git"); + hasGitIgnore = builtins.pathExists gitIgnore; + gitIgnores = if hasGitIgnore then [ gitIgnore ] else []; + in + lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; /* Provides a source filtering mechanism that: @@ -113,21 +116,21 @@ let - Filters pycache/pyc files - Uses cleanSourceFilter to filter out .git/.hg, .o/.so, editor backup files & nix result symlinks */ - cleanPythonSources = { src }: let - gitIgnores = findGitIgnores src; - pycacheFilter = name: type: - (type == "directory" && ! lib.strings.hasInfix "__pycache__" name) - || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name) - ; - in - lib.cleanSourceWith { - filter = lib.cleanSourceFilter; - src = lib.cleanSourceWith { - filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; - inherit src; + cleanPythonSources = { src }: + let + gitIgnores = findGitIgnores src; + pycacheFilter = name: type: + (type == "directory" && ! lib.strings.hasInfix "__pycache__" name) + || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name) + ; + in + lib.cleanSourceWith { + filter = lib.cleanSourceFilter; + src = lib.cleanSourceWith { + filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; + inherit src; + }; }; - }; - in { inherit diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 5ae35dfed49e..5e71190d28fe 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -14,6 +14,7 @@ , pythonPackages , python-versions , pwd +, sourceSpec , supportedExtensions ? lib.importJSON ./extensions.json , ... }: @@ -22,9 +23,7 @@ pythonPackages.callPackage ( { preferWheel ? false , ... }@args: - let - inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi; inherit (import ./pep425.nix { @@ -68,7 +67,6 @@ pythonPackages.callPackage ( lockFileEntry = builtins.head entries; _isEgg = isEgg lockFileEntry; - in rec { inherit (lockFileEntry) file hash; @@ -92,7 +90,6 @@ pythonPackages.callPackage ( baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format; - in buildPythonPackage { @@ -123,10 +120,11 @@ pythonPackages.callPackage ( compat = isCompatible python.pythonVersion; deps = lib.filterAttrs (n: v: v) ( lib.mapAttrs ( - n: v: let - constraints = v.python or ""; - in - compat constraints + n: v: + let + constraints = v.python or ""; + in + compat constraints ) dependencies ); depAttrs = lib.attrNames deps; @@ -150,6 +148,7 @@ pythonPackages.callPackage ( builtins.fetchGit { inherit (source) url; rev = source.reference; + ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD"; } ) else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) else fetchFromPypi { pname = name; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 9eb3f92bd12b..8301dcd49b83 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -6,14 +6,14 @@ self: super: { - astroid = super.astroid.overrideAttrs ( + astroid = super.astroid.overridePythonAttrs ( old: rec { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; doCheck = false; } ); - av = super.av.overrideAttrs ( + av = super.av.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig @@ -22,7 +22,7 @@ self: super: } ); - bcrypt = super.bcrypt.overrideAttrs ( + bcrypt = super.bcrypt.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.libffi ]; } @@ -31,14 +31,14 @@ self: super: cffi = # cffi is bundled with pypy if self.python.implementation == "pypy" then null else ( - super.cffi.overrideAttrs ( + super.cffi.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.libffi ]; } ) ); - cftime = super.cftime.overrideAttrs ( + cftime = super.cftime.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.cython @@ -46,14 +46,14 @@ self: super: } ); - cryptography = super.cryptography.overrideAttrs ( + cryptography = super.cryptography.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } ); django = ( - super.django.overrideAttrs ( + super.django.overridePythonAttrs ( old: { propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or []) ++ [ pkgs.gettext ]; @@ -61,7 +61,7 @@ self: super: ) ); - django-bakery = super.django-bakery.overrideAttrs ( + django-bakery = super.django-bakery.overridePythonAttrs ( old: { configurePhase = '' if ! test -e LICENSE; then @@ -71,7 +71,7 @@ self: super: } ); - dlib = super.dlib.overrideAttrs ( + dlib = super.dlib.overridePythonAttrs ( old: { # Parallel building enabled inherit (pkgs.python.pkgs.dlib) patches; @@ -87,14 +87,14 @@ self: super: # Environment markers are not always included (depending on how a dep was defined) enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; - faker = super.faker.overrideAttrs ( + faker = super.faker.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; doCheck = false; } ); - fancycompleter = super.fancycompleter.overrideAttrs ( + fancycompleter = super.fancycompleter.overridePythonAttrs ( old: { postPatch = '' substituteInPlace setup.py \ @@ -104,14 +104,20 @@ self: super: } ); - grandalf = super.grandalf.overrideAttrs ( + fastparquet = super.fastparquet.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); + + grandalf = super.grandalf.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; doCheck = false; } ); - h5py = super.h5py.overrideAttrs ( + h5py = super.h5py.overridePythonAttrs ( old: rec { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; @@ -122,20 +128,20 @@ self: super: } ); - horovod = super.horovod.overrideAttrs ( + horovod = super.horovod.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; } ); # importlib-metadata has an incomplete dependency specification - importlib-metadata = super.importlib-metadata.overrideAttrs ( + importlib-metadata = super.importlib-metadata.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; } ); - jupyter = super.jupyter.overrideAttrs ( + jupyter = super.jupyter.overridePythonAttrs ( old: rec { # jupyter is a meta-package. Everything relevant comes from the # dependencies. It does however have a jupyter.py file that conflicts @@ -144,7 +150,7 @@ self: super: } ); - lap = super.lap.overrideAttrs ( + lap = super.lap.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.numpy @@ -152,7 +158,7 @@ self: super: } ); - llvmlite = super.llvmlite.overrideAttrs ( + llvmlite = super.llvmlite.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; @@ -175,59 +181,59 @@ self: super: } ); - lockfile = super.lockfile.overrideAttrs ( + lockfile = super.lockfile.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; } ); - lxml = super.lxml.overrideAttrs ( + lxml = super.lxml.overridePythonAttrs ( old: { nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; } ); - markupsafe = super.markupsafe.overrideAttrs ( + markupsafe = super.markupsafe.overridePythonAttrs ( old: { src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; } ); - matplotlib = super.matplotlib.overrideAttrs ( - old: let - enableGhostscript = old.passthru.enableGhostscript or false; - enableGtk3 = old.passthru.enableTk or false; - enableQt = old.passthru.enableQt or false; - enableTk = old.passthru.enableTk or false; + matplotlib = super.matplotlib.overridePythonAttrs ( + old: + let + enableGhostscript = old.passthru.enableGhostscript or false; + enableGtk3 = old.passthru.enableTk or false; + enableQt = old.passthru.enableQt or false; + enableTk = old.passthru.enableTk or false; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + in + { + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; - in - { - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; + XDG_RUNTIME_DIR = "/tmp"; - XDG_RUNTIME_DIR = "/tmp"; + buildInputs = old.buildInputs + ++ lib.optional enableGhostscript pkgs.ghostscript + ++ lib.optional stdenv.isDarwin [ Cocoa ]; - buildInputs = old.buildInputs - ++ lib.optional enableGhostscript pkgs.ghostscript - ++ lib.optional stdenv.isDarwin [ Cocoa ]; - - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.libpng - pkgs.freetype - ] - ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] - ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] - ++ stdenv.lib.optionals enableQt [ self.pyqt5 ] - ; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.libpng + pkgs.freetype + ] + ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] + ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] + ++ stdenv.lib.optionals enableQt [ self.pyqt5 ] + ; - inherit (super.matplotlib) patches; - } + inherit (super.matplotlib) patches; + } ); # Calls Cargo at build time for source builds and is really tricky to package @@ -235,14 +241,14 @@ self: super: preferWheel = true; }; - mccabe = super.mccabe.overrideAttrs ( + mccabe = super.mccabe.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; doCheck = false; } ); - netcdf4 = super.netcdf4.overrideAttrs ( + netcdf4 = super.netcdf4.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.cython @@ -265,40 +271,41 @@ self: super: } ); - numpy = super.numpy.overrideAttrs ( - old: let - blas = old.passthru.args.blas or pkgs.openblasCompat; - blasImplementation = lib.nameFromURL blas.name "-"; - cfg = pkgs.writeTextFile { - name = "site.cfg"; - text = ( - lib.generators.toINI {} { - ${blasImplementation} = { - include_dirs = "${blas}/include"; - library_dirs = "${blas}/lib"; - } // lib.optionalAttrs (blasImplementation == "mkl") { - mkl_libs = "mkl_rt"; - lapack_libs = ""; - }; - } - ); - }; - in - { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - buildInputs = old.buildInputs ++ [ blas self.cython ]; - enableParallelBuilding = true; - preBuild = '' - ln -s ${cfg} site.cfg - ''; - passthru = old.passthru // { - blas = blas; - inherit blasImplementation cfg; + numpy = super.numpy.overridePythonAttrs ( + old: + let + blas = old.passthru.args.blas or pkgs.openblasCompat; + blasImplementation = lib.nameFromURL blas.name "-"; + cfg = pkgs.writeTextFile { + name = "site.cfg"; + text = ( + lib.generators.toINI {} { + ${blasImplementation} = { + include_dirs = "${blas}/include"; + library_dirs = "${blas}/lib"; + } // lib.optionalAttrs (blasImplementation == "mkl") { + mkl_libs = "mkl_rt"; + lapack_libs = ""; + }; + } + ); }; - } + in + { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + buildInputs = old.buildInputs ++ [ blas self.cython ]; + enableParallelBuilding = true; + preBuild = '' + ln -s ${cfg} site.cfg + ''; + passthru = old.passthru // { + blas = blas; + inherit blasImplementation cfg; + }; + } ); - openexr = super.openexr.overrideAttrs ( + openexr = super.openexr.overridePythonAttrs ( old: rec { buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; @@ -306,38 +313,39 @@ self: super: ); peewee = super.peewee.overridePythonAttrs ( - old: let - withPostgres = old.passthru.withPostgres or false; - withMysql = old.passthru.withMysql or false; - in - { - buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs - ++ lib.optional withPostgres self.psycopg2 - ++ lib.optional withMysql self.mysql-connector; - } + old: + let + withPostgres = old.passthru.withPostgres or false; + withMysql = old.passthru.withMysql or false; + in + { + buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; + propagatedBuildInputs = old.propagatedBuildInputs + ++ lib.optional withPostgres self.psycopg2 + ++ lib.optional withMysql self.mysql-connector; + } ); - pillow = super.pillow.overrideAttrs ( + pillow = super.pillow.overridePythonAttrs ( old: { nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; } ); - psycopg2 = super.psycopg2.overrideAttrs ( + psycopg2 = super.psycopg2.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; } ); - psycopg2-binary = super.psycopg2-binary.overrideAttrs ( + psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; } ); - pyarrow = super.pyarrow.overrideAttrs ( + pyarrow = super.pyarrow.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.cython @@ -352,7 +360,7 @@ self: super: format = "other"; } ) - ).overrideAttrs ( + ).overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ @@ -371,7 +379,7 @@ self: super: ) ) super.pycairo; - pycocotools = super.pycocotools.overrideAttrs ( + pycocotools = super.pycocotools.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.cython @@ -380,21 +388,21 @@ self: super: } ); - pygobject = super.pygobject.overrideAttrs ( + pygobject = super.pygobject.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; } ); - pylint = super.pylint.overrideAttrs ( + pylint = super.pylint.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; doCheck = false; } ); - pyopenssl = super.pyopenssl.overrideAttrs ( + pyopenssl = super.pyopenssl.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } @@ -501,7 +509,7 @@ self: super: } ); - pytest-datadir = super.pytest-datadir.overrideAttrs ( + pytest-datadir = super.pytest-datadir.overridePythonAttrs ( old: { postInstall = '' rm -f $out/LICENSE @@ -517,7 +525,7 @@ self: super: pytest-runner = super.pytest-runner or super.pytestrunner; - python-prctl = super.python-prctl.overrideAttrs ( + python-prctl = super.python-prctl.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.libcap @@ -525,14 +533,14 @@ self: super: } ); - pyzmq = super.pyzmq.overrideAttrs ( + pyzmq = super.pyzmq.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; } ); - rockset = super.rockset.overrideAttrs ( + rockset = super.rockset.overridePythonAttrs ( old: rec { postPatch = '' cp ./setup_rockset.py ./setup.py @@ -540,7 +548,7 @@ self: super: } ); - scaleapi = super.scaleapi.overrideAttrs ( + scaleapi = super.scaleapi.overridePythonAttrs ( old: { postPatch = '' substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true @@ -548,7 +556,7 @@ self: super: } ); - pandas = super.pandas.overrideAttrs ( + pandas = super.pandas.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; } @@ -565,7 +573,7 @@ self: super: } ); - scipy = super.scipy.overrideAttrs ( + scipy = super.scipy.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; @@ -599,7 +607,7 @@ self: super: } ); - shapely = super.shapely.overrideAttrs ( + shapely = super.shapely.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; @@ -614,7 +622,7 @@ self: super: ) ) else super.shellingham; - tables = super.tables.overrideAttrs ( + tables = super.tables.overridePythonAttrs ( old: { HDF5_DIR = "${pkgs.hdf5}"; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; @@ -622,7 +630,7 @@ self: super: } ); - tensorpack = super.tensorpack.overrideAttrs ( + tensorpack = super.tensorpack.overridePythonAttrs ( old: { postPatch = '' substituteInPlace setup.cfg --replace "# will call find_packages()" "" @@ -630,7 +638,7 @@ self: super: } ); - urwidtrees = super.urwidtrees.overrideAttrs ( + urwidtrees = super.urwidtrees.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.urwid @@ -638,7 +646,7 @@ self: super: } ); - vose-alias-method = super.vose-alias-method.overrideAttrs ( + vose-alias-method = super.vose-alias-method.overridePythonAttrs ( old: { postInstall = '' rm -f $out/LICENSE @@ -646,7 +654,7 @@ self: super: } ); - uvloop = super.uvloop.overrideAttrs ( + uvloop = super.uvloop.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices @@ -667,16 +675,24 @@ self: super: ); zipp = - if lib.versionAtLeast super.zipp.version "2.0.0" then ( - super.zipp.overridePythonAttrs ( - old: { - prePatch = '' - substituteInPlace setup.py --replace \ - 'setuptools.setup()' \ - 'setuptools.setup(version="${super.zipp.version}")' - ''; - } - ) - ) else super.zipp; + ( + if lib.versionAtLeast super.zipp.version "2.0.0" then ( + super.zipp.overridePythonAttrs ( + old: { + prePatch = '' + substituteInPlace setup.py --replace \ + 'setuptools.setup()' \ + 'setuptools.setup(version="${super.zipp.version}")' + ''; + } + ) + ) else super.zipp + ).overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.toml + ]; + } + ); } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index b2e11205c36c..cda4e8c78d4d 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -1,5 +1,4 @@ { lib, stdenv, python, isLinux ? stdenv.isLinux }: - let inherit (lib.strings) hasSuffix hasInfix splitString removeSuffix; @@ -94,12 +93,10 @@ let if isLinux then chooseLinux files else chooseOSX files; - in if (builtins.length filtered == 0) then [] else choose (filtered); - in { inherit selectWheel toWheelAttrs isPyVersionCompatible; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index ae0c29f36838..67ffdddb4bd8 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -1,5 +1,4 @@ { lib, stdenv, poetryLib }: python: - let inherit (poetryLib) ireplace; @@ -37,195 +36,199 @@ let ); # Make a tree out of expression groups (parens) - findSubExpressions = expr: let - acc = builtins.foldl' findSubExpressionsFun { - exprs = []; - expr = expr; - pos = 0; - openP = 0; - exprPos = 0; - startPos = 0; - } (lib.stringToCharacters expr); - tailExpr = (substr acc.exprPos acc.pos expr); - tailExprs = if tailExpr != "" then [ tailExpr ] else []; - in - acc.exprs ++ tailExprs; - - parseExpressions = exprs: let - splitCond = ( - s: builtins.map - (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) - (builtins.split " (and|or) " (s + " ")) - ); - - mapfn = expr: ( - if (builtins.match "^ ?$" expr != null) then null # Filter empty - else if (builtins.elem expr [ "and" "or" ]) then { - type = "bool"; - value = expr; - } - else { - type = "expr"; - value = expr; - } - ); + findSubExpressions = expr: + let + acc = builtins.foldl' findSubExpressionsFun { + exprs = []; + expr = expr; + pos = 0; + openP = 0; + exprPos = 0; + startPos = 0; + } (lib.stringToCharacters expr); + tailExpr = (substr acc.exprPos acc.pos expr); + tailExprs = if tailExpr != "" then [ tailExpr ] else []; + in + acc.exprs ++ tailExprs; + + parseExpressions = exprs: + let + splitCond = ( + s: builtins.map + (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) + (builtins.split " (and|or) " (s + " ")) + ); - parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr)); + mapfn = expr: ( + if (builtins.match "^ ?$" expr != null) then null # Filter empty + else if (builtins.elem expr [ "and" "or" ]) then { + type = "bool"; + value = expr; + } + else { + type = "expr"; + value = expr; + } + ); - in - builtins.foldl' ( - acc: v: acc ++ ( - if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ] - ) - ) [] exprs; + parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr)); + in + builtins.foldl' ( + acc: v: acc ++ ( + if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ] + ) + ) [] exprs; # Transform individual expressions to structured expressions # This function also performs variable substitution, replacing environment markers with their explicit values - transformExpressions = exprs: let - variables = { - os_name = ( - if python.pname == "jython" then "java" - else "posix" - ); - sys_platform = ( - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "darwin" - else throw "Unsupported platform" - ); - platform_machine = stdenv.platform.kernelArch; - platform_python_implementation = let - impl = python.passthru.implementation; - in - ( - if impl == "cpython" then "CPython" - else if impl == "pypy" then "PyPy" - else throw "Unsupported implementation ${impl}" + transformExpressions = exprs: + let + variables = { + os_name = ( + if python.pname == "jython" then "java" + else "posix" ); - platform_release = ""; # Field not reproducible - platform_system = ( - if stdenv.isLinux then "Linux" - else if stdenv.isDarwin then "Darwin" - else throw "Unsupported platform" - ); - platform_version = ""; # Field not reproducible - python_version = python.passthru.pythonVersion; - python_full_version = python.version; - implementation_name = python.implementation; - implementation_version = python.version; - extra = ""; - }; - - substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; - - processVar = value: builtins.foldl' (acc: v: v acc) value [ - stripStr - substituteVar - ]; - - in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - mVal = ''[a-zA-Z0-9\'"_\. ]+''; - mOp = "in|[!=<>]+"; - e = stripStr exprs.value; - m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + sys_platform = ( + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "darwin" + else throw "Unsupported platform" + ); + platform_machine = stdenv.platform.kernelArch; + platform_python_implementation = let + impl = python.passthru.implementation; in - { - type = "expr"; - value = { - op = builtins.elemAt m 1; - values = [ - (processVar (builtins.elemAt m 0)) - (processVar (builtins.elemAt m 2)) - ]; - }; - } - ) else exprs - ) else builtins.map transformExpressions exprs; + ( + if impl == "cpython" then "CPython" + else if impl == "pypy" then "PyPy" + else throw "Unsupported implementation ${impl}" + ); + platform_release = ""; # Field not reproducible + platform_system = ( + if stdenv.isLinux then "Linux" + else if stdenv.isDarwin then "Darwin" + else throw "Unsupported platform" + ); + platform_version = ""; # Field not reproducible + python_version = python.passthru.pythonVersion; + python_full_version = python.version; + implementation_name = python.implementation; + implementation_version = python.version; + extra = ""; + }; + + substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; + + processVar = value: builtins.foldl' (acc: v: v acc) value [ + stripStr + substituteVar + ]; + in + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + mVal = ''[a-zA-Z0-9\'"_\. ]+''; + mOp = "in|[!=<>]+"; + e = stripStr exprs.value; + m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + in + { + type = "expr"; + value = { + op = builtins.elemAt m 1; + values = [ + (processVar (builtins.elemAt m 0)) + (processVar (builtins.elemAt m 2)) + ]; + }; + } + ) else exprs + ) else builtins.map transformExpressions exprs; # Recursively eval all expressions - evalExpressions = exprs: let - unmarshal = v: ( - # TODO: Handle single quoted values - if v == "True" then true - else if v == "False" then false - else builtins.fromJSON v - ); - hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack)); - op = { - "<=" = x: y: (unmarshal x) <= (unmarshal y); - "<" = x: y: (unmarshal x) < (unmarshal y); - "!=" = x: y: x != y; - "==" = x: y: x == y; - ">=" = x: y: (unmarshal x) >= (unmarshal y); - ">" = x: y: (unmarshal x) > (unmarshal y); - "~=" = v: c: let - parts = builtins.splitVersion c; - pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); - upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); - in - op.">=" v c && op."<" v upperConstraint; - "===" = x: y: x == y; - "in" = x: y: let - values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y)); - in - builtins.elem (unmarshal x) values; - }; - in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - expr = exprs; - result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); - in - { - type = "value"; - value = result; - } - ) else exprs - ) else builtins.map evalExpressions exprs; + evalExpressions = exprs: + let + unmarshal = v: ( + # TODO: Handle single quoted values + if v == "True" then true + else if v == "False" then false + else builtins.fromJSON v + ); + hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack)); + op = { + "<=" = x: y: (unmarshal x) <= (unmarshal y); + "<" = x: y: (unmarshal x) < (unmarshal y); + "!=" = x: y: x != y; + "==" = x: y: x == y; + ">=" = x: y: (unmarshal x) >= (unmarshal y); + ">" = x: y: (unmarshal x) > (unmarshal y); + "~=" = v: c: + let + parts = builtins.splitVersion c; + pruned = lib.take ((builtins.length parts) - 1) parts; + upper = builtins.toString ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); + upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); + in + op.">=" v c && op."<" v upperConstraint; + "===" = x: y: x == y; + "in" = x: y: + let + values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y)); + in + builtins.elem (unmarshal x) values; + }; + in + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + expr = exprs; + result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); + in + { + type = "value"; + value = result; + } + ) else exprs + ) else builtins.map evalExpressions exprs; # Now that we have performed an eval all that's left to do is to concat the graph into a single bool - reduceExpressions = exprs: let - cond = { - "and" = x: y: x && y; - "or" = x: y: x || y; - }; - reduceExpressionsFun = acc: v: ( - if builtins.typeOf v == "set" then ( - if v.type == "value" then ( - acc // { - value = cond."${acc.cond}" acc.value v.value; - } - ) else if v.type == "bool" then ( - acc // { - cond = v.value; - } + reduceExpressions = exprs: + let + cond = { + "and" = x: y: x && y; + "or" = x: y: x || y; + }; + reduceExpressionsFun = acc: v: ( + if builtins.typeOf v == "set" then ( + if v.type == "value" then ( + acc // { + value = cond."${acc.cond}" acc.value v.value; + } + ) else if v.type == "bool" then ( + acc // { + cond = v.value; + } + ) else throw "Unsupported type" + ) else if builtins.typeOf v == "list" then ( + let + ret = builtins.foldl' reduceExpressionsFun { + value = true; + cond = "and"; + } v; + in + acc // { + value = cond."${acc.cond}" acc.value ret.value; + } ) else throw "Unsupported type" - ) else if builtins.typeOf v == "list" then ( - let - ret = builtins.foldl' reduceExpressionsFun { - value = true; - cond = "and"; - } v; - in - acc // { - value = cond."${acc.cond}" acc.value ret.value; - } - ) else throw "Unsupported type" - ); - in - ( - builtins.foldl' reduceExpressionsFun { - value = true; - cond = "and"; - } exprs - ).value; - + ); + in + ( + builtins.foldl' reduceExpressionsFun { + value = true; + cond = "and"; + } exprs + ).value; in e: builtins.foldl' (acc: v: v acc) e [ findSubExpressions diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix index 784589a4ca48..07dcbbc5eacb 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix @@ -1,26 +1,27 @@ { lib, ireplace }: - let inherit (builtins) elemAt match; operators = let matchWildCard = s: match "([^\*])(\.[\*])" s; mkComparison = ret: version: v: builtins.compareVersions version v == ret; - mkIdxComparison = idx: version: v: let - ver = builtins.splitVersion v; - minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); - upper = builtins.concatStringsSep "." (ireplace idx minor ver); - in - operators.">=" version v && operators."<" version upper; - dropWildcardPrecision = f: version: constraint: let - m = matchWildCard constraint; - hasWildcard = m != null; - c = if hasWildcard then (elemAt m 0) else constraint; - v = - if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) - else version; - in - f v c; + mkIdxComparison = idx: version: v: + let + ver = builtins.splitVersion v; + minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); + upper = builtins.concatStringsSep "." (ireplace idx minor ver); + in + operators.">=" version v && operators."<" version upper; + dropWildcardPrecision = f: version: constraint: + let + m = matchWildCard constraint; + hasWildcard = m != null; + c = if hasWildcard then (elemAt m 0) else constraint; + v = + if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) + else version; + in + f v c; in { # Prefix operators @@ -33,16 +34,17 @@ let # Semver specific operators "~" = mkIdxComparison 1; "^" = mkIdxComparison 0; - "~=" = v: c: let - # Prune constraint - parts = builtins.splitVersion c; - pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); - upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); - in - operators.">=" v c && operators."<" v upperConstraint; + "~=" = v: c: + let + # Prune constraint + parts = builtins.splitVersion c; + pruned = lib.take ((builtins.length parts) - 1) parts; + upper = builtins.toString ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); + upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); + in + operators.">=" v c && operators."<" v upperConstraint; # Infix operators "-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu; # Arbitrary equality clause, just run simple comparison @@ -55,33 +57,34 @@ let version = "([0-9\.\*x]+)"; }; - parseConstraint = constraint: let - constraintStr = builtins.replaceStrings [ " " ] [ "" ] constraint; - # The common prefix operators - mPre = match "${re.operators} *${re.version}" constraintStr; - # There is also an infix operator to match ranges - mIn = match "${re.version} *(-) *${re.version}" constraintStr; - in - ( - if mPre != null then { - op = elemAt mPre 0; - v = elemAt mPre 1; - } - # Infix operators are range matches - else if mIn != null then { - op = elemAt mIn 1; - v = { - vl = (elemAt mIn 0); - vu = (elemAt mIn 2); - }; - } - else throw "Constraint \"${constraintStr}\" could not be parsed" - ); - - satisfiesSemver = version: constraint: let - inherit (parseConstraint constraint) op v; - in - if constraint == "*" then true else operators."${op}" version v; + parseConstraint = constraint: + let + constraintStr = builtins.replaceStrings [ " " ] [ "" ] constraint; + # The common prefix operators + mPre = match "${re.operators} *${re.version}" constraintStr; + # There is also an infix operator to match ranges + mIn = match "${re.version} *(-) *${re.version}" constraintStr; + in + ( + if mPre != null then { + op = elemAt mPre 0; + v = elemAt mPre 1; + } + # Infix operators are range matches + else if mIn != null then { + op = elemAt mIn 1; + v = { + vl = (elemAt mIn 0); + vu = (elemAt mIn 2); + }; + } + else throw "Constraint \"${constraintStr}\" could not be parsed" + ); + satisfiesSemver = version: constraint: + let + inherit (parseConstraint constraint) op v; + in + if constraint == "*" then true else operators."${op}" version v; in { inherit satisfiesSemver; } diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index b7538a2b388f..85ebf3d0dc2d 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.34.1"; + version = "3.36.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1l4kr1av7933vb4zql9c5lgzivlw64hyky4nr8xin1v5if6vnjw4"; + sha256 = "hnDbTaz3shnTDFdcRlsXyO1nJNut40fyzelUi/8DkQg="; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { be restarted. ''; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index adb0df28ce16..836683895565 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "proto-contrib"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "19cqz13jd95d5vibd10420gg69ldgf6afc51mkglhafgmmif56b0"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Contributed tools and other packages on top of the Go proto package"; homepage = https://github.com/emicklei/proto-contrib; license = licenses.mit; diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index c25b2d56fe63..77c1df6f43e3 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule { pname = "protoc-gen-doc-unstable"; @@ -13,9 +13,7 @@ buildGoModule { modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Documentation generator plugin for Google Protocol Buffers"; longDescription = '' This is a documentation generator plugin for the Google Protocol Buffers diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix index 15a854e4d86c..37b0f1fdf8db 100644 --- a/pkgs/development/tools/prototool/default.nix +++ b/pkgs/development/tools/prototool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, protobuf, Security }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, protobuf }: buildGoModule rec { pname = "prototool"; @@ -13,8 +13,6 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - modSha256 = "1gc8kc9mbi3mlh48zx4lcgpsrf8z879f1qj9wfyr66s7wd1ljazg"; postInstall = '' @@ -25,7 +23,7 @@ buildGoModule rec { subPackages = [ "cmd/prototool" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/uber/prototool"; description = "Your Swiss Army Knife for Protocol Buffers"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/tools/pry/Gemfile.lock b/pkgs/development/tools/pry/Gemfile.lock index e6025f50ca15..d76845bc05a7 100644 --- a/pkgs/development/tools/pry/Gemfile.lock +++ b/pkgs/development/tools/pry/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES pry BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock index 8c5d369fb371..870652b567a4 100644 --- a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock +++ b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES puppet-lint BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/redis-dump/Gemfile.lock b/pkgs/development/tools/redis-dump/Gemfile.lock index 364bdb778f51..f789ae87d8d2 100644 --- a/pkgs/development/tools/redis-dump/Gemfile.lock +++ b/pkgs/development/tools/redis-dump/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES redis-dump BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 416dafe2872e..82dca2289cf4 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.20.1-01"; + version = "3.22.0-02"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "0l8fwcnpbc35lqadyrsljvr4rr5kp9gkx5dxs9i35mg2f0z9bagv"; + sha256 = "12433fgva03gsgi37xqgkdnbglgq4b66lmzk5cyxfg22szl4xvwz"; }; preferLocalBuild = true; diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix new file mode 100644 index 000000000000..dea0512b7d6b --- /dev/null +++ b/pkgs/development/tools/rgp/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, makeWrapper +, fetchurl +, autoPatchelfHook +, dbus +, fontconfig +, freetype +, glib +, libglvnd +, libX11 +, libxcb +, libXi +, ncurses5 +, qtbase +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rgp"; + version = "1.7.0.29"; + + src = fetchurl { + url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonGPUProfiler_${version}.tgz"; + sha256 = "d7d4aa92231796a509dfcf92e9618cac98ae6572c12efd0871eb43afa4e8240a"; + }; + + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + + buildInputs = [ + dbus + fontconfig + freetype + glib + libglvnd + libX11 + libxcb + libXi + ncurses5 + qtbase + zlib + ]; + + runtimeDependencies = [ + "${placeholder "out"}/opt/rgp" + "${placeholder "out"}/opt/rgp/qt" + ]; + + installPhase = '' + mkdir -p $out/opt/rgp $out/bin + cp -r . $out/opt/rgp/ + # Breaks autoPatchelfHook and has no known usage + rm $out/opt/rgp/AMDToolsDownloader + + for prog in RadeonGPUProfiler RadeonDeveloperPanel RadeonDeveloperService RadeonDeveloperServiceCLI; do + # makeWrapper is needed so that executables are started from the opt + # directory, where qt.conf is + makeWrapper \ + $out/opt/rgp/$prog \ + $out/bin/$prog + done + ''; + + meta = with lib; { + description = "A tool from AMD that allows for deep inspection of GPU workloads"; + homepage = "https://gpuopen.com/gaming-product/radeon-gpu-profiler-rgp/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/development/tools/ronn/Gemfile.lock index c2b90f634948..ff71ebd7a01c 100644 --- a/pkgs/development/tools/ronn/Gemfile.lock +++ b/pkgs/development/tools/ronn/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES ronn BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix index b209b09eec71..5087b811ac01 100644 --- a/pkgs/development/tools/rshell/default.nix +++ b/pkgs/development/tools/rshell/default.nix @@ -2,17 +2,17 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.26"; + version = "0.0.27"; src = fetchPypi { inherit pname version; - sha256 = "05nvfaykzwj1y86fcckrnvmrva7849lkbmpxsy2hb9akk0y7li6c"; + sha256 = "15pm60jfmr5nms43nrh5jlpz4lxxfhaahznfcys6nc4g80r2fwr2"; }; propagatedBuildInputs = [ pyserial pyudev ]; meta = with lib; { - homepage = https://github.com/dhylands/rshell; + homepage = "https://github.com/dhylands/rshell"; description = "Remote Shell for MicroPython"; license = licenses.mit; maintainers = with maintainers; [ c0deaddict ]; diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 9d166f0fad53..0e6e3a7f3610 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -24,4 +24,4 @@ DEPENDENCIES rubocop BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 9d2279fe5982..7c1361f6d270 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-asm"; - version = "0.1.17"; + version = "2019-12-24"; src = fetchFromGitHub { owner = "gnzlbg"; repo = "cargo-asm"; - rev = "7f69a17e9c36dfe1f0d7080d7974c72ecc87a145"; - sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws"; + rev = "577f890ebd4a09c8265710261e976fe7bfce8668"; + sha256 = "1f6kzsmxgdms9lq5z9ynnmxymk9k2lzlp3caa52wqjvdw1grw0rb"; }; - cargoSha256 = "1xsfwzn2b7hmb7hwgfa4ss7qfas8957gkw7zys0an9hdj5qr3ywb"; + cargoSha256 = "0d797cisiydblh64vqpfdjf37wmxrvs77phdrqh582lbrvnfhx2j"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index d9980df02a04..8374e0653560 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "0h535fnmwm1ix08a3ifasppqcm7z4fiwf6kn32vhqqpn7x9vvl53"; + sha256 = "04h9yyna47cgn2d232v2fpbgki9gg4lykpmx46ncpsq4g6azl1a9"; }; - cargoSha256 = "00j2czhb0ag10hwq7ycdwr2ndb6gz99kg12hlmaq4mkaf8h254nn"; + cargoSha256 = "0lzc2nwz9lpwxv704k40d1416qnf3wy3g6ad8w8xbkfc6ydcaa4l"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 7ffb77f741bf..73dcb96201ed 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.18"; + version = "0.4.19"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "1dhrzfy1ii2vg8psvz9rrgk0blj5bl64ghr0z44vh5y0kxn9v62p"; + sha256 = "15izqd6nbpxjjymdmcpzjmaiygs1vdrpg9cw1nzmrkb8fc4h5ch5"; }; - cargoSha256 = "13ib0binyw1rzxjg59ly3ahyr53wdq3z7wfp11gd61kzwz34gs9d"; + cargoSha256 = "0sbpymxhhwxg13w9821b17nda6p3ycqr81i7bj4fxil0n3sb910h"; buildInputs = [ llvmPackages.libclang ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index bf634d338055..f5ad1b413ca6 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -104,14 +104,14 @@ dependencies = [ [[package]] name = "cargo-make" -version = "0.29.0" +version = "0.30.4" dependencies = [ - "ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscriptsdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscriptsdk 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -142,7 +142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ci_info" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -239,7 +239,7 @@ dependencies = [ [[package]] name = "duckscriptsdk" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -953,7 +953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" "checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e53a6853eb0aafd4be4d1c7c891982a91a58f84df98838992ce3eb774572bfd9" +"checksum ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b407009a4a51ae109dbdfcd7b6e4de38d148f37fad512b8c4623c642c4045e68" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d" "checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" @@ -964,7 +964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" "checksum duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa4a338912dce0ada9929b9aa81c3b279e51b101583da13541339efaee46dfa9" -"checksum duckscriptsdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9da937d7dc544fe56d34e2b70c68bac038a821f5822e8a567b1ce52d47edd1c0" +"checksum duckscriptsdk 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cc45d92450a257a4fbf28126086983c88010dbe2f99f3559d0073a6ed440046" "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index a7ccc0581910..04e7d17503b3 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.29.0"; + version = "0.30.4"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0sxwc61iaqln37m45a3sy1c92ri4zad8g5h5fgk5plj0qlps80np"; + sha256 = "14sl7kcr1n3xb912vd3445pwf3v1kp74lgxlwqybnwiyh1dxihvg"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1w7nw3amb5by60a8aqvwka4aify8k3csjqys7arzksy98jyn6b4j"; + cargoSha256 = "06i1z5jjqyadmvjgwxjlxcj2mmb0g83byibl3ap9qffahn0vhf7x"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 34d744807463..87e8e081a931 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "1x21g66gri6z9bnnfn7zmnf2lwdf5ing76pcmw0ilx4nzpvfhkg0"; + sha256 = "100ls8p8w6jwcjh3ligly5alg8fzp21aj7b1qbndn9fm0y1nmjam"; }; - cargoSha256 = "13fbahdih5whll09pfgyb1bjag1f0d0xfwgm2s342bs1krxsrbh3"; + cargoSha256 = "0d9sz46yzh01dx973q10xzw4k7r7ylvg82s5pkp3zpwcin8smaiw"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; - homepage = https://github.com/eqrion/cbindgen; + homepage = "https://github.com/eqrion/cbindgen"; license = licenses.mpl20; maintainers = with maintainers; [ jtojnar andir ]; }; diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/development/tools/sass/Gemfile.lock index 1b99dd3a1361..9882e1efcc4f 100644 --- a/pkgs/development/tools/sass/Gemfile.lock +++ b/pkgs/development/tools/sass/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES sass BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/scss-lint/Gemfile.lock b/pkgs/development/tools/scss-lint/Gemfile.lock index 546dfabe4d76..08e2fe4e64db 100644 --- a/pkgs/development/tools/scss-lint/Gemfile.lock +++ b/pkgs/development/tools/scss-lint/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES scss_lint BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix index 5d1f015e8052..96aefe55a953 100644 --- a/pkgs/development/tools/setupcfg2nix/default.nix +++ b/pkgs/development/tools/setupcfg2nix/default.nix @@ -6,7 +6,7 @@ buildSetupcfg rec { owner = "target"; repo = "setupcfg2nix"; rev = info.version; - sha256 = "1zn9njpzwhwikrirgjlyz6ys3xr8gq61ry8blmnpscqvhsdhxcs6"; + sha256 = "1rj227vxybwp9acwnpwg9np964b1qcw2av3qmx00isnrw5vcps8m"; }; application = true; meta = { diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix index b0d5873ed63c..6b65632bf7d1 100644 --- a/pkgs/development/tools/setupcfg2nix/info.nix +++ b/pkgs/development/tools/setupcfg2nix/info.nix @@ -1,6 +1,6 @@ { pname = ''setupcfg2nix''; - version = ''1.1.0''; + version = ''2.0.1''; install_requires = [ ''setuptools'' ]; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index bab881cf4a49..d1d1200344f8 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.4.0"; + version = "1.6.0"; # rev is the ${version} commit, mainly for skaffold version command output - rev = "bb324609b4254ceb9f76d35eb03642a6a1807867"; + rev = "4cc0be23e41e37d8b1bca1464516538b2cc1bba0"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0nrz2gnp722cq4p8lcfl0nlws53c2bfq17jgr2jad4vyjglgfscw"; + sha256 = "0wz9x3p0hfajrkm1qrhl4kw7l7r3n6xv16chl4dxigaix8ga068h"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index c065629018c9..4425640828cc 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,17 +1,27 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, libselinux -, go-md2man }: +{ stdenv +, lib +, buildGoPackage +, fetchFromGitHub +, runCommand +, gpgme +, libgpgerror +, lvm2 +, btrfs-progs +, pkg-config +, libselinux +, go-md2man +}: with stdenv.lib; let - version = "0.1.41"; + version = "0.2.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "0aqw17irj2wn4a8g9hzfm5z5azqq33z6r1dbg1gyn2c8qxy1vfxs"; + sha256 = "09zqzrw6f1s6kaknnj3hra3xz4nq6y86vmw5vk8p4f6g7cwakg1x"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; @@ -28,7 +38,7 @@ buildGoPackage { excludedPackages = "integration"; - nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; + nativeBuildInputs = [ pkg-config (lib.getBin go-md2man) ]; buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; buildFlagsArray = '' @@ -49,10 +59,10 @@ buildGoPackage { popd ''; - meta = { + meta = with stdenv.lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; - maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ]; - license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ lewo ] ++ teams.podman.members; + license = licenses.asl20; }; } diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock index 6fc638615fbf..a57d1811b19e 100644 --- a/pkgs/development/tools/sqlint/Gemfile.lock +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - pg_query (1.1.0) - sqlint (0.1.9) + pg_query (1.2.0) + sqlint (0.1.10) pg_query (~> 1) PLATFORMS @@ -12,4 +12,4 @@ DEPENDENCIES sqlint BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix index b10a56c4c923..a86277363fbc 100644 --- a/pkgs/development/tools/sqlint/gemset.nix +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "070iy9jdj0snfl42my5n6i2svcnn87cbffcjvvq5068hw0b0296w"; + sha256 = "0p9s6znavm6v5dwk1hxg9a8h2lrrwh9l0rlk0sy8cx4sq2mq82m1"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; sqlint = { dependencies = ["pg_query"]; @@ -15,9 +15,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pg9c00w520mw1mzq8kls8whwgqva1alksdsv536bh9nq7m2hnky"; + sha256 = "0ds7qsaqi745fda8nliy15is36l1bkfbfkr43q6smpy103xbk44c"; type = "gem"; }; - version = "0.1.9"; + version = "0.1.10"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index b3026cdf84d4..b9fc3e2d514c 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libusb, zlib }: +{ stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }: stdenv.mkDerivation { name = "sunxi-tools-20181113"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb zlib ]; + buildInputs = [ libusb1 zlib ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 130aa87f7ce4..d297105ea91e 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,24 +8,26 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.02.04"; + version = "2020.03.25"; + # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-130-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-152-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "4e4b95c8e03583d48d76d1229f9c7825e2ee5be1"; - sha256 = "02kg48393bjiys56r62b4ks2xvfarw9phi5bips2xsnj9c99pmg0"; + rev = "c27bfc220a9f85f04173840d1ea081ba478adc9c"; + sha256 = "1fyl51246ns2njvij8g7k9a9axvhz8n8g09fny5dym9q7hcx08qh"; name = "trellis"; }) + (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis-db"; - rev = "717478b757a702bbc7e3e11a5fbecee2a64f7922"; - sha256 = "0q4j8qz3m2hissn2a82ck542cx62bp4f0wwzl3g22yv59i13yg83"; + rev = "c137076fdd8bfca3d2bf9cdacda9983dbbec599a"; + sha256 = "1br0vw8wwcn2qhs8kxkis5xqlr2nw7r3mf1qwjp8xckd6fa1wlcw"; name = "trellis-database"; }) ]; diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index f52d790c1063..2939df0ba20d 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -17,11 +17,11 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage"; - sha256 = "1rx7ih94ig3pd1yx1d3fpx7zpixq3j5birkpnzkh778qqsdrg0nf"; + sha256 = "05p5kqbwgqyk2aw2lix5dk1ql16aj6iczxrc63a1l0vj8wrha7z4"; }; meta = with stdenv.lib; { - homepage = https://unity3d.com/; + homepage = "https://unity3d.com/"; description = "Game development tool"; longDescription = '' Popular development platform for creating 2D and 3D multiplatform games diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index ee8100128620..677fddd0f60a 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -118,7 +118,7 @@ in buildRubyGem rec { description = "A tool for building complete development environments"; homepage = https://www.vagrantup.com/; license = licenses.mit; - maintainers = with maintainers; [ aneeshusa ma27 ]; + maintainers = with maintainers; [ ma27 ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index f9a84937af30..bab3ebd57573 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -5,14 +5,14 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.1.36"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "3c3d347f46cda641344ec5d613896499981b0540e2bfa299baf6026dab7649ca"; + sha256 = "1mq8lmb1wh55cqdj7javq7qia4217h6vf5ljc99gsjyibi7g7d3k"; }; - propagatedBuildInputs = [ pyyaml ]; + propagatedBuildInputs = [ pyyaml setuptools ]; makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git bazaar subversion ])]; @@ -20,7 +20,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; - homepage = https://github.com/dirk-thomas/vcstool; + homepage = "https://github.com/dirk-thomas/vcstool"; license = licenses.asl20; maintainers = with maintainers; [ sivteck ]; }; diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix index b7333e456442..6020d6fe8765 100644 --- a/pkgs/development/tools/wally-cli/default.nix +++ b/pkgs/development/tools/wally-cli/default.nix @@ -7,10 +7,9 @@ buildGoPackage rec { goPackagePath = "github.com/zsa/wally"; subPackages = [ "cli" ]; - nativeBuildInputs = [ - pkg-config - libusb1 - ]; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libusb1 ]; src = fetchFromGitHub { owner = "zsa"; diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch index e30e9c3d7e5f..29886fccd5f1 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch +++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch @@ -1,19 +1,19 @@ -From 792dcf4aef3144222e3fab9498bda620879664ab Mon Sep 17 00:00:00 2001 +From 786cd8df9e9fa245c4dbab1bfd21b7949b8a5300 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sat, 7 Mar 2020 22:56:36 +0100 +Date: Thu, 26 Mar 2020 01:54:11 +0100 Subject: [PATCH] Add cargo.lock --- - Cargo.lock | 2432 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 2432 insertions(+) + Cargo.lock | 2527 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 2527 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..2cd91628 +index 00000000..976ea6d4 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2432 @@ +@@ -0,0 +1,2527 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] @@ -31,9 +31,9 @@ index 00000000..2cd91628 + +[[package]] +name = "aho-corasick" -+version = "0.7.9" ++version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d5e63fd144e18ba274ae7095c0197a870a7b9468abc801dd62f190d80817d2ec" ++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" +dependencies = [ + "memchr", +] @@ -49,9 +49,9 @@ index 00000000..2cd91628 + +[[package]] +name = "anyhow" -+version = "1.0.26" ++version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" ++checksum = "013a6e0a2cbe3d20f9c60b65458f7a7f7a5e636c5d0f45a5a6aee5d4b1f01785" + +[[package]] +name = "arrayref" @@ -192,9 +192,9 @@ index 00000000..2cd91628 + +[[package]] +name = "bumpalo" -+version = "3.2.0" ++version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742" ++checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187" + +[[package]] +name = "byteorder" @@ -203,15 +203,6 @@ index 00000000..2cd91628 +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+dependencies = [ -+ "ppv-lite86", -+] -+ -+[[package]] +name = "canvas" +version = "0.1.0" +dependencies = [ @@ -368,9 +359,9 @@ index 00000000..2cd91628 + +[[package]] +name = "curl" -+version = "0.4.26" ++version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ecb534fed9060d04bccaa8b8e1e2d3d5a0d7a9ec6d9c667691c80a3c6b7d19ef" ++checksum = "eda1c0c03cacf3365d84818a40293f0e3f3953db8759c9c565a3b434edf0b52e" +dependencies = [ + "curl-sys", + "libc", @@ -383,9 +374,9 @@ index 00000000..2cd91628 + +[[package]] +name = "curl-sys" -+version = "0.4.28+curl-7.69.0" ++version = "0.4.30+curl-7.69.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2c6b7fa5d36aa192e410788b77af65f339af24c8786419e8b48173689a484bf" ++checksum = "923b38e423a8f47a4058e96f2a1fa2865a6231097ee860debd678d244277d50c" +dependencies = [ + "cc", + "libc", @@ -544,6 +535,31 @@ index 00000000..2cd91628 +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] ++name = "futures" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c329ae8753502fb44ae4fc2b622fa2a94652c41e795143765ba0927f92ab780" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++] ++ ++[[package]] +name = "futures-channel-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -553,12 +569,78 @@ index 00000000..2cd91628 +] + +[[package]] ++name = "futures-core" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a" ++ ++[[package]] +name = "futures-core-preview" +version = "0.3.0-alpha.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" + +[[package]] ++name = "futures-executor" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-io" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6" ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2 1.0.9", ++ "quote 1.0.3", ++ "syn 1.0.17", ++] ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-macro", ++ "futures-sink", ++ "futures-task", ++ "memchr", ++ "pin-utils", ++ "proc-macro-hack", ++ "proc-macro-nested", ++ "slab", ++] ++ ++[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -700,7 +782,7 @@ index 00000000..2cd91628 + +[[package]] +name = "js-sys" -+version = "0.3.36" ++version = "0.3.37" +dependencies = [ + "wasm-bindgen", + "wasm-bindgen-futures", @@ -729,9 +811,9 @@ index 00000000..2cd91628 + +[[package]] +name = "libc" -+version = "0.2.67" ++version = "0.2.68" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" ++checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" + +[[package]] +name = "libz-sys" @@ -789,11 +871,11 @@ index 00000000..2cd91628 + +[[package]] +name = "memoffset" -+version = "0.5.3" ++version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" ++checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8" +dependencies = [ -+ "rustc_version", ++ "autocfg 1.0.0", +] + +[[package]] @@ -949,9 +1031,9 @@ index 00000000..2cd91628 + +[[package]] +name = "openssl-src" -+version = "111.6.1+1.1.1d" ++version = "111.7.0+1.1.1e" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005" ++checksum = "6fde5a8c01ef8aa31ff8d0aaf9bae248581ed8840fca0b66e51cc9f294a8cb2c" +dependencies = [ + "cc", +] @@ -1025,6 +1107,12 @@ index 00000000..2cd91628 +] + +[[package]] ++name = "pin-utils" ++version = "0.1.0-alpha.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" ++ ++[[package]] +name = "pkg-config" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1079,31 +1167,43 @@ index 00000000..2cd91628 + +[[package]] +name = "proc-macro-error" -+version = "0.4.11" ++version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7959c6467d962050d639361f7703b2051c43036d03493c36f01d440fdd3138a" ++checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", + "version_check 0.9.1", +] + +[[package]] +name = "proc-macro-error-attr" -+version = "0.4.11" ++version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e4002d9f55991d5e019fb940a90e1a95eb80c24e77cb2462dd4dc869604d543a" ++checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", + "syn-mid", + "version_check 0.9.1", +] + +[[package]] ++name = "proc-macro-hack" ++version = "0.5.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcfdefadc3d57ca21cf17990a28ef4c0f7c61383a28cb7604cf4a18e6ede1420" ++ ++[[package]] ++name = "proc-macro-nested" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694" ++ ++[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1198,7 +1298,7 @@ index 00000000..2cd91628 +dependencies = [ + "getrandom", + "libc", -+ "rand_chacha 0.2.1", ++ "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc 0.2.0", +] @@ -1215,11 +1315,11 @@ index 00000000..2cd91628 + +[[package]] +name = "rand_chacha" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ -+ "c2-chacha", ++ "ppv-lite86", + "rand_core 0.5.1", +] + @@ -1395,9 +1495,9 @@ index 00000000..2cd91628 + +[[package]] +name = "regex" -+version = "1.3.4" ++version = "1.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" ++checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3" +dependencies = [ + "aho-corasick", + "memchr", @@ -1407,9 +1507,9 @@ index 00000000..2cd91628 + +[[package]] +name = "regex-syntax" -+version = "0.6.16" ++version = "0.6.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1" ++checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" + +[[package]] +name = "remove_dir_all" @@ -1477,19 +1577,10 @@ index 00000000..2cd91628 +checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + +[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+dependencies = [ -+ "semver", -+] -+ -+[[package]] +name = "ryu" -+version = "1.0.2" ++version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" ++checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" + +[[package]] +name = "safemem" @@ -1509,9 +1600,9 @@ index 00000000..2cd91628 + +[[package]] +name = "schannel" -+version = "0.1.17" ++version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295" ++checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" +dependencies = [ + "lazy_static", + "winapi", @@ -1536,38 +1627,23 @@ index 00000000..2cd91628 +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] -+name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+dependencies = [ -+ "semver-parser", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+ -+[[package]] +name = "serde" -+version = "1.0.104" ++version = "1.0.105" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++checksum = "e707fbbf255b8fc8c3b99abb91e7257a622caeb20a9818cbadbeeede4e0932ff" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.104" ++version = "1.0.105" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++checksum = "ac5d00fc561ba2724df6758a17de23df5914f20e41cb00f94d5b7ae42fffaff8" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", +] + +[[package]] @@ -1594,6 +1670,12 @@ index 00000000..2cd91628 +checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + +[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++ ++[[package]] +name = "smallvec" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1631,9 +1713,9 @@ index 00000000..2cd91628 + +[[package]] +name = "structopt" -+version = "0.3.11" ++version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fe43617218c0805c6eb37160119dc3c548110a67786da7218d1c6555212f073" ++checksum = "c8faa2719539bbe9d77869bfb15d4ee769f99525e707931452c97b693b3f159d" +dependencies = [ + "clap", + "lazy_static", @@ -1642,15 +1724,15 @@ index 00000000..2cd91628 + +[[package]] +name = "structopt-derive" -+version = "0.4.4" ++version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6e79c80e0f4efd86ca960218d4e056249be189ff1c42824dcd9a7f51a56f0bd" ++checksum = "3f88b8e18c69496aad6f9ddf4630dd7d585bcaf765786cb415b9aec2fe5a0430" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", +] + +[[package]] @@ -1666,9 +1748,9 @@ index 00000000..2cd91628 + +[[package]] +name = "syn" -+version = "1.0.16" ++version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859" ++checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", @@ -1683,7 +1765,7 @@ index 00000000..2cd91628 +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", +] + +[[package]] @@ -1818,9 +1900,9 @@ index 00000000..2cd91628 + +[[package]] +name = "trybuild" -+version = "1.0.23" ++version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "26ff1b18659a2218332848d76ad1c867ce4c6ee37b085e6bc8de9a6d11401220" ++checksum = "24b4e093c5ed1a60b22557090120aa14f90ca801549c0949d775ea07c1407720" +dependencies = [ + "glob", + "lazy_static", @@ -1958,7 +2040,7 @@ index 00000000..2cd91628 + "heck", + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", +] + +[[package]] @@ -1969,7 +2051,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "cfg-if", + "js-sys", @@ -1985,7 +2067,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-anyref-xform" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "rayon", @@ -1997,14 +2079,14 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "bumpalo", + "lazy_static", + "log 0.4.8", + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", + "wasm-bindgen-shared", +] + @@ -2018,7 +2100,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "assert_cmd", @@ -2046,7 +2128,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "base64 0.9.3", @@ -2068,7 +2150,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.9" ++version = "0.4.10" +dependencies = [ + "cfg-if", + "futures-channel-preview", @@ -2080,7 +2162,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "quote 1.0.3", + "trybuild", @@ -2091,18 +2173,18 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", -+ "syn 1.0.16", ++ "syn 1.0.17", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "rayon", @@ -2123,11 +2205,11 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.59" ++version = "0.2.60" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.9" ++version = "0.3.10" +dependencies = [ + "console_error_panic_hook", + "js-sys", @@ -2153,7 +2235,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.9" ++version = "0.3.10" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", @@ -2161,7 +2243,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "walrus", @@ -2170,7 +2252,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "walrus", @@ -2178,7 +2260,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "log 0.4.8", @@ -2189,7 +2271,7 @@ index 00000000..2cd91628 + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.59" ++version = "0.2.60" +dependencies = [ + "anyhow", + "env_logger", @@ -2200,7 +2282,7 @@ index 00000000..2cd91628 + "quote 1.0.3", + "sourcefile", + "structopt", -+ "syn 1.0.16", ++ "syn 1.0.17", + "wasm-bindgen-backend", + "weedle", +] @@ -2254,25 +2336,25 @@ index 00000000..2cd91628 + +[[package]] +name = "wast" -+version = "9.0.0" ++version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee7b16105405ca2aa2376ba522d8d4b1a11604941dd3bb7df9fd2ece60f8d16a" ++checksum = "df4d67ba9266f4fcaf2e8a1afadc5e2a959e51aecc07b1ecbdf85a6ddaf08bde" +dependencies = [ + "leb128", +] + +[[package]] +name = "wat" -+version = "1.0.10" ++version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56173f7f4fb59aebe35a7e71423845e1c6c7144bfb56362d497931b6b3bed0f6" ++checksum = "9a9400dc1c8512087b2d974b1b9b0a6c4e6e26e7e8acf629e3e351165a1ed301" +dependencies = [ -+ "wast 9.0.0", ++ "wast 11.0.0", +] + +[[package]] +name = "web-sys" -+version = "0.3.36" ++version = "0.3.37" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -2316,6 +2398,19 @@ index 00000000..2cd91628 +] + +[[package]] ++name = "webxr" ++version = "0.1.0" ++dependencies = [ ++ "futures", ++ "js-sys", ++ "serde", ++ "serde_derive", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++] ++ ++[[package]] +name = "weedle" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index e5afcb30a817..ee9a6ead7fa1 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.59"; + version = "0.2.60"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "1i0hdky5dlkrzcphddm122yxfhgcvnszh4q1as0r41vhfs5ss597"; + sha256 = "1jr4v5y9hbkyg8gjkr3qc2qxwhyagfs8q3y3z248mr1919mcas8h"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "1ylk9vrpajslx1zy4vqmlyqa5ygcmvir1gcn8hsr6liigf5kcz7p"; + cargoSha256 = "08g110qahipgm1qyyihgqwnkr23w0gk1gp63ici5dj2qsxnc4mxv"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 18d7be93258b..cd002bd2ef61 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,17 +1,17 @@ { stdenv, python3Packages }: python3Packages.buildPythonApplication rec { - version = "1.2.2"; + version = "1.2.8"; pname = "wllvm"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1zrjcabv41105mmv632gp488kmhya37n0jwgwxhadps4z3jv2qxb"; + sha256 = "1d88fzg4ba4r3hwrinnv6agiyj3xxdy4yryb8wz2ml51nc6bi591"; }; meta = with stdenv.lib; { - homepage = https://github.com/travitch/whole-program-llvm; + homepage = "https://github.com/travitch/whole-program-llvm"; description = "A wrapper script to build whole-program LLVM bitcode files"; license = licenses.mit; maintainers = with maintainers; [ mic92 dtzWill ]; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 14e55f99e0bd..901435bb631f 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, fetchurl, writeText, php, makeWrapper }: - let - version = "2.2.0"; + version = "2.4.0"; completion = fetchurl { - url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; + url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; }; @@ -15,14 +14,14 @@ let [Phar] phar.readonly = Off ''; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "wp-cli"; inherit version; src = fetchurl { - url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "0s03jbsjwvkcbyss6rvpgw867hiwvk5p4n1qznkghyzi94j8mvki"; + url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; + sha256 = "0h5mjxrw4z3648v4wb4pvapz2a1mlmbszgggg4b7bvrrxn3cr78k"; }; nativeBuildInputs = [ makeWrapper ]; @@ -45,9 +44,9 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A command line interface for WordPress"; - homepage = https://wp-cli.org; - license = licenses.mit; + homepage = "https://wp-cli.org"; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/xcpretty/Gemfile.lock b/pkgs/development/tools/xcpretty/Gemfile.lock index 6f1ba7545a82..c0b9676d27bd 100644 --- a/pkgs/development/tools/xcpretty/Gemfile.lock +++ b/pkgs/development/tools/xcpretty/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 1.16.4 + 2.1.4 diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 9db4472f6720..dfdd921fd03d 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.2"; + version = "1.22.4"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1av52k5hl7xylxz5c0h64akz6ccd1vm64v0pzmny1661pbihiwp5"; + sha256 = "1s054c9cmlmzy6cfkawhaxvaxhqcq0a17n4sb12p0bp2lzkax9lm"; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 86f6b129accd..2b6449d9dd4d 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ pname = "cypress"; - version = "3.8.3"; + version = "4.2.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1ncq64s5y5dsx0lrz950vab2yzwihl2wd7yapp12305bjjsihj3z"; + sha256 = "0ksa7c0bpq13xxgk0qizg3kfyjihcqan5wm6f45v7kgz3wwxc4nz"; }; # don't remove runtime deps diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 05f07fd02608..965a53dcdbda 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -1,18 +1,16 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "flyctl"; - version = "0.0.102"; + version = "0.0.110"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "181j248i8j9g7kz5krg0bkbxkvmcwpz2vlknii5q3dy7yhgg19h3"; + sha256 = "1fvvanyzrai41fq98msjwzgwsidxbaly6f6knma6lwmicv4f9svg"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preBuild = '' go generate ./... ''; @@ -22,9 +20,9 @@ buildGoModule rec { rm $out/bin/helpgen ''; - modSha256 = "1mqkc7hnavvpbqar9f1d2vnm47p4car9abnk2ikyf27jr5glwmsd"; + modSha256 = "0lnk2g5msqhhshh99s32sqd793rdlzmp7vhqdb1fd6qafrrrxm5w"; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tools for fly.io services"; homepage = "https://fly.io/"; license = licenses.asl20; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 4086566f681f..fc68fa532460 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0ry2z4xn0zmdr38k0aa9qiwvfg3q4yxd1wxdwmhzp1vd3g39cx49"; + sha256 = "107dvgwv2ldpdr99q1nvb1i93jj635p1n7md6q14v9m4a6a226sa"; }; buildInputs = [ unzip ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { over configuration to provide a productive and stream-lined development experience. ''; - homepage = https://grails.org/; + homepage = "https://grails.org/"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/development/web/mailcatcher/Gemfile.lock index 560213897c91..69cc56a0029a 100644 --- a/pkgs/development/web/mailcatcher/Gemfile.lock +++ b/pkgs/development/web/mailcatcher/Gemfile.lock @@ -38,4 +38,4 @@ DEPENDENCIES mailcatcher BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index cd602317c70d..3752519d0609 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "minify"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minifiers for web formats"; license = licenses.mit; homepage = "https://go.tacodewolff.nl/minify"; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 815b569a7eb4..9a50d5fbd355 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.19.0"; - sha256 = "0sginvcsf7lrlzsnpahj4bj1f673wfvby8kaxgvzlrbb7sy229v2"; + version = "10.20.0"; + sha256 = "0cvjwnl0wkcsyw3kannbdv01s235wrnp11n2s6swzjx95gpichfi"; } diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 3fa5216ccf82..6d7f213536a6 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.16.1"; - sha256 = "0ba1dla31z6i31z3723l74nky1v04irwbl3iaqmi0iicl1dq958a"; + version = "12.16.2"; + sha256 = "0y5yd6h13fr34byi7h5xdjaivgcxiz0ykcmpk9nm5ra01b54fp2m"; } diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index c5e3f7c4bdbf..8676214b50b2 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "13.11.0"; - sha256 = "07r9xwjmiip9zmgfq77f3av3p93adc5cphj07idph1l8ws1j2h75"; + version = "13.12.0"; + sha256 = "199qcvzikdzw0h25v9dws77fff6hbvr8dj50lyzlnkya1dd6fzhd"; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index aea451ff8ae4..ba304972d9a1 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.20.0"; + version = "7.21.2"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "1al0kl2snbxzmprn13vbna4wyd72dya5lyfkhjgqabm4b7mign6c"; + sha256 = "18lb8csfmy5j97zdg3c5l23aaw9hjg04qhfc1sz9pgi7xhwz5g1b"; name = "${pname}.tar.gz"; }; |