From da41eaeb460261fa0739c28038b85b3a4c4e3eef Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 29 Aug 2020 12:00:00 +0000 Subject: [PATCH 001/120] gnirehtet: 2.4 -> 2.5 the patch is not necessary anymore, as paths to adb and the apk can be set with environment variables --- pkgs/tools/networking/gnirehtet/default.nix | 25 ++++++----- pkgs/tools/networking/gnirehtet/paths.patch | 48 --------------------- 2 files changed, 12 insertions(+), 61 deletions(-) delete mode 100644 pkgs/tools/networking/gnirehtet/paths.patch diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index f739e80be1fe..8d7d2392dfb7 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -1,12 +1,12 @@ -{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}: +{ stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, makeWrapper }: let -version = "2.4"; +version = "2.5"; apk = stdenv.mkDerivation { pname = "gnirehtet.apk"; inherit version; src = fetchzip { url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip"; - sha256 = "13gsh5982v961j86j5y71pgas94g2d1v1fgnbslbqw4h69fbf48g"; + sha256 = "1db0gkg5z8lighhkyqfsr9jiacrck89zmfnmp74vj865hhxgjzgq"; }; installPhase = '' mkdir $out @@ -22,19 +22,18 @@ rustPlatform.buildRustPackage { owner = "Genymobile"; repo = "gnirehtet"; rev = "v${version}"; - sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl"; + sha256 = "0wk6n082gnj9xk46n542h1012h8gyhldca23bs7vl73g0534g878"; }; sourceRoot = "source/relay-rust"; - cargoSha256 = "0rb5xcqg5ikgrxpmzrql5n298j50aqgkkp45znbfv2x2n40dywad"; + cargoSha256 = "0i7f52r697gjw30m8k60hd3y6wsn5lpz419r083a1rhpbinzd26q"; - patchFlags = [ "-p2" ]; - patches = [ - (substituteAll { - src = ./paths.patch; - adb = "${androidenv.androidPkgs_9_0.platform-tools}/bin/adb"; - inherit apk; - }) - ]; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/gnirehtet \ + --set GNIREHTET_APK ${apk}/gnirehtet.apk \ + --set ADB ${androidenv.androidPkgs_9_0.platform-tools}/bin/adb + ''; meta = with stdenv.lib; { description = "Reverse tethering over adb for Android"; diff --git a/pkgs/tools/networking/gnirehtet/paths.patch b/pkgs/tools/networking/gnirehtet/paths.patch deleted file mode 100644 index e5df4b8e4fe7..000000000000 --- a/pkgs/tools/networking/gnirehtet/paths.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: gnirehtet/relay-rust/src/main.rs -=================================================================== ---- gnirehtet.orig/relay-rust/src/main.rs -+++ gnirehtet/relay-rust/src/main.rs -@@ -299,7 +299,7 @@ impl Command for RelayCommand { - - fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> { - info!(target: TAG, "Installing gnirehtet client..."); -- exec_adb(serial, vec!["install", "-r", "gnirehtet.apk"]) -+ exec_adb(serial, vec!["install", "-r", "@apk@/gnirehtet.apk"]) - } - - fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> { -@@ -464,8 +464,8 @@ fn exec_adb>( - args: Vec, - ) -> Result<(), CommandExecutionError> { - let adb_args = create_adb_args(serial, args); -- debug!(target: TAG, "Execute: adb {:?}", adb_args); -- match process::Command::new("adb").args(&adb_args[..]).status() { -+ debug!(target: TAG, "Execute: @adb@ {:?}", adb_args); -+ match process::Command::new("@adb@").args(&adb_args[..]).status() { - Ok(exit_status) => { - if exit_status.success() { - Ok(()) -@@ -487,8 +487,8 @@ fn must_install_client(serial: Option<&S - serial, - vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"], - ); -- debug!(target: TAG, "Execute: adb {:?}", args); -- match process::Command::new("adb").args(&args[..]).output() { -+ debug!(target: TAG, "Execute: @adb@ {:?}", args); -+ match process::Command::new("@adb@").args(&args[..]).output() { - Ok(output) => { - if output.status.success() { - // the "regex" crate makes the binary far bigger, so just parse the versionCode -Index: gnirehtet/relay-rust/src/adb_monitor.rs -=================================================================== ---- gnirehtet.orig/relay-rust/src/adb_monitor.rs -+++ gnirehtet/relay-rust/src/adb_monitor.rs -@@ -206,7 +206,7 @@ impl AdbMonitor { - - fn start_adb_daemon() -> bool { - info!(target: TAG, "Restarting adb daemon"); -- match process::Command::new("adb") -+ match process::Command::new("@adb@") - .args(&["start-server"]) - .status() { - Ok(exit_status) => { From 5c931c7299dfdc94680ffc0aa478ede5b14fab68 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Tue, 27 Oct 2020 00:15:44 +0100 Subject: [PATCH 002/120] docs: Add link to the GitHub issue on how to become a committer --- doc/contributing/reviewing-contributions.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/contributing/reviewing-contributions.xml b/doc/contributing/reviewing-contributions.xml index fe79d8d992b1..32607cb0cc0a 100644 --- a/doc/contributing/reviewing-contributions.xml +++ b/doc/contributing/reviewing-contributions.xml @@ -515,12 +515,8 @@ It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests. - - TODO: add the procedure to request merging rights. - - + + Please see the discussion in GitHub nixpkgs issue #50105 for information on how to proceed to be granted this level of access. + + In a case a contributor definitively leaves the Nix community, they should create an issue or post on Discourse with references of packages and modules they maintain so the maintainership can be taken over by other contributors. From 6f7d8e55282f58ecb36036ca5f669698b12040db Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 18 Nov 2020 20:18:27 +0100 Subject: [PATCH 003/120] nixos/sane: bump the MaxConnections to a reasonable amount MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Whenever I try to scan from another computer it has to establish >2 connections in order to succeed. With the connections being limited to 1 I can not scan any document. This is also what other distributions ([Debian], [ArchLinux], …) have done in one way or another. [Debian]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850649#5 [ArchLinux]: no limit: https://github.com/archlinux/svntogit-packages/blob/99cba454bb0b69034bc45e97cde4a460bccfef4b/trunk/saned.socket#L4 --- nixos/modules/services/hardware/sane.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index b344dfc20610..03070a8f9e7c 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -148,7 +148,7 @@ in # saned needs to distinguish between IPv4 and IPv6 to open matching data sockets. BindIPv6Only = "ipv6-only"; Accept = true; - MaxConnections = 1; + MaxConnections = 64; }; }; From a68a0bcc9185303db001ac8336197ac4cf6ad060 Mon Sep 17 00:00:00 2001 From: Timothy Klim Date: Thu, 19 Nov 2020 13:42:28 +0700 Subject: [PATCH 004/120] nvidia-x11: 455.38 -> 455.45.01 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5fc60b404d89..b16dd3997f60 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "455.38"; - sha256_64bit = "0x6w2kcjm5q9z9l6rkxqabway4qq4h3ynngn36i8ky2dpxc1wzfq"; - settingsSha256 = "1hk4yvbb7xhfwm8jiwq6fj5m7vg3w7yvgglhfyhq7bbrlklfb4hm"; - persistencedSha256 = "00mmazv8sy93jvp60v7p954n250f4q3kxc13l4f8fmi28lgv0844"; + version = "455.45.01"; + sha256_64bit = "6tyMfggvZVQPp/aiSdgwn7VG/mIGb0lUcnAdyMEDoVM="; + settingsSha256 = "70ABqnO/heCp/5IztpU0Lo7eZd4n4wUoTlp1xIQ3aCc="; + persistencedSha256 = "36sM+djZvm77Gle7dcZ5tppgzQkD4IA0FJgCGsdZRI8="; } else legacy_390; From 07d2079c1a30f3df9ee2975296d9aa113f27b686 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 19 Nov 2020 20:49:22 +0700 Subject: [PATCH 005/120] lambda-delta: init at 0.98.3 --- pkgs/misc/emulators/lambda-delta/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/misc/emulators/lambda-delta/default.nix diff --git a/pkgs/misc/emulators/lambda-delta/default.nix b/pkgs/misc/emulators/lambda-delta/default.nix new file mode 100644 index 000000000000..0668d2db9086 --- /dev/null +++ b/pkgs/misc/emulators/lambda-delta/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, SDL2 }: + +stdenv.mkDerivation rec { + pname = "lambda-delta"; + version = "0.98.3"; + + src = fetchFromGitHub { + owner = "dseagrav"; + repo = "ld"; + rev = version; + sha256 = "02m43fj9dzc1i1jl01qwnhjiq1rh03jw1xq59sx2h3bhn7dk941x"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ SDL2 ]; + + configureFlags = [ "--without-SDL1" ]; + + meta = with stdenv.lib; { + description = "LMI (Lambda Lisp Machine) emulator"; + homepage = "https://github.com/dseagrav/ld"; + license = licenses.gpl2; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c0fd95f1e0f..c586a793df08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22028,6 +22028,8 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix { kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; + lambda-delta = callPackage ../misc/emulators/lambda-delta { }; + lame = callPackage ../development/libraries/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; From 8b1717c266154123f7db7f12c017dc029c5f3f3e Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 14 Nov 2020 07:20:20 +0000 Subject: [PATCH 006/120] sof-firmware: 1.5.1 -> 1.6 https://github.com/thesofproject/sof/releases/tag/v1.6 --- .../linux/firmware/sof-firmware/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index a9fc44e48cc8..684d638ce29f 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -3,24 +3,22 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sof-firmware"; - version = "1.5.1"; + version = "1.6"; src = fetchFromGitHub { owner = "thesofproject"; repo = "sof-bin"; - rev = "ae61d2778b0a0f47461a52da0d1f191f651e0763"; - sha256 = "0j6bpwz49skvdvian46valjw4anwlrnkq703n0snkbngmq78prba"; + rev = "cbdec6963b2c2d58b0080955d3c11b96ff4c92f0"; + sha256 = "0la2pw1zpv50cywiqcfb00cxqvjc73drxwjchyzi54l508817nxh"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - mkdir -p $out/lib/firmware/intel + mkdir -p $out/lib/firmware - sed -i 's/ROOT=.*$/ROOT=$out/g' go.sh - sed -i 's/VERSION=.*$/VERSION=v${version}/g' go.sh - - ./go.sh + patchShebangs go.sh + ROOT=$out SOF_VERSION=v${version} ./go.sh ''; meta = with stdenv.lib; { From a41e85dbe8d8b4c99c6d91a0046bf03e64d259df Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Tue, 17 Nov 2020 10:21:38 +0100 Subject: [PATCH 007/120] toybox: 0.8.3 -> 0.8.4 --- pkgs/tools/misc/toybox/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 23fdc2f7135c..9b38db5a7273 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "0cb1n0skanwwkwgzlswwhvfb4iji1bw9iqskmczlhakpw3j1yaqa"; + sha256 = "0cgbmv6qk1haj709hjx5q4sl7wgh91i459gzs1203adwc7rvk6jv"; }; buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; @@ -60,6 +60,8 @@ stdenv.mkDerivation rec { homepage = "https://landley.net/toybox/"; license = licenses.bsd0; platforms = with platforms; linux ++ darwin ++ freebsd; + # https://github.com/NixOS/nixpkgs/issues/101229 + broken = stdenv.isDarwin; maintainers = with maintainers; [ hhm ]; priority = 10; }; From d6678ac9b4193cef58881f1a60451fdd0df3cccd Mon Sep 17 00:00:00 2001 From: Marcos Benevides Date: Mon, 9 Nov 2020 21:37:50 -0300 Subject: [PATCH 008/120] insomnia: 7.1.1 -> core@2020.4.2 --- pkgs/development/web/insomnia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 0640e0993413..ce6f469c4445 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "7.1.1"; + version = "2020.4.2"; src = fetchurl { url = - "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "0lg3j5pr2bkjq5rq035fwh4mgpqsja3ndp11zpcz85ni3nvhn657"; + "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; + sha256 = "0pxf6nphb6k2szgapqkhjavdzq1blg34v1zj47l76r0iqxrpm3va"; }; nativeBuildInputs = From 24884e5aac7c095ec2c8a895f8825a3f675088ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 Nov 2020 15:48:27 +0100 Subject: [PATCH 009/120] GH Action: merge staging(-next) periodically Automate the merging of `master` -> `staging-next` -> `staging`. Our main development branch is `master`. Large rebuilds go to `staging`. Periodically, `staging` is merged into `staging-next` for stabilization. When considered sufficiently stable, `staging-next` is merged into `master`. As changes arrive on these branches, it is important that they're all updated regularly with eachothers changes. This commit automates that part. --- .github/CODEOWNERS | 1 + .github/workflows/merge-staging.yml | 30 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 .github/workflows/merge-staging.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 20668760d2d4..9835b7654612 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,6 +12,7 @@ # GitHub actions /.github/workflows @Mic92 @zowoq +/.github/workflows/merge-staging @FRidh # EditorConfig /.editorconfig @Mic92 @zowoq diff --git a/.github/workflows/merge-staging.yml b/.github/workflows/merge-staging.yml new file mode 100644 index 000000000000..a3dd1911370f --- /dev/null +++ b/.github/workflows/merge-staging.yml @@ -0,0 +1,30 @@ +name: "merge staging(-next)" + +on: + schedule: + # * is a special character in YAML so you have to quote this string + # Merge every 6 hours + - cron: '* */6 * * *' + +jobs: + sync-branch: + if: github.repository == 'NixOS/nixpkgs' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Merge master into staging-next + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: master + target_branch: staging-next + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Merge staging-next into staging + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: staging-next + target_branch: staging + github_token: ${{ secrets.GITHUB_TOKEN }} From 318f9290475f7fd295a7b6b1df0be907e24b63f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 28 Nov 2020 15:53:17 +0100 Subject: [PATCH 010/120] GH Action: merge staging(-next): comment on failure Comment on the designated issue in case of a failure. Whoever wants to help out resolving merge conflicts can simply follow this issue. --- .github/workflows/merge-staging.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/merge-staging.yml b/.github/workflows/merge-staging.yml index a3dd1911370f..c76c66713cfb 100644 --- a/.github/workflows/merge-staging.yml +++ b/.github/workflows/merge-staging.yml @@ -28,3 +28,12 @@ jobs: from_branch: staging-next target_branch: staging github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Comment on failure + uses: peter-evans/create-or-update-comment@v1 + if: ${{ failure() }} + with: + issue-number: 105153 + body: | + An automatic merge [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). + From 38e6f15d989b48e4a60e7cbd3ef36dcb927e0512 Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Sun, 29 Nov 2020 22:31:31 +0100 Subject: [PATCH 011/120] btor2tools: fix install_name on darwin --- pkgs/applications/science/logic/btor2tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index 34c0dac2a17e..7d2aed7596e8 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv, cmake, fetchFromGitHub, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "btor2tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mfqmkgvyw8fa2c09kww107dmk180ch1hp98r5kv41vnc04iqb0s"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; installPhase = '' mkdir -p $out $dev/include/btor2parser/ $lib/lib From da3c0ca0ddc4f9b5876e07b0d4e86bd90ea985b6 Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Sun, 29 Nov 2020 22:31:54 +0100 Subject: [PATCH 012/120] boolector: fix darwin build --- .../science/logic/boolector/default.nix | 54 +++++++++++-------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index aedc8e3484a9..0364a76639aa 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, python3 +{ stdenv, fetchFromGitHub, fetchpatch, lib, python3 , cmake, lingeling, btor2tools, gtest, gmp }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0jkmaw678njqgkflzj9g374yk1mci8yqvsxkrqzlifn6bwhwb7ci"; }; + # excludes development artifacts from install, will be included in next release + patches = [ + (fetchpatch { + url = "https://github.com/Boolector/boolector/commit/4d240436e34e65096671099766344dd9126145b1.patch"; + sha256 = "1girsbvlhkkl1hldl2gsjynwc3m92jskn798qhx0ydg6whrfgcgw"; + }) + ]; + postPatch = '' sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1 ''; @@ -23,39 +31,39 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DUSE_LINGELING=YES" - "-DBtor2Tools_INCLUDE_DIR=${btor2tools.dev}/include" - "-DBtor2Tools_LIBRARIES=${btor2tools.lib}/lib/libbtor2parser.so" ] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES"); - installPhase = '' - mkdir -p $out/bin $lib/lib $dev/include - - cp -vr bin/* $out/bin - cp -vr lib/* $lib/lib - - rm -rf $out/bin/{examples,tests} - # we don't care about gtest related libs - rm -rf $lib/lib/libg* - - cd ../src - find . -iname '*.h' -exec cp --parents '{}' $dev/include \; - rm -rf $dev/include/tests - ''; - checkInputs = [ python3 ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$(readlink -f lib) - patchShebangs .. + preCheck = + let var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in + # tests modelgen and modelgensmt2 spawn boolector in another processes and + # macOS strips DYLD_LIBRARY_PATH, hardcode it for testing + stdenv.lib.optionalString stdenv.isDarwin '' + cp -r bin bin.back + install_name_tool -change libboolector.dylib $(pwd)/lib/libboolector.dylib bin/boolector + '' + '' + export ${var}=$(readlink -f lib) + patchShebangs .. + ''; + + postCheck = stdenv.lib.optionalString stdenv.isDarwin '' + rm -rf bin + mv bin.back bin ''; - outputs = [ "out" "dev" "lib" ]; + # this is what haskellPackages.boolector expects + postInstall = '' + cp $out/include/boolector/boolector.h $out/include/boolector.h + cp $out/include/boolector/btortypes.h $out/include/btortypes.h + ''; meta = with stdenv.lib; { description = "An extremely fast SMT solver for bit-vectors and arrays"; homepage = "https://boolector.github.io"; license = licenses.mit; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ thoughtpolice ]; }; } From 454df2b0c36161de67c3f143ab85fb16c33c23f2 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Sun, 29 Nov 2020 23:01:58 -0800 Subject: [PATCH 013/120] Cross-compiling configuration for reMarkable 2 tablet --- lib/systems/examples.nix | 5 +++++ lib/systems/platforms.nix | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 3bbe61ed33a5..2476c3541b10 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -39,6 +39,11 @@ rec { platform = platforms.zero-gravitas; }; + remarkable2 = { + config = "armv7l-unknown-linux-gnueabihf"; + platform = platforms.zero-sugar; + }; + armv7l-hf-multiplatform = { config = "armv7l-unknown-linux-gnueabihf"; platform = platforms.armv7l-hf-multiplatform; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 42d9809fd7d0..7097e147966e 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -217,6 +217,21 @@ rec { }; }; + zero-sugar = { + name = "zero-sugar"; + kernelBaseConfig = "zero-sugar_defconfig"; + kernelArch = "arm"; + kernelDTB = true; + kernelAutoModules = false; + kernelPreferBuiltin = true; + kernelTarget = "zImage"; + gcc = { + cpu = "cortex-a7"; + fpu = "neon-vfpv4"; + float-abi = "hard"; + }; + }; + scaleway-c1 = armv7l-hf-multiplatform // { gcc = { cpu = "cortex-a9"; From 627dfecaddb7461956bce70059edc885efcd292b Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Nov 2020 16:22:08 +0900 Subject: [PATCH 014/120] nixos/vector: add module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/logging/vector.nix | 61 +++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/vector.nix | 37 ++++++++++++++ 4 files changed, 100 insertions(+) create mode 100644 nixos/modules/services/logging/vector.nix create mode 100644 nixos/tests/vector.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6ac12e4e1387..0c281da84167 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -396,6 +396,7 @@ ./services/logging/rsyslogd.nix ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix + ./services/logging/vector.nix ./services/mail/clamsmtp.nix ./services/mail/davmail.nix ./services/mail/dkimproxy-out.nix diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix new file mode 100644 index 000000000000..a7c54ad75fde --- /dev/null +++ b/nixos/modules/services/logging/vector.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with lib; +let cfg = config.services.vector; + +in { + options.services.vector = { + enable = mkEnableOption "Vector"; + + journaldAccess = mkOption { + type = types.bool; + default = false; + description = '' + Enable Vector to access journald. + ''; + }; + + settings = mkOption { + type = (pkgs.formats.json { }).type; + default = { }; + description = '' + Specify the configuration for Vector in Nix. + ''; + }; + }; + + config = mkIf cfg.enable { + + users.groups.vector = { }; + users.users.vector = { + description = "Vector service user"; + group = "vector"; + isSystemUser = true; + }; + systemd.services.vector = { + description = "Vector event and log aggregator"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + serviceConfig = let + format = pkgs.formats.toml { }; + conf = format.generate "vector.toml" cfg.settings; + validateConfig = file: + pkgs.runCommand "validate-vector-conf" { } '' + ${pkgs.vector}/bin/vector validate --no-topology --no-environment "${file}" + ln -s "${file}" "$out" + ''; + in { + ExecStart = "${pkgs.vector}/bin/vector --config ${validateConfig conf}"; + User = "vector"; + Group = "vector"; + Restart = "no"; + StateDirectory = "vector"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + # This group is required for accessing journald. + SupplementaryGroups = mkIf cfg.journaldAccess "systemd-journal"; + }; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d4aff486225d..38354a765286 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -376,6 +376,7 @@ in uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; vault = handleTest ./vault.nix {}; + vector = handleTest ./vector.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; wasabibackend = handleTest ./wasabibackend.nix {}; diff --git a/nixos/tests/vector.nix b/nixos/tests/vector.nix new file mode 100644 index 000000000000..3da7d0f30edd --- /dev/null +++ b/nixos/tests/vector.nix @@ -0,0 +1,37 @@ +{ system ? builtins.currentSystem, config ? { } +, pkgs ? import ../.. { inherit system config; } }: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +{ + test1 = makeTest { + name = "vector-test1"; + meta.maintainers = [ pkgs.stdenv.lib.maintainers.thoughtpolice ]; + + machine = { config, pkgs, ... }: { + services.vector = { + enable = true; + journaldAccess = true; + settings = { + sources.journald.type = "journald"; + + sinks = { + file = { + type = "file"; + inputs = [ "journald" ]; + path = "/var/lib/vector/logs.log"; + encoding = { codec = "ndjson"; }; + }; + }; + }; + }; + }; + + # ensure vector is forwarding the messages appropriately + testScript = '' + machine.wait_for_unit("vector.service") + machine.succeed("test -f /var/lib/vector/logs.log") + ''; + }; +} From 85767db6b8b30dd11191e287a6a2fe1e2275ede1 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Nov 2020 16:34:53 +0900 Subject: [PATCH 015/120] add happysalada as maintainer --- maintainers/maintainer-list.nix | 6 ++++++ nixos/tests/vector.nix | 2 +- pkgs/tools/misc/vector/default.nix | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c3970f3e02fb..3196af76dce1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3411,6 +3411,12 @@ fingerprint = "74B1 F67D 8E43 A94A 7554 0768 9CCC E364 02CB 49A6"; }]; }; + happysalada = { + email = "raphael@megzari.com"; + github = "happysalada"; + githubId = 5317234; + name = "Raphael Megzari"; + }; haslersn = { email = "haslersn@fius.informatik.uni-stuttgart.de"; github = "haslersn"; diff --git a/nixos/tests/vector.nix b/nixos/tests/vector.nix index 3da7d0f30edd..e96c3ad152f3 100644 --- a/nixos/tests/vector.nix +++ b/nixos/tests/vector.nix @@ -7,7 +7,7 @@ with pkgs.lib; { test1 = makeTest { name = "vector-test1"; - meta.maintainers = [ pkgs.stdenv.lib.maintainers.thoughtpolice ]; + meta.maintainers = [ pkgs.stdenv.lib.maintainers.happysalada ]; machine = { config, pkgs, ... }: { services.vector = { diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 701e86dbf901..a6b00a5a30d6 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -60,6 +60,6 @@ rustPlatform.buildRustPackage rec { description = "A high-performance logs, metrics, and events router"; homepage = "https://github.com/timberio/vector"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice happysalada ]; }; } From 12c3e0a4655418cf0cbd53fd0e00b9f9a664fd40 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Thu, 29 Oct 2020 17:05:57 +0000 Subject: [PATCH 016/120] nixos/services/hoogle use DynamicUser instead of nobody I've also removed PrivateTmp = true because this is implied by dynamic user. I've left ProtectHome = true because I believe this is stronger than ProtectHome = "read-only" which DynamicUser implies. --- nixos/modules/services/development/hoogle.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/development/hoogle.nix b/nixos/modules/services/development/hoogle.nix index 1a98f005602a..cbf13f027de2 100644 --- a/nixos/modules/services/development/hoogle.nix +++ b/nixos/modules/services/development/hoogle.nix @@ -61,10 +61,8 @@ in { Restart = "always"; ExecStart = ''${hoogleEnv}/bin/hoogle server --local --port ${toString cfg.port} --home ${cfg.home}''; - User = "nobody"; - Group = "nogroup"; + DynamicUser = true; - PrivateTmp = true; ProtectHome = true; RuntimeDirectory = "hoogle"; From cea2e29961750c4e8ac72efeef96b5ff64a9efcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 30 Nov 2020 18:46:58 +0100 Subject: [PATCH 017/120] llvmPackages_rocm: 3.9.0 -> 3.10.0 --- pkgs/development/compilers/llvm/rocm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index aae6f1682807..c67b011721a0 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - sha256 = "01ljx6mhix3z2pgddgn0ymhrsbigs1nqlz3kkwkr6p2igprrly9f"; + hash = "sha256-Lnma831RXJMnn3N8im3QLy6dYfXAvtbeFX/0CKvpkgY="; }; in rec { clang = wrapCCWith rec { From 5db8e6fc6f4e6019d1b9b7d78c0707cfaf77f253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 30 Nov 2020 19:23:01 +0100 Subject: [PATCH 018/120] rocm-device-libs: 3.9.0 -> 3.10.0 --- pkgs/development/libraries/rocm-device-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 4dd96c2c7d9b..54c7cb9a10b5 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - sha256 = "1nil0nhlkszslgvqhim5vmcp3flfafydviq0zk7db8i6z17kq090"; + hash = "sha256-IAE8T/gmotXO/ADH3bxTjrpxWd2lRoj3o/rrSaEFNNo="; }; nativeBuildInputs = [ cmake ]; From 9ef277209a5c7151da308244bbabc50b80864453 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 30 Nov 2020 15:38:28 -0500 Subject: [PATCH 019/120] texlive.bin.dvisvgm: texlive 2.8.1 -> upstream 2.11 --- pkgs/tools/typesetting/tex/texlive/bin.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 672d5af68c80..030ac1b43aae 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -4,7 +4,7 @@ , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext , perl, perlPackages, python2Packages, pkgconfig , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr -, cairo, pixman, xorg, clisp, biber, xxHash +, brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , makeWrapper, shortenPerlShebang }: @@ -245,20 +245,20 @@ chktex = stdenv.mkDerivation { }; -dvisvgm = stdenv.mkDerivation { +dvisvgm = stdenv.mkDerivation rec { pname = "texlive-dvisvgm.bin"; - inherit version; + version = "2.11"; + # TODO: dvisvgm was switched to build from upstream sources + # to address https://github.com/NixOS/nixpkgs/issues/104847 + # We might want to consider reverting that change in the future. - inherit (common) src; + src = fetchurl { + url = "https://github.com/mgieseki/dvisvgm/releases/download/${version}/dvisvgm-${version}.tar.gz"; + sha256 = "12b6h0h8rc487yjh3sq9zsdabm9cs2vqcrb0znnfi8277f87zf3j"; + }; nativeBuildInputs = [ pkgconfig ]; - # TODO: dvisvgm still uses vendored dependencies - buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype /*potrace xxHash*/ ]; - - preConfigure = "cd texk/dvisvgm"; - - configureFlags = common.configureFlags - ++ [ "--with-system-kpathsea" ]; + buildInputs = [ core/*kpathsea*/ brotli ghostscript zlib freetype woff2 potrace xxHash ]; enableParallelBuilding = true; }; From 8f2075d3fb05bb53d0b41276bcb7a38d995019bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Nov 2020 22:47:37 +0100 Subject: [PATCH 020/120] python3packages.bme680: Mark Linux only as upstream --- pkgs/development/python-modules/bme680/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/bme680/default.nix b/pkgs/development/python-modules/bme680/default.nix index 0fd28701816e..cdae502e7e59 100644 --- a/pkgs/development/python-modules/bme680/default.nix +++ b/pkgs/development/python-modules/bme680/default.nix @@ -32,6 +32,7 @@ buildPythonPackage rec { description = "Python library for driving the Pimoroni BME680 Breakout"; homepage = "https://github.com/pimoroni/bme680-python"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ mic92 ]; }; } From d4aa37b0f61ddfcb9971a7419cd77bf38ec058c7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 30 Nov 2020 15:09:54 -0800 Subject: [PATCH 021/120] zfs: 0.8.5 -> 2.0.0 --- pkgs/os-specific/linux/zfs/default.nix | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5406dcf77eba..60b6926ac67e 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -49,13 +49,11 @@ let patchShebangs scripts # The arrays must remain the same length, so we repeat a flag that is # already part of the command and therefore has no effect. - substituteInPlace ./module/${optionalString isUnstable "os/linux/"}zfs/zfs_ctldir.c \ + substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \ --replace '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \ --replace '"/usr/bin/env", "mount"' '"${util-linux}/bin/mount", "-n"' '' + optionalString buildUser '' - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${util-linux}/bin/umount" \ - --replace "/bin/mount" "${util-linux}/bin/mount" - substituteInPlace ./lib/libshare/${optionalString isUnstable "os/linux/"}nfs.c --replace "/usr/sbin/exportfs" "${ + substituteInPlace ./lib/libshare/os/linux/nfs.c --replace "/usr/sbin/exportfs" "${ # We don't *need* python support, but we set it like this to minimize closure size: # If it's disabled by default, no need to enable it, even if we have python enabled # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure @@ -65,7 +63,6 @@ let substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ --replace "/etc/default" "$out/etc/default" substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" - substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./contrib/initramfs/hooks/Makefile.am \ --replace "/usr/share/initramfs-tools/hooks" "$out/usr/share/initramfs-tools/hooks" @@ -82,15 +79,10 @@ let substituteInPlace ./etc/systemd/system/Makefile.am \ --replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)' - ${optionalString isUnstable '' substituteInPlace ./contrib/initramfs/conf.d/Makefile.am \ --replace "/usr/share/initramfs-tools/conf.d" "$out/usr/share/initramfs-tools/conf.d" substituteInPlace ./contrib/initramfs/conf-hooks.d/Makefile.am \ --replace "/usr/share/initramfs-tools/conf-hooks.d" "$out/usr/share/initramfs-tools/conf-hooks.d" - ''} - - substituteInPlace ./etc/systemd/system/zfs-share.service.in \ - --replace "/bin/rm " "${coreutils}/bin/rm " substituteInPlace ./cmd/vdev_id/vdev_id \ --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ @@ -193,9 +185,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "0.8.5"; + version = "2.0.0"; - sha256 = "0vhd3zs2i83pd59nk0llml4vyk4fc178j6nhg00p6k3f6r0l655b"; + sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r"; }; zfsUnstable = common { @@ -203,9 +195,8 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.0-rc6"; + version = "2.0.0"; - sha256 = "0p027x9hsawniwa9h3yayfbcx010anwcfy45rqgkg2r91zr2nfvw"; - isUnstable = true; + sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r"; }; } From b64692dcc667ce94a0078380db1f79e0d86b32ba Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 30 Nov 2020 16:21:07 -0800 Subject: [PATCH 022/120] libcork: init at 1.0.0--rc3 --- .../development/libraries/libcork/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/libraries/libcork/default.nix diff --git a/pkgs/development/libraries/libcork/default.nix b/pkgs/development/libraries/libcork/default.nix new file mode 100644 index 000000000000..3875ff91185a --- /dev/null +++ b/pkgs/development/libraries/libcork/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, cmake +, lib +, pkg-config +, check +}: +stdenv.mkDerivation rec { + pname = "libcork"; + version = "1.0.0--rc3"; + + src = fetchFromGitHub { + owner = "dcreager"; + repo = pname; + rev = version; + sha256 = "152gqnmr6wfmflf5l6447am4clmg3p69pvy3iw7yhaawjqa797sk"; + }; + + # N.B. We need to create this file, otherwise it tries to use git to + # determine the package version, which we do not want. + # + # N.B. We disable tests by force, since their build is broken. + postPatch = '' + echo "${version}" > .version-stamp + echo "${version}" > .commit-stamp + sed -i '/add_subdirectory(tests)/d' ./CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ check ]; + + doCheck = false; + + postInstall = '' + ln -s $out/lib/libcork.so $out/lib/libcork.so.1 + ''; + + meta = with lib; { + homepage = "https://github.com/dcreager/libcork"; + description = "A simple, easily embeddable cross-platform C library"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c7d2fbb6241..8fcce1abc317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5360,6 +5360,8 @@ in libck = callPackage ../development/libraries/libck { }; + libcork = callPackage ../development/libraries/libcork { }; + libconfig = callPackage ../development/libraries/libconfig { }; libcmis = callPackage ../development/libraries/libcmis { }; From 0be36aa2b23e1b1c787d8d1f1a2a1495851529cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 01:34:20 +0000 Subject: [PATCH 023/120] mergerfs: 2.31.0 -> 2.32.0 --- pkgs/tools/filesystems/mergerfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index ba7d5456d863..60670708f4bc 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.31.0"; + version = "2.32.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "0j7nbxzv85as76glzk4cf7j6ggfihcjaihp06s0zcar4i7zaiy9z"; + sha256 = "1qmhwkl2ws0hwd7s1mzrdiw4h7jpilzcr0w8dgx465mdzb5d2jad"; }; nativeBuildInputs = [ From d7de691b1ba369e12936d7250d4269f2cb8c7a05 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 14 Oct 2020 10:24:55 -0400 Subject: [PATCH 024/120] spdlog: run tests Build & run tests built into spdlog. --- pkgs/development/libraries/spdlog/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 9787c7e92da8..0638ec47c551 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -15,7 +15,11 @@ let nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" ]; + cmakeFlags = [ + "-DSPDLOG_BUILD_EXAMPLE=OFF" + "-DSPDLOG_BUILD_BENCH=OFF" + "-DSPDLOG_BUILD_TESTS=ON" + ]; outputs = [ "out" "doc" ]; @@ -24,6 +28,8 @@ let cp -rv ../example $out/share/doc/spdlog ''; + doCheck = true; + meta = with stdenv.lib; { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; From c19f3623a2453a8a7c810a875e09dea08ef42f97 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 14 Oct 2020 15:32:17 -0400 Subject: [PATCH 025/120] spdlog: build shared library --- pkgs/development/libraries/spdlog/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 0638ec47c551..2022ec7caaa5 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -16,6 +16,7 @@ let nativeBuildInputs = [ cmake ]; cmakeFlags = [ + "-DSPDLOG_BUILD_SHARED=ON" "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" "-DSPDLOG_BUILD_TESTS=ON" @@ -29,6 +30,7 @@ let ''; doCheck = true; + preCheck = "export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH"; meta = with stdenv.lib; { description = "Very fast, header only, C++ logging library"; From fe35c3067839333cb80841aef24b898314b0a68d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 02:23:52 +0000 Subject: [PATCH 026/120] minio-client: 2020-11-17T00-39-14Z -> 2020-11-25T23-04-07Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 2c626e81cd21..e452719a494a 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-11-17T00-39-14Z"; + version = "2020-11-25T23-04-07Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "122fb9ghxwjifhvwiw07pm3szqfj3pc55m4bhq3v8nshzwrbcjf4"; + sha256 = "0r4za7jnwmh2wna5l4iv5pz6s5c62f7v4hmbv7misff9qbk4p4k7"; }; - vendorSha256 = "148fb86v059skcf8dgcrqibwkl1h4lbwi60qnwmdi03q6rvaw33m"; + vendorSha256 = "0zracgqwhqs3gabrqqm8fm3hyicaadcinsjp5qgprjwd9a3c1zfv"; doCheck = false; From 1034616282ffd5bfc949082c6b2af20a233483ec Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Tue, 1 Dec 2020 05:06:20 +0100 Subject: [PATCH 027/120] tinyobjloader: init at 1.0.6 --- .../libraries/tinyobjloader/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/tinyobjloader/default.nix diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix new file mode 100644 index 000000000000..92eb5b3d8f4b --- /dev/null +++ b/pkgs/development/libraries/tinyobjloader/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tinyobjloader"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "tinyobjloader"; + repo = "tinyobjloader"; + rev = "v${version}"; + sha256 = "162168995f4xch7hm3iy6m57r8iqkpzi5x9qh1gsghlxwdxxqbis"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/tinyobjloader/tinyobjloader"; + description = "Tiny but powerful single file wavefront obj loader"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c7d2fbb6241..cca71399d4fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7671,6 +7671,8 @@ in tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {}; + tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; + tinyprog = callPackage ../development/tools/misc/tinyprog { }; tinyproxy = callPackage ../tools/networking/tinyproxy {}; From a929ebf69c8d04ce8e05e32b207962b59da39da5 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sat, 28 Nov 2020 17:41:34 +0100 Subject: [PATCH 028/120] ceph: 15.2.5 -> 15.2.6 --- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 80a3a2a94482..47eac80fc067 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -122,10 +122,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.5"; + version = "15.2.6"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "05p7ssbfypf5x8bry361rrnyaihf89xzbqzhygdyrg7w1rxpna8d"; + sha256 = "093pphgqrkrbv3484ayl0vac6a6s53zxa01yad0cbvnx0kyj55hh"; }; in rec { ceph = stdenv.mkDerivation { From 63eb840e327dc0a2acad51429892fb6b19431b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 1 Dec 2020 07:39:37 +0100 Subject: [PATCH 029/120] rocm-thunk: 3.9.0 -> 3.10.0 --- pkgs/development/libraries/rocm-thunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 63e66f35f810..bf0a05fe73e8 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - sha256 = "0xkp50ik7miz9whywnmiiqiamc7g8flfr9g8c02kxr0cay1in6cj"; + hash = "sha256-FLH+GHXA0zepbR1wPPSez/hx1hiG2kkCTneDKhJJRjU="; }; preConfigure = '' From 9c900a322a347ab1fde3e7dc317b8994fb08f6ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 1 Dec 2020 07:37:16 +0100 Subject: [PATCH 030/120] rocm-runtime: 3.9.0 -> 3.10.0 --- pkgs/development/libraries/rocm-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index d3e113b8ded5..4df954f4b258 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - sha256 = "034qbqznfligg4lwd95zmqa7lwcda720zbfv066nqvarlcml0kr6"; + hash = "sha256-8hNb0Yo9ApedOG7xrUr5rwiA/YsqDTcyr6dBRg8lXro="; }; sourceRoot = "source/src"; From b4f767c538bb6b2706c2ba56a62411e48647c92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 30 Nov 2020 19:23:23 +0100 Subject: [PATCH 031/120] rocm-comgr: 3.9.0 -> 3.10.0 --- pkgs/development/libraries/rocm-comgr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 7a122fae39e3..e6546e0d3361 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - sha256 = "1lwgr6x2b6jisc2nxvr9m24zrc7f2vcgrbkj9sf2blpha61xgk14"; + hash = "sha256-JMzXg1Hw0iWcTnKu/NgW7rD8iagp724F01GaJbrJj9M="; }; sourceRoot = "source/lib/comgr"; From 71c017b816dd555a015bf6ed97085631cb86cdf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 1 Dec 2020 07:41:09 +0100 Subject: [PATCH 032/120] rocm-cmake: 3.9.0 -> 3.10.0 --- pkgs/development/tools/build-managers/rocm-cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 77a424ae1688..8f01b9aca318 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - sha256 = "13j7gmcy1j6qsydgccmgiacg6sj38l5mlwn4ck8qizl0cpc14gfm"; + hash = "sha256-1T0S2GWA/ojRZMRyWgtFQ2rzmIqvMvaa19jI4Fl9R44="; }; nativeBuildInputs = [ cmake ]; From 7f2736dc0f62c22a2f56fceaf9a9731bb2b295d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 30 Nov 2020 14:13:02 +0100 Subject: [PATCH 033/120] rocclr: 3.9.0 -> 3.10.0 --- pkgs/development/libraries/rocclr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 9b7d80a2240e..55b2f0ff1868 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - sha256 = "193pd6lbnfjrmqsrlvkpadxxi908a9r0c41y8x1bkbbaviad39q0"; + hash = "sha256-P36JKFgXSZagWzHB6WB2WlDu7jkVvfYVo1BaV0b8iEk="; }; nativeBuildInputs = [ cmake rocm-cmake ]; From c2a8d856d7f5bebb7afa2cac05e3a059972184ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 30 Nov 2020 14:16:10 +0100 Subject: [PATCH 034/120] rocm-opencl-runtime: 3.9.0 -> 3.10.0 --- pkgs/development/libraries/rocm-opencl-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 69ca18318ac3..4681267da18a 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - sha256 = "1qsgswm1wl2wknhgy6c9l6dnj0z1kwddimdzjmvjcpyxq987y2gv"; + hash = "sha256-kW5jTDlQtXQ0i4ADJEnmESxjcLCt4QZCYJ1ouIsk4YE="; }; nativeBuildInputs = [ cmake rocm-cmake ]; From 5acfa2f9c84c1d6771c158ade26872bd8ff5c1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 1 Dec 2020 07:43:31 +0100 Subject: [PATCH 035/120] rocm-smi: 3.9.0 -> 3.10.0 --- pkgs/tools/system/rocm-smi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 1ef25fd08237..1ed1d9135165 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "rocm-smi"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROC-smi"; rev = "rocm-${version}"; - sha256 = "190x31s7mjpyp7hr6cgdnvn2s20qj3sqcxywycjm2i9ar429l2ni"; + hash = "sha256-0QqaBMkqRVEl89x3hvWQGAgt7LbtMZPhuf7KenQYHaQ="; }; format = "other"; From ae9e8efa40abfbf42346524bba0c39b35740521b Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 1 Dec 2020 07:45:00 +0100 Subject: [PATCH 036/120] ceph: Drop obsolete patch --- pkgs/tools/filesystems/ceph/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 47eac80fc067..b75a902681e5 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -135,11 +135,6 @@ in rec { patches = [ ./0000-fix-SPDK-build-env.patch ./ceph-glibc-2-32-sigdescr_np.patch - (fetchpatch { - name = "CVE-2020-25660"; - url = "https://github.com/ceph/ceph/compare/2c93eff00150f0cc5f106a559557a58d3d7b6f1f...6c14c2fb5650426285428dfe6ca1597e5ea1d07d.patch"; - sha256 = "032hl15q34gq7y6bnljmklpsbd3bpkzmg7r3w0x0ly786iz7zwhm"; - }) ]; nativeBuildInputs = [ From ea6976156af61078e1862d0311ffdc9845d50578 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Wed, 13 May 2020 18:13:53 +0800 Subject: [PATCH 037/120] maintainers: Add pengmeiyu --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1967e7bee86f..8f01887a9a24 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6759,6 +6759,12 @@ githubId = 8641; name = "Pierre Carrier"; }; + pengmeiyu = { + email = "pengmyu@gmail.com"; + github = "pmeiyu"; + githubId = 8529551; + name = "Peng Mei Yu"; + }; penguwin = { email = "penguwin@penguwin.eu"; github = "penguwin"; From 6b7a85e0aa7325e86eaa788fc075571b88ab6b4f Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Tue, 1 Dec 2020 10:13:21 +0100 Subject: [PATCH 038/120] arduino-mk: wrap python scripts --- pkgs/development/arduino/arduino-mk/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix index ff7b7274ca97..cd3dd32f3806 100644 --- a/pkgs/development/arduino/arduino-mk/default.nix +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, python3Packages, installShellFiles }: stdenv.mkDerivation rec { version = "1.6.0"; @@ -11,8 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0flpl97d2231gp51n3y4qvf3y1l8xzafi1sgpwc305vwc2h4dl2x"; }; - phases = ["installPhase"]; - installPhase = "ln -s $src $out"; + nativeBuildInputs = [ python3Packages.wrapPython installShellFiles ]; + propagatedBuildInputs = with python3Packages; [ pyserial ]; + installPhase = '' + mkdir $out + cp -rT $src $out + installManPage *.1 + ''; + postFixupPhase = '' + wrapPythonPrograms + ''; meta = { description = "Makefile for Arduino sketches"; From a23830fb970fad0f1c19f5225fe8f8450e4ca410 Mon Sep 17 00:00:00 2001 From: Peng Mei Yu Date: Wed, 13 May 2020 18:20:46 +0800 Subject: [PATCH 039/120] ibus-engines.rime: init at 1.4.0 --- .../ibus-engines/ibus-rime/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix new file mode 100644 index 000000000000..03a801abbeb0 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify +, librime, brise }: + +stdenv.mkDerivation rec { + pname = "ibus-rime"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "rime"; + repo = "ibus-rime"; + rev = version; + sha256 = "0zbajz7i18vrqwdyclzywvsjg6qzaih64jhi3pkxp7mbw8jc5vhy"; + }; + + buildInputs = [ gdk-pixbuf glib ibus libnotify librime brise ]; + nativeBuildInputs = [ cmake pkg-config ]; + + makeFlags = [ "PREFIX=$(out)" ]; + dontUseCmakeConfigure = true; + + prePatch = '' + substituteInPlace Makefile \ + --replace 'cmake' 'cmake -DRIME_DATA_DIR=${brise}/share/rime-data' + + substituteInPlace rime_config.h \ + --replace '/usr' $out + + substituteInPlace rime_config.h \ + --replace 'IBUS_RIME_SHARED_DATA_DIR IBUS_RIME_INSTALL_PREFIX' \ + 'IBUS_RIME_SHARED_DATA_DIR "${brise}"' + + substituteInPlace rime.xml \ + --replace '/usr' $out + ''; + + meta = with stdenv.lib; { + isIbusEngine = true; + description = "Rime input method engine for IBus"; + homepage = "https://rime.im/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ pengmeiyu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c7d2fbb6241..a62078421aaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3035,6 +3035,8 @@ in protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; + rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; + table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese { From 8c49bed73dc95ce8dd7a9db418b1c4152df6e66a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 30 Nov 2020 16:24:48 -0800 Subject: [PATCH 040/120] ideamaker: init at 4.0.1 --- pkgs/applications/misc/ideamaker/default.nix | 77 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/applications/misc/ideamaker/default.nix diff --git a/pkgs/applications/misc/ideamaker/default.nix b/pkgs/applications/misc/ideamaker/default.nix new file mode 100644 index 000000000000..7b2eeec292bf --- /dev/null +++ b/pkgs/applications/misc/ideamaker/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, autoPatchelfHook +, curl +, dpkg +, fetchurl +, gcc +, lib +, libGLU +, libcork +, makeDesktopItem +, qt5 +, quazip_qt4 +, zlib +}: +stdenv.mkDerivation rec { + pname = "ideamaker"; + version = "4.0.1"; + + src = fetchurl { + # N.B. Unfortunately ideamaker adds a number after the patch number in + # their release scheme which is not referenced anywhere other than in + # the download URL. Because of this, I have chosen to not use ${version} + # and just handwrite the correct values in the following URL, hopefully + # avoiding surprises for the next person that comes to update this + # package. + url = "https://download.raise3d.com/ideamaker/release/4.0.1/ideaMaker_4.0.1.4802-ubuntu_amd64.deb"; + sha256 = "0a1jcakdglcr4kz0kyq692dbjk6aq2yqcp3i6gzni91k791h49hp"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg qt5.wrapQtAppsHook ]; + buildInputs = [ + curl + gcc.cc.lib + libGLU + libcork + qt5.qtbase + qt5.qtserialport + quazip_qt4 + zlib + ]; + + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src . + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/pixmaps} + + cp usr/lib/x86_64-linux-gnu/ideamaker/ideamaker $out/bin + ln -s "${desktopItem}/share/applications" $out/share/ + cp usr/share/ideamaker/icons/ideamaker-icon.png $out/share/pixmaps/${pname}.png + + runHook postInstall + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Ideamaker"; + genericName = meta.description; + categories = "Utility;Viewer;Engineering;"; + mimeType = "application/sla"; + }; + + meta = with lib; { + homepage = "https://www.raise3d.com/ideamaker/"; + description = "Raise3D's 3D slicer software"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fcce1abc317..4b8e5491ed87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21839,6 +21839,8 @@ in id3v2 = callPackage ../applications/audio/id3v2 { }; + ideamaker = callPackage ../applications/misc/ideamaker { }; + ifenslave = callPackage ../os-specific/linux/ifenslave { }; ii = callPackage ../applications/networking/irc/ii { From 6f65e5c1ca92704b2ec4dcb39007af27fafc95b0 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Tue, 1 Dec 2020 05:43:25 +0100 Subject: [PATCH 041/120] pythonPackages.tinyobjloader-py: init at 1.0.6 --- .../tinyobjloader-py/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/tinyobjloader-py/default.nix diff --git a/pkgs/development/python-modules/tinyobjloader-py/default.nix b/pkgs/development/python-modules/tinyobjloader-py/default.nix new file mode 100644 index 000000000000..3c36dded5ee7 --- /dev/null +++ b/pkgs/development/python-modules/tinyobjloader-py/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, pybind11, tinyobjloader }: + +buildPythonPackage rec { + pname = "tinyobjloader-py"; + inherit (tinyobjloader) version src; + + # Build needs headers from ${src}, setting sourceRoot or fetching from pypi won't work. + preConfigure = '' + cd python + ''; + + buildInputs = [ pybind11 ]; + + # No tests are included upstream + doCheck = false; + pythonImportsCheck = [ "tinyobjloader" ]; + + meta = with lib; tinyobjloader.meta // { + description = "Python wrapper for the C++ wavefront .obj loader tinyobjloader"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c09db1550038..29f7531026c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7276,6 +7276,8 @@ in { tinydb = callPackage ../development/python-modules/tinydb { }; + tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; + tiros = callPackage ../development/python-modules/tiros { }; tissue = callPackage ../development/python-modules/tissue { }; From a10370cc9f8c0b8fad9abab2d4230fa367606104 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 30 Nov 2020 19:55:39 +0100 Subject: [PATCH 042/120] poetry2nix: 1.13.0 -> 1.14.0 --- .../poetry2nix/poetry2nix/bin/poetry2nix | 166 ++++++++++++------ .../tools/poetry2nix/poetry2nix/default.nix | 2 +- .../poetry2nix/poetry2nix/hooks/default.nix | 6 +- .../poetry2nix/poetry2nix/mk-poetry-dep.nix | 27 ++- .../tools/poetry2nix/poetry2nix/overrides.nix | 134 +++++++++++++- .../tools/poetry2nix/poetry2nix/pep425.nix | 2 +- .../poetry2nix/pkgs/poetry/default.nix | 4 +- .../poetry2nix/pkgs/poetry/pyproject.toml | 2 +- .../poetry2nix/pkgs/poetry/src.json | 4 +- .../tools/poetry2nix/poetry2nix/plugins.nix | 1 + 10 files changed, 269 insertions(+), 79 deletions(-) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix index 355cebfd50c4..559025f3ec45 100755 --- a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix @@ -7,60 +7,127 @@ import toml import json import sys - -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", -) -parser_lock.add_argument( - "--out", default="poetry-git-overlay.nix", help="Output file", -) +from typing import Dict, Any, Tuple, List -def fetch_git(pkg): - return ( - pkg["name"], - subprocess.run( - [ - "nix-prefetch-git", - "--fetch-submodules", - "--url", - pkg["source"]["url"], - "--rev", - pkg["source"]["reference"], - ], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - ), +class Package: + def __init__(self, attrs: Dict[str, Any]) -> None: + self.attrs = attrs + self.name = attrs["name"] + self.source = self.attrs["source"] + + def fetch(self) -> Tuple["Package", subprocess.CompletedProcess]: + raise NotImplementedError() + + def expression(self, output: str) -> str: + raise NotImplementedError() + + +class UrlPackage(Package): + def fetch(self) -> Tuple[Package, subprocess.CompletedProcess]: + return ( + self, + subprocess.run( + [ + "nix-prefetch-url", + "--unpack", + self.source["url"], + ], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True + ), + ) + + def expression(self, output: str) -> str: + sha256 = output.rstrip() + return textwrap.dedent(""" + %s = super.%s.overridePythonAttrs ( + _: { + src = pkgs.fetchzip { + url = "%s"; + sha256 = "%s"; + }; + } + );""" % (self.name, self.name, self.source["url"], sha256)) + + +class GitPackage(Package): + def fetch(self) -> Tuple[Package, subprocess.CompletedProcess]: + reference = self.source.get("resolved_reference", self.source["reference"]) + + return ( + self, + subprocess.run( + [ + "nix-prefetch-git", + "--fetch-submodules", + "--url", + self.source["url"], + "--rev", + reference, + ], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True + ), + ) + + def expression(self, output: str) -> str: + meta = json.loads(output) + return textwrap.dedent(""" + %s = super.%s.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "%s"; + rev = "%s"; + sha256 = "%s"; + }; + } + );""" % (self.name, self.name, meta["url"], meta["rev"], meta["sha256"])) + + +def parse_args() -> argparse.Namespace: + 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", ) + parser_lock.add_argument( + "--out", default="poetry-git-overlay.nix", help="Output file", + ) + return argparser.parse_args() -def indent(expr, spaces=2): +def indent(expr: str, spaces: int = 2) -> str: i = " " * spaces return "\n".join([(i if l != "" else "") + l for l in expr.split("\n")]) -if __name__ == "__main__": - args = argparser.parse_args() +def main() -> None: + args = parse_args() with open(args.lock) as lockf: lock = toml.load(lockf) - pkgs = [] + pkgs: List[Package] = [] for pkg in lock["package"]: if "source" in pkg: - pkgs.append(pkg) + source_type = pkg["source"]["type"] + if source_type == "git": + pkgs.append(GitPackage(pkg)) + elif source_type == "url": + pkgs.append(UrlPackage(pkg)) with ThreadPoolExecutor() as e: futures = [] for pkg in pkgs: - futures.append(e.submit(fetch_git, pkg)) + futures.append(e.submit(pkg.fetch)) lines = [ "{ pkgs }:", @@ -68,30 +135,13 @@ if __name__ == "__main__": ] for f in futures: - drv_name, p = f.result() + package, p = f.result() if p.returncode != 0: - sys.stderr.buffer.write(p.stderr) - sys.stderr.buffer.flush() + sys.stderr.write(p.stderr) + sys.stderr.flush() exit(p.returncode) - - meta = json.loads(p.stdout.decode()) - lines.append( - indent( - textwrap.dedent( - """ - %s = super.%s.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "%s"; - rev = "%s"; - sha256 = "%s"; - }; - } - );""" - % (drv_name, drv_name, meta["url"], meta["rev"], meta["sha256"]) - ) - ) - ) + expr = package.expression(p.stdout) + lines.append(indent(expr)) lines.extend(["", "}", ""]) @@ -101,3 +151,7 @@ if __name__ == "__main__": fout.write(expr) print(f"Wrote {args.out}") + + +if __name__ == "__main__": + main() diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index e47dbc99f2a7..b0e65ed85a08 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -71,7 +71,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.13.0"; + version = "1.14.0"; /* Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index 6d60df284739..a66989f70e56 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -1,11 +1,11 @@ { python -, callPackage +, buildPackages , makeSetupHook -, yj , wheel , pip }: let + callPackage = python.pythonForBuild.pkgs.callPackage; pythonInterpreter = python.pythonForBuild.interpreter; pythonSitePackages = python.sitePackages; in @@ -20,7 +20,7 @@ in deps = [ ]; substitutions = { inherit pythonInterpreter; - yj = "${yj}/bin/yj"; + yj = "${buildPackages.yj}/bin/yj"; pyprojectPatchScript = "${./pyproject-without-path.py}"; }; } ./remove-path-dependencies.sh diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 9619e3649379..c01f99c01d44 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -27,6 +27,7 @@ pythonPackages.callPackage , ... }@args: let + inherit (pkgs) stdenv; inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName; inherit (import ./pep425.nix { @@ -45,6 +46,7 @@ pythonPackages.callPackage toPath = s: pwd + "/${s}"; isSource = source != null; isGit = isSource && source.type == "git"; + isUrl = isSource && source.type == "url"; isLocal = isSource && source.type == "directory"; localDepPath = toPath source.url; @@ -91,7 +93,7 @@ pythonPackages.callPackage "toml" # Toml is an extra for setuptools-scm ]; baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; - format = if isLocal then "pyproject" else if isGit then "pyproject" else fileInfo.format; + format = if isLocal || isGit || isUrl then "pyproject" else fileInfo.format; in buildPythonPackage { pname = moduleName name; @@ -113,9 +115,10 @@ pythonPackages.callPackage buildInputs = ( baseBuildInputs + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) pythonPackages.setuptools ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg ++ lib.optional isLocal buildSystemPkgs - ++ lib.optional (!__isBootstrap) [ pythonPackages.poetry ] + ++ lib.optional (!__isBootstrap) pythonPackages.poetry ); propagatedBuildInputs = @@ -157,14 +160,22 @@ pythonPackages.callPackage ( builtins.fetchGit { inherit (source) url; - rev = source.reference; + rev = source.resolved_reference or 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; - inherit (fileInfo) file hash kind; - }; + ) + else if isUrl then + builtins.fetchTarball + { + inherit (source) url; + } + else if isLocal then + (poetryLib.cleanPythonSources { src = localDepPath; }) + else + fetchFromPypi { + pname = name; + inherit (fileInfo) file hash kind; + }; } ) { } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index ca6c0c7cc49b..16d66c48af8b 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -93,7 +93,7 @@ self: super: ( super.cffi.overridePythonAttrs ( old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + buildInputs = old.buildInputs or [ ] ++ [ pkgs.libffi ]; } ) ); @@ -106,6 +106,12 @@ self: super: } ); + colour = super.colour.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.d2to1 ]; + } + ); + configparser = super.configparser.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -120,6 +126,8 @@ self: super: cryptography = super.cryptography.overridePythonAttrs ( old: { + nativeBuildInputs = old.nativeBuildInputs or [ ] + ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } ); @@ -324,6 +332,17 @@ self: super: } ); + jira = super.jira.overridePythonAttrs ( + old: { + inherit (pkgs.python3Packages.jira) patches; + buildInputs = old.buildInputs ++ [ + self.pytestrunner + self.cryptography + self.pyjwt + ]; + } + ); + jsonpickle = super.jsonpickle.overridePythonAttrs ( old: { dontPreferSetupPy = true; @@ -499,6 +518,31 @@ self: super: buildInputs = oa.buildInputs ++ [ self.pbr ]; }); + mpi4py = super.mpi4py.overridePythonAttrs ( + old: + let + cfg = pkgs.writeTextFile { + name = "mpi.cfg"; + text = ( + lib.generators.toINI + { } + { + mpi = { + mpicc = "${pkgs.openmpi.outPath}/bin/mpicc"; + }; + } + ); + }; + in + { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + enableParallelBuilding = true; + preBuild = '' + ln -sf ${cfg} mpi.cfg + ''; + } + ); + multiaddr = super.multiaddr.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; @@ -584,8 +628,8 @@ self: super: withMysql = old.passthru.withMysql or false; in { - buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs + buildInputs = old.buildInputs or [ ] ++ [ pkgs.sqlite ]; + propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; } @@ -602,8 +646,8 @@ self: super: # "Vendor" dependencies (for build-system support) postPatch = '' echo "import sys" >> poetry/__init__.py - for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do - echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py + for path in $propagatedBuildInputs; do + echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py done ''; @@ -796,6 +840,14 @@ self: super: } ); + python-bugzilla = super.python-bugzilla.overridePythonAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.docutils + ]; + } + ); + python-ldap = super.python-ldap.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.openldap pkgs.cyrus_sasl ]; @@ -924,6 +976,15 @@ self: super: } ); + pytest-django = super.pytest-django.overridePythonAttrs ( + old: { + postPatch = '' + substituteInPlace setup.py --replace "'pytest>=3.6'," "" + substituteInPlace setup.py --replace "'pytest>=3.6'" "" + ''; + } + ); + pytest-runner = super.pytest-runner or super.pytestrunner; python-jose = super.python-jose.overridePythonAttrs ( @@ -1090,6 +1151,43 @@ self: super: } ); + torch = lib.makeOverridable + ({ enableCuda ? false + , cudatoolkit ? pkgs.cudatoolkit_10_1 + , pkg ? super.torch + }: pkg.overrideAttrs (old: + { + preConfigure = + if (!enableCuda) then '' + export USE_CUDA=0 + '' else '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cudatoolkit}/targets/x86_64-linux/lib" + ''; + preFixup = lib.optionalString (!enableCuda) '' + # For some reason pytorch retains a reference to libcuda even if it + # is explicitly disabled with USE_CUDA=0. + find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \; + ''; + buildInputs = old.buildInputs ++ lib.optionals enableCuda [ + pkgs.linuxPackages.nvidia_x11 + pkgs.nccl.dev + pkgs.nccl.out + ]; + propagatedBuildInputs = [ + super.numpy + super.future + ]; + }) + ) + { }; + + typeguard = super.typeguard.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py \ + --replace 'setup()' 'setup(version="${old.version}")' + ''; + }); + # nix uses a dash, poetry uses an underscore typing_extensions = super.typing_extensions or self.typing-extensions; @@ -1193,4 +1291,30 @@ self: super: } ); + credis = super.credis.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.cython ]; + } + ); + + hashids = super.hashids.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.flit-core ]; + } + ); + + supervisor = super.supervisor.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.meld3 + self.setuptools + ]; + } + ); + + cytoolz = super.cytoolz.overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.toolz ]; + } + ); } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index d32e3aacce6c..e333bd497184 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -87,7 +87,7 @@ let filtered = builtins.filter filterWheel filesWithoutSources; choose = files: let - osxMatches = [ "10_12" "10_11" "10_10" "10_9" "any" ]; + osxMatches = [ "10_12" "10_11" "10_10" "10_9" "10_8" "10_7" "any" ]; linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "any" ]; chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x); chooseOSX = x: lib.take 1 (findBestMatches osxMatches x); diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index f93eb119b20f..70470ba17222 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -15,8 +15,8 @@ poetry2nix.mkPoetryApplication { # "Vendor" dependencies (for build-system support) postPatch = '' echo "import sys" >> poetry/__init__.py - for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do - echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py + for path in $propagatedBuildInputs; do + echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py done ''; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index f099a4cac805..0868175ea45d 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.1.0" +version = "1.1.4" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace " diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index 51894768c1d9..4a1e8890c28c 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,7 +1,7 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "539d7f732c34c821258a9853cd3078cbda34a717", - "sha256": "0kl23dkq9n112z1pqjg6f1wv3qk77ij6q5glg15lwrj7yrl9k65c", + "rev": "8312e3f2dbfa126cd311c666fea30656941e1bd3", + "sha256": "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs", "fetchSubmodules": true } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix b/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix index e7125c2ff57c..b5e807c6e2d9 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix @@ -23,6 +23,7 @@ let dontConfigure = true; dontBuild = true; + dontUsePythonRecompileBytecode = true; passthru = { inherit (drv.passthru) withPlugins; From 7b3f9e9b756533167537fc8c454dc3d41cb51079 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 1 Dec 2020 14:24:01 +0100 Subject: [PATCH 043/120] pinnwand: Use poetry from pythonPackages Ideally this software should be repackaged using Poetry2nix rather that using pythonPackages. As it is now things are packaged incorrectly. cc @mweinelt --- pkgs/servers/pinnwand/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 16fa6a7196ab..fd02fc770813 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub, poetry, nixosTests }: +{ lib, python3, fetchFromGitHub, nixosTests }: let python = python3.override { From 9816bbbaa5902c8796e0befd72b2a0f6a6965c11 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Tue, 1 Dec 2020 14:19:28 +0100 Subject: [PATCH 044/120] nixos/rspamd: add release notes --- nixos/doc/manual/release-notes/rl-2103.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index ca24954db0c3..96061e9ca597 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -244,6 +244,14 @@ + + + The rspamd services is now sandboxed. It is run as + a dynamic user instead of root, so secrets and other files may have to + be moved or their permissions may have to be fixed. The sockets are now + located in /run/rspamd instead of /run. + + From b8ad6efc1917e51bc5e1ff9b53f950936198e922 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Tue, 1 Dec 2020 18:53:42 +0500 Subject: [PATCH 045/120] maintainers: add nasirhm Signed-off-by: nasirhm --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1967e7bee86f..3ae240a7a108 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6213,6 +6213,16 @@ githubId = 1916245; name = "Fernando Jose Pando"; }; + nasirhm = { + email = "nasirhussainm14@gmail.com"; + github = "nasirhm"; + githubId = 35005234; + name = "Nasir Hussain"; + keys = [{ + longkeyid = "rsa4096/0xD8126E559CE7C35D"; + fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; + }]; + }; Nate-Devv = { email = "natedevv@gmail.com"; name = "Nathan Moore"; From 63441979dcfb32dc2f03ebb9b592600312667168 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Tue, 1 Dec 2020 19:22:52 +0500 Subject: [PATCH 046/120] brave-browser: add maintainer nasirhm Signed-off-by: nasirhm --- pkgs/applications/networking/browsers/brave/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 4987988eb3e5..d76dd8b9daa7 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { contribute to your favorite creators automatically. ''; license = licenses.mpl20; - maintainers = with maintainers; [ uskudnik rht jefflabonte ]; + maintainers = with maintainers; [ uskudnik rht jefflabonte nasirhm ]; platforms = [ "x86_64-linux" ]; }; } From 6dac8e68173e2964ce2f7c757189a2f9e930057c Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Wed, 25 Nov 2020 22:02:26 -0800 Subject: [PATCH 047/120] Add `buildDhall*Package` support for generating documentation The `buildDhall{Directory,GitHub}Package` utilities now take an optional `document` argument for generating documentation using `dhall-docs`. The documentation is stored underneath the `./docs` subdirectory of the build product. --- .../dhall/build-dhall-directory-package.nix | 13 +++-- .../dhall/build-dhall-github-package.nix | 47 ++++++++++--------- .../dhall/build-dhall-package.nix | 18 ++++++- pkgs/top-level/all-packages.nix | 8 ++-- 4 files changed, 57 insertions(+), 29 deletions(-) diff --git a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix index 0c182b25d573..7fe1b46e3a55 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix @@ -14,12 +14,17 @@ lib.makePackageOverridable , src , # The file to import, relative to the root directory file ? "package.dhall" + # Set to `true` to generate documentation for the package + , document ? false }: - buildDhallPackage { - inherit name dependencies source; + buildDhallPackage + ( { inherit name dependencies source; - code = "${src}/${file}"; - } + code = "${src}/${file}"; + + } + // lib.optionalAttrs document { documentationRoot = src; } + ) ) diff --git a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix index bdb958fb8bd7..0978e47754b9 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix @@ -12,6 +12,8 @@ lib.makePackageOverridable directory ? "" , # The file to import, relative to the above directory file ? "package.dhall" + # Set to `true` to generate documentation for the package + , document ? false # Arguments passed through to `fetchFromGitHub` , owner @@ -22,29 +24,32 @@ lib.makePackageOverridable , ... }@args: - buildDhallPackage { - inherit name dependencies source; + let + src = fetchFromGitHub ({ + name = "${name}-source"; - code = - let - src = fetchFromGitHub ({ - name = "${name}-source"; + inherit owner repo rev; + } // removeAttrs args [ + "name" + "dependencies" + "document" + "source" + "directory" + "file" + "owner" + "repo" + "rev" + ]); - inherit owner repo rev; - } // removeAttrs args [ - "name" - "dependencies" - "source" - "directory" - "file" - "owner" - "repo" - "rev" - ]); + prefix = lib.optionalString (directory != "") "${directory}/"; - prefix = lib.optionalString (directory != "") "${directory}/"; + in + buildDhallPackage + ( { inherit name dependencies source; - in - "${src}/${prefix}${file}"; - } + code = "${src}/${prefix}${file}"; + } + // lib.optionalAttrs document + { documentationRoot = "${src}/${prefix}"; } + ) ) diff --git a/pkgs/development/interpreters/dhall/build-dhall-package.nix b/pkgs/development/interpreters/dhall/build-dhall-package.nix index 9303244eb885..039c50f06937 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-package.nix @@ -1,4 +1,4 @@ -{ dhall, haskell, lib, lndir, runCommand, writeText }: +{ dhall, dhall-docs, haskell, lib, lndir, runCommand, writeText }: { name @@ -31,6 +31,12 @@ # space within the Nix store, but if you set the following `source` option to # `true` then the package will also include `source.dhall`. , source ? false + + # Directory to generate documentation for (i.e. as the `--input` option to the + # `dhall-docs` command.) + # + # If `null`, then no documentation is generated. +, documentationRoot ? null }: let @@ -42,8 +48,12 @@ let cache = ".cache"; + data = ".local/share"; + cacheDhall = "${cache}/dhall"; + dataDhall = "${data}/dhall"; + sourceFile = "source.dhall"; in @@ -71,4 +81,10 @@ in echo "missing $SHA_HASH" > $out/binary.dhall ${lib.optionalString (!source) "rm $out/${sourceFile}"} + + ${lib.optionalString (documentationRoot != null) '' + mkdir -p $out/${dataDhall} + + XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --output-link $out/docs + ''} '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd83ab4f9c47..a60e5f6e6fbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10310,13 +10310,15 @@ in dhall = haskell.lib.justStaticExecutables haskellPackages.dhall; - dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; - dhall-bash = haskell.lib.justStaticExecutables haskellPackages.dhall-bash; + dhall-docs = haskell.lib.justStaticExecutables haskellPackages.dhall-docs; + + dhall-lsp-server = haskell.lib.justStaticExecutables haskellPackages.dhall-lsp-server; + dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json; - dhall-lsp-server = haskell.lib.justStaticExecutables haskellPackages.dhall-lsp-server; + dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; From c2c8e2e4cca58237157acdd863b603c207d8a8ee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 1 Dec 2020 06:40:20 -0800 Subject: [PATCH 048/120] zfs: add new maintainers, update homepage --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 60b6926ac67e..a83e554b6f0a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -170,10 +170,10 @@ let Copy-On-Write filesystem with data integrity detection and repair, snapshotting, cloning, block devices, deduplication, and more. ''; - homepage = "https://zfsonlinux.org/"; + homepage = "https://github.com/openzfs/zfs"; license = licenses.cddl; platforms = platforms.linux; - maintainers = with maintainers; [ jcumming wizeman fpletz globin ]; + maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; }; }; in { From 43cdc245d4a2708b0948074cc477e39ba6626ed3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 15:03:00 +0000 Subject: [PATCH 049/120] bctoolbox: 4.4.6 -> 4.4.13 --- pkgs/development/libraries/bctoolbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 0b2047466498..0f99484f5a08 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.6"; + version = "4.4.13"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1vlvnpkks5mm6ppdmp88mdn39f3ynig6qas83nkjn7x47z2zr6x0"; + sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"; }; # Do not build static libraries From 86b91712ef38377da40cb44e939f782ee9bd318b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 15:12:22 +0000 Subject: [PATCH 050/120] abcmidi: 2020.08.09 -> 2020.11.07 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 4ab394516a84..e33ff98587bf 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.08.09"; + version = "2020.11.07"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "1j7jkv2fdrhyyjavffb5nrs8p9mfp8zqqravcad1ayv1z2wxr8vl"; + sha256 = "0zwzgqy1wa7yd2cm6spq11lw21mdn92lx8qzrxpk9kxcl03mv5jd"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 3958bc06be6b06d0cad7b768e282f024be3de63c Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Tue, 1 Dec 2020 16:54:27 +0100 Subject: [PATCH 051/120] palemoon: 28.15.0 -> 28.16.0 (#105555) --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 542d43294815..5d299f3349ed 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -16,14 +16,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.15.0"; + version = "28.16.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1sbs3gcwfx58mxc0x1g6jklmvpa9dw2bq3i8y9645gfa1s12p8wy"; + sha256 = "1svwbiar7c38c8xfw249mwnvayqq5868nkks7cbv9nyf2m9yap56"; fetchSubmodules = true; }; From 544a6670d885c2dcdda70f9b423b4ef3ab994ced Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 16:04:33 +0000 Subject: [PATCH 052/120] appstream: 0.12.11 -> 0.13.1 --- pkgs/development/libraries/appstream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 45f27b38a63d..820e73832462 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "appstream"; - version = "0.12.11"; + version = "0.13.1"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "sha256-bCDyMwQdn9Csxs2hy4dm+LjtxK4+YBK6yDkAdhu1QVU="; + sha256 = "16nxaw4fx78maldi3kvr8fiwzhmy5276wd4x2fxny16zzf01098j"; }; nativeBuildInputs = [ From 934f62181982632bdac5b798eaef1cc301f91d54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 15:24:19 +0000 Subject: [PATCH 053/120] _1password-gui: 0.9.5-2 -> 0.9.6 --- pkgs/tools/security/1password-gui/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 9761bf112b93..777e7292fde0 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -2,22 +2,17 @@ , fetchurl , appimageTools , makeWrapper -, electron_9 +, electron_11 , openssl }: -let - electron = electron_9; - -in - stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.5-2"; + version = "0.9.6"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "1fj8gab5frxnzx6cafkcxmic9z1wvfqi4v511wsg9dy4mn5dc6qw"; + sha256 = "0464a5d39g20hif3dz3qr78dqb0cmxbazy0q48j9gkawhxm30c1h"; }; nativeBuildInputs = [ makeWrapper ]; @@ -51,7 +46,7 @@ stdenv.mkDerivation rec { cp -a ${appimageContents}/usr/share/icons $out/share # Wrap the application with Electron. - makeWrapper "${electron}/bin/electron" "$out/bin/${pname}" \ + makeWrapper "${electron_11}/bin/electron" "$out/bin/${pname}" \ --add-flags "$out/share/${pname}/resources/app.asar" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeLibs}" ''; From 8884729f19cead20caefcf0b916e3b588b06702a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 1 Dec 2020 17:10:19 +0100 Subject: [PATCH 054/120] containerd: 1.4.2 -> 1.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Access controls for the shim’s API socket verified that the connecting process had an effective UID of 0, but did not otherwise restrict access to the abstract Unix domain socket. This would allow malicious containers running in the same network namespace as the shim, with an effective UID of 0 but otherwise reduced privileges, to cause new processes to be run with elevated privileges. Fixes: CVE-2020-15257 --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 50b9b8f36aab..977b94f1d774 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "containerd"; - version = "1.4.2"; + version = "1.4.3"; # git commit for the above version's tag commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "17ciyvqz0j1q2vyzwkz6bkvxpz2d7y1kk99fv68ar7l4mr8pyp78"; + sha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; }; goPackagePath = "github.com/containerd/containerd"; From 9d82d8b3c02ba8388addfea6687687d9b0c788e8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 1 Dec 2020 11:29:15 -0500 Subject: [PATCH 055/120] linux: 5.10-rc5 -> 5.10-rc6 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 50c69deeb073..5bf74ffd377b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10-rc5"; + version = "5.10-rc6"; extraMeta.branch = "5.10"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "117yvvzdbf8garx484zdp75qgldj8xhr2sqk6mza6lgv4h7v3f4g"; + sha256 = "14ykzs98r918sqv7lddlps4r7hza1zgw0x67mmj77cmqiv6d8ffi"; }; # Should the testing kernels ever be built on Hydra? From b5a328e58f32354676310c511e3834d2b805f810 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 1 Dec 2020 16:03:53 +0000 Subject: [PATCH 056/120] nixos/tests/misc: account for cgroupv2 Since #104094 (d22b3ed4bcd24dcc96fd9f99c75bb568bffe2a8c), NixOS is using the unified cgroup hierarchy by default (aka cgroupv2). This means the blkio controller isn't there, so we should test for something else (e.g. the presence of the io controller). Fixes #105581. --- nixos/tests/misc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index ae1505532734..40661cdca0a1 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -88,8 +88,8 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { with subtest("whether kernel.poweroff_cmd is set"): machine.succeed('[ -x "$(cat /proc/sys/kernel/poweroff_cmd)" ]') - with subtest("whether the blkio controller is properly enabled"): - machine.succeed("[ -e /sys/fs/cgroup/blkio/blkio.reset_stats ]") + with subtest("whether the io cgroupv2 controller is properly enabled"): + machine.succeed("grep -q '\\bio\\b' /sys/fs/cgroup/cgroup.controllers") with subtest("whether we have a reboot record in wtmp"): machine.shutdown From adaf73fd877641d6d44c09c221e0f96d0196ca54 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 1 Dec 2020 11:32:27 -0500 Subject: [PATCH 057/120] perlPackages.TextFormat: 0.61 -> 0.62 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0cb1b2334dab..5202aa013e35 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21230,10 +21230,10 @@ let TextFormat = buildPerlModule { pname = "Text-Format"; - version = "0.61"; + version = "0.62"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz"; - sha256 = "bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.62.tar.gz"; + sha256 = "0104z7jjv46kqh77rnx8kvmsbr5dy0s56xm01dckq4ly65br0hkx"; }; meta = { homepage = "https://metacpan.org/release/Text-Format"; From 082e6701feac66510df56dae5aaa5575c8eff821 Mon Sep 17 00:00:00 2001 From: Jeffrey McBeth Date: Tue, 1 Dec 2020 11:31:16 -0500 Subject: [PATCH 058/120] spigot: 20200101 -> 20200901 Resync with upstream --- pkgs/tools/misc/spigot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/tools/misc/spigot/default.nix index fbed27a24478..8321d03a48f4 100644 --- a/pkgs/tools/misc/spigot/default.nix +++ b/pkgs/tools/misc/spigot/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "spigot"; - version = "20200101"; + version = "20200901"; src = fetchgit { url = "https://git.tartarus.org/simon/spigot.git"; - rev = "b1b0b202b3523b72f0638fb31fd49c47f4abb39c"; - sha256 = "0lh5v42aia1hvhsqzs515q0anrjc6c2s9bjklfaap5gz0cg59wbv"; + rev = "9910e5bdc203bae6b7bbe1ed4a93f13755c1cae"; + sha256 = "1az6v9gk0g2k197lr288nmr9jv20bvgc508vn9ic3v7mav7hf5bf"; }; nativeBuildInputs = [ autoreconfHook halibut perl ]; From 48d423ee2a22adb30f89899c82f7e12821c7455b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 1 Dec 2020 16:44:51 +0000 Subject: [PATCH 059/120] mindustry,mindustry-server: 104.6 -> 120 (#105590) * mindustry,mindustry-server: 104.6 -> 120 * mindustry,mindustry-server: remove trailing space --- pkgs/games/mindustry/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index c0c8663868d1..d87a1cadd989 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -2,10 +2,11 @@ , makeWrapper , makeDesktopItem , fetchFromGitHub -, gradle_5 +, gradleGen +, jdk14 , perl , jre -, libpulseaudio +, alsaLib # Make the build version easily overridable. # Server and client build versions must match, and an empty build version means @@ -21,14 +22,14 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "104.6"; + version = "120"; buildVersion = makeBuildVersion version; src = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "1crdfiymaz57gnma6bmdcsnbl635nhjdndrjv467c4xfq9vvap2i"; + sha256 = "08l5c53izh5vmgahsj0qhpfiva0vs5qhh77bb770hzpadxvysyc8"; }; desktopItem = makeDesktopItem { @@ -49,11 +50,14 @@ let sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle ''; + # The default one still uses jdk8 (#89731) + gradle_6 = (gradleGen.override (old: { java = jdk14; })).gradle_6_7; + # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit version src postPatch; - nativeBuildInputs = [ gradle_5 perl ]; + nativeBuildInputs = [ gradle_6 perl ]; # Here we build both the server and the client so we only have to specify # one hash for 'deps'. Deps can be garbage collected after the build, # so this is not really an issue. @@ -70,7 +74,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "08yrczz1qn78qy3x67gs7d0xvihbfbb8ggiczq2nj812745zcizw"; + outputHash = "1yv9l8zdml6drmvlgv45w3qas9qmb654x4kja3an4d16k020khr7"; }; # Separate commands for building and installing the server and the client @@ -84,7 +88,7 @@ let install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/mindustry \ - --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ + ${stdenv.lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${alsaLib}/lib"} \ --add-flags "-jar $out/share/mindustry.jar" install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png install -Dm644 ${desktopItem}/share/applications/Mindustry.desktop $out/share/applications/Mindustry.desktop @@ -102,7 +106,7 @@ assert stdenv.lib.assertMsg (enableClient || enableServer) stdenv.mkDerivation rec { inherit pname version src postPatch; - nativeBuildInputs = [ gradle_5 makeWrapper ]; + nativeBuildInputs = [ gradle_6 makeWrapper ]; buildPhase = with stdenv.lib; '' export GRADLE_USER_HOME=$(mktemp -d) @@ -126,4 +130,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - From de88771a7d26d6c7c7f0afd310eb4e217f75e159 Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 1 Dec 2020 16:48:29 +0000 Subject: [PATCH 060/120] nix-prefetch-docker: output informational messages to stderr Informational messages belong on stderr, not on stdout and intermixed with structured output for programmatic use. Change-Id: I34d094d04460494e9ec8953db7490f4e2292d959 --- pkgs/build-support/docker/nix-prefetch-docker | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/docker/nix-prefetch-docker b/pkgs/build-support/docker/nix-prefetch-docker index 1b6785189c28..5798ab5984f1 100755 --- a/pkgs/build-support/docker/nix-prefetch-docker +++ b/pkgs/build-support/docker/nix-prefetch-docker @@ -127,7 +127,7 @@ trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/$(get_name $finalImageName $finalImageTag)" if test -z "$QUIET"; then - skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" + skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" >&2 else skopeo --insecure-policy --tmpdir=$TMPDIR --override-os ${os} --override-arch ${arch} copy "$sourceUrl" "docker-archive://$tmpFile:$finalImageName:$finalImageTag" > /dev/null fi @@ -139,12 +139,12 @@ imageHash=$(nix-hash --flat --type $hashType --base32 "$tmpFile") finalPath=$(nix-store --add-fixed "$hashType" "$tmpFile") if test -z "$QUIET"; then - echo "-> ImageName: $imageName" - echo "-> ImageDigest: $imageDigest" - echo "-> FinalImageName: $finalImageName" - echo "-> FinalImageTag: $finalImageTag" - echo "-> ImagePath: $finalPath" - echo "-> ImageHash: $imageHash" + echo "-> ImageName: $imageName" >&2 + echo "-> ImageDigest: $imageDigest" >&2 + echo "-> FinalImageName: $finalImageName" >&2 + echo "-> FinalImageTag: $finalImageTag" >&2 + echo "-> ImagePath: $finalPath" >&2 + echo "-> ImageHash: $imageHash" >&2 fi if [ "$format" == "nix" ]; then From c5c77eb0b1e2b7eb8763fe821a72a0df4cbd71ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 17:37:56 +0000 Subject: [PATCH 061/120] avocode: 4.10.3 -> 4.10.4 --- pkgs/applications/graphics/avocode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index fd94b4e26cfc..6d4fa501710d 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.10.3"; + version = "4.10.4"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1ngyd3sfnhf8hpi015pgbms5bspc30lzrpfpw3jp992i4mzcjq0z"; + sha256 = "06xf5y2mljk3pd74ap9n90bhhidbzpg5c6wws361ygd4f3x86c46"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ From 2d55b8def4b8e4882123cae432bdea2c89e72166 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 1 Dec 2020 18:52:36 +0100 Subject: [PATCH 062/120] containerd: update commit id for version indicator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I forogt to update the `commit` value in 8884729, which is why this the version output was wrong: ``` ❯ ./result/bin/containerd -v containerd github.com/containerd/containerd v1.4.3 7ad184331fa3e55e52b890ea95e65ba581ae3429 ``` This change corrects it. ``` ❯ ./result/bin/containerd -v containerd github.com/containerd/containerd v1.4.3 269548fa27e0089a8b8278fc4fc781d7f65a939b ``` --- pkgs/applications/virtualization/containerd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 977b94f1d774..cece3cc6b673 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "containerd"; version = "1.4.3"; # git commit for the above version's tag - commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; + commit = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; src = fetchFromGitHub { owner = "containerd"; From 1a3557f729a1615a27e8da75ea930a27c635f381 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Tue, 1 Dec 2020 10:55:48 -0700 Subject: [PATCH 063/120] archi: init at 4.7.1 (#103355) Co-authored-by: Sandro --- pkgs/tools/misc/archi/default.nix | 61 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/tools/misc/archi/default.nix diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix new file mode 100644 index 000000000000..41562ccbf711 --- /dev/null +++ b/pkgs/tools/misc/archi/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, fetchurl +, fetchzip +, autoPatchelfHook +, libsecret +}: + +stdenv.mkDerivation rec { + pname = "Archi"; + version = "4.7.1"; + + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://www.archimatetool.com/downloads/archi/Archi-Linux64-${version}.tgz"; + sha256 = "0sd57cfnh5q2p17sd86c8wgmqyipg29rz6iaa5brq8mwn8ps2fdw"; + } + else if stdenv.hostPlatform.system == "x86_64-darwin" then + fetchzip { + url = "https://www.archimatetool.com/downloads/archi/Archi-Mac-${version}.zip"; + sha256 = "1h05lal5jnjwm30dbqvd6gisgrmf1an8xf34f01gs9pwqvqfvmxc"; + } + else + throw "Unsupported system"; + + buildInputs = [ + libsecret + ]; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + installPhase = + if stdenv.hostPlatform.system == "x86_64-linux" then + '' + mkdir -p $out/bin + for f in configuration features p2 plugins Archi.ini Archi; do + cp $f $out/bin/ + done + + install -D -m755 Archi $out/bin/Archi + '' + else + '' + mkdir -p "$out/Applications" + mv Archi.app "$out/Applications/" + ''; + + meta = with stdenv.lib; { + description = "ArchiMate modelling toolkit"; + longDescription = '' + Archi is an open source modelling toolkit to create ArchiMate + models and sketches. + ''; + homepage = "https://www.archimatetool.com/"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ earldouglas SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16d5ad79abde..0cfcb9b4abfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -701,6 +701,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; }; + archi = callPackage ../tools/misc/archi { }; + cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; eterm = callPackage ../applications/terminal-emulators/eterm { }; From fb063991b26b2b93dece6d09f37041451a5ef4cb Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Tue, 1 Dec 2020 19:11:45 +0100 Subject: [PATCH 064/120] macdylibbundler: Should propagate dependency on otool (#103163) Co-authored-by: Sandro --- pkgs/development/tools/misc/macdylibbundler/default.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index 103c534dfa3d..5008175363cb 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, makeWrapper, fetchFromGitHub, cctools }: stdenv.mkDerivation { pname = "macdylibbundler"; @@ -11,8 +11,15 @@ stdenv.mkDerivation { sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; }; + buildInputs = [ makeWrapper ]; + makeFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/dylibbundler \ + --prefix PATH ":" "${cctools}/bin" + ''; + meta = with stdenv.lib; { description = "Utility to ease bundling libraries into executables for OSX"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cfcb9b4abfb..c0c827bc13b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22390,7 +22390,7 @@ in mac = callPackage ../development/libraries/mac { }; - macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { }; + macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; }; magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; From 919648ae9c3886ac23565f270f713f9e69b656db Mon Sep 17 00:00:00 2001 From: scalavision Date: Tue, 1 Dec 2020 19:13:42 +0100 Subject: [PATCH 065/120] pylance: init at 2020.11.2 (#105601) --- pkgs/misc/vscode-extensions/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index bc00f82f19b7..b80fcb25a855 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, lib, callPackage, vscode-utils, llvmPackages_8, llvmPackages_latest }: +{ stdenv, config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -25,6 +25,21 @@ let }; }; + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pylance"; + publisher = "MS-python"; + version = "2020.11.2"; + sha256 = "0n2dm21vgzir3hx1m3pmx7jq4zy3hdxfsandd2wv5da4fs9b5g50"; + }; + + buildInputs = [ nodePackages.pyright ]; + + meta = { + license = stdenv.lib.licenses.unfree; + }; + }; + bbenoist.Nix = buildVscodeMarketplaceExtension { mktplcRef = { name = "Nix"; From 83a901b89823f54eb5461f1f59a8c83aeeb648fd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 1 Dec 2020 19:31:06 +0100 Subject: [PATCH 066/120] unifont_upper: 12.1.03 -> 13.0.04 --- pkgs/data/fonts/unifont_upper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 153c6272ca20..2daf66e75109 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "12.1.03"; + version = "13.0.04"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "1w0bg276cyv6xs6clld8gv4w88rj9fw9rc8zs9ahc6y9hv677knj"; + sha256 = "0bji0crx84nbjf1m1lzql7icrb02zbs3l66dn21pvr9czsry870f"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; From a58e424290c00bc47aaf512cbb439313ecb83975 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 1 Dec 2020 16:24:47 +0000 Subject: [PATCH 067/120] dasel: 1.6.2 -> 1.8.0 --- pkgs/applications/misc/dasel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index d3aff8e6b1ba..ca1a87dd2dd9 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.6.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LGrFs9JNb0gjXg6IRkUfUOWS+sr1nukzOEWK4XUfkfw="; + sha256 = "sha256-N27XmrbZTLeNkNvGDsChqKZrAagkQoGFaJeeZ1/Qnkw="; }; vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; From 1590c5302baae3f9deece67b859f877e329c89a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 18:58:35 +0000 Subject: [PATCH 068/120] fly: 6.7.0 -> 6.7.2 --- pkgs/development/tools/continuous-integration/fly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 405ac1e26b06..f993faf544d7 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fly"; - version = "6.7.0"; + version = "6.7.2"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0jc0hr0h1xya7avzxdwmvhnsm5cr3g21pig52draz5vjaya7bg55"; + sha256 = "0c5alf2a0088i25mglla9dl4m3wr5y8pnl5cczgn06sz8qp9a0s0"; }; vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; From 602ee1b2998c72c072ea94a7625e4099e9e8c68c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 19:08:34 +0000 Subject: [PATCH 069/120] deja-dup: 42.5 -> 42.6 --- pkgs/applications/backup/deja-dup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index e4898baca54e..d6ce864d6523 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "42.5"; + version = "42.6"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "1xgsd9a9y36lv6f2vjw2nxi9zj2zl1gv6rcyzkqajf91vgmxwf8k"; + sha256 = "0grwlfakrnr9ij7h8lsfazlws6qix8pl50dr94cpxnnbjga9xn9z"; }; patches = [ From ee7d83e648702bcba2575f5329f00028893e0a2d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 1 Dec 2020 14:13:40 -0500 Subject: [PATCH 070/120] ants: unbreak on Darwin --- pkgs/applications/science/biology/ants/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index cb88e92fe1cb..ece218eea37d 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7 }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, itk4, vtk_7, Cocoa }: stdenv.mkDerivation rec { pname = "ANTs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk4 vtk_7 ]; + buildInputs = [ itk4 vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16d5ad79abde..24e2dde579e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26344,7 +26344,9 @@ in alliance = callPackage ../applications/science/electronics/alliance { }; - ants = callPackage ../applications/science/biology/ants { }; + ants = callPackage ../applications/science/biology/ants { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; aragorn = callPackage ../applications/science/biology/aragorn { }; From 2d1b0c3e88356eb3df51152172aebb18ae62d653 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 1 Dec 2020 14:39:24 -0500 Subject: [PATCH 071/120] nixUnstable: pre20201118_79aa7d9 -> pre20201201_5a6ddb3 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 42eae8d9ffdc..c17a1a82d9f3 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -199,13 +199,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20201118_79aa7d9"; + suffix = "pre20201201_5a6ddb3"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "79aa7d95183cbe6c0d786965f0dbff414fd1aa67"; - sha256 = "0aa0xggrczylwp3da3q9m4ad9j6gzi7wpa3ph4i8a1ng36kl91c7"; + rev = "5a6ddb3de14a1684af6c793d663764d093fa7846"; + sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g"; }; inherit storeDir stateDir confDir boehmgc; From b02dbec0aff0b477596d0b107192f2d61ea27428 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 20:15:36 +0000 Subject: [PATCH 072/120] cinnamon.cinnamon-translations: 4.6.2 -> 4.8.0 --- pkgs/desktops/cinnamon/cinnamon-translations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 142c586d8d64..8e29aa9fcc72 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "4.6.2"; + version = "4.8.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0zaghha62ibhg3rir6mrfy1z3v7p7v83b6glhmj9s51nxd86fyv6"; + sha256 = "1j3azjwin89z5v6nphx0wsa35p224h2gps50kcq9gwankkfcf3q1"; }; nativeBuildInputs = [ From 4f68a774018abe8f6b7dc4dca89f96f7e121a398 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Tue, 1 Dec 2020 15:21:21 -0500 Subject: [PATCH 073/120] imgbrd-grabber: use pname instead of name; add meta --- pkgs/applications/graphics/imgbrd-grabber/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index f07db4c5c4a6..abf934cebe8c 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -18,7 +18,7 @@ , typescript }: stdenv.mkDerivation rec { - name = "imgbrd-grabber"; + pname = "imgbrd-grabber"; version = "7.3.2"; src = fetchFromGitHub { @@ -84,4 +84,11 @@ stdenv.mkDerivation rec { ''; sourceRoot = "source/src"; + + meta = with stdenv.lib; { + description = "Very customizable imageboard/booru downloader with powerful filenaming features."; + license = licenses.asl20; + homepage = "https://bionus.github.io/imgbrd-grabber/"; + maintainers = [ maintainers.evanjs ]; + }; } From 4617fcd6c4ae4f42164658da42eb64f4a947d681 Mon Sep 17 00:00:00 2001 From: Milan Date: Tue, 1 Dec 2020 21:47:18 +0100 Subject: [PATCH 074/120] edk2: 201911 -> 202011 (#105582) --- pkgs/development/compilers/edk2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 8a18b6306c27..51e0842d4beb 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -37,13 +37,13 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "201911"; + version = "202011"; # submodules src = fetchgit { url = "https://github.com/tianocore/edk2"; rev = "edk2-stable${edk2.version}"; - sha256 = "1rmvb4w043v25cppsqxqrpzqqcay3yrzsrhhzm2q9bncrj56vm8q"; + sha256 = "1fvlz1z075jr6smq9qa0asy6fxga1gljcfd0764ypzy1mw963c9s"; }; buildInputs = [ libuuid pythonEnv ]; From 9366259691908f03ac88e28138fc3f401fdb2e7e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Nov 2020 07:38:14 +0100 Subject: [PATCH 075/120] coqPackages.coq-ext-lib: refactor --- .../coq-modules/coq-ext-lib/default.nix | 47 +++++++++++++------ 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index f24ccaf427d2..7d15f1129362 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,17 +1,34 @@ -{ stdenv, fetchFromGitHub, coq }: +{ stdenv, fetchFromGitHub, coq, ...}@args: -let params = - { - "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; - "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; - "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; - "8.8" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; - "8.9" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; - "8.10" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; - "8.11" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; - "8.12" = { version = "0.11.2"; sha256 = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; +let + hashes = { + "0.9.4" = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; + "0.9.5" = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; + "0.9.7" = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; + "0.10.0" = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a"; + "0.10.1" = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; + "0.10.2" = "1b150rc5bmz9l518r4m3vwcrcnnkkn9q5lrwygkh0a7mckgg2k9f"; + "0.10.3" = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; + "0.11.1" = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; + "0.11.2" = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; }; - param = params.${coq.coq-version}; + + default-versions = { + "8.5" = "0.9.4"; + "8.6" = "0.9.5"; + "8.7" = "0.9.7"; + "8.8" = "0.11.2"; + "8.9" = "0.11.2"; + "8.10" = "0.11.2"; + "8.11" = "0.11.2"; + "8.12" = "0.11.2"; + }; + + param = rec { + version = args.version or default-versions.${coq.coq-version}; + sha256 = hashes.${version}; + }; + in stdenv.mkDerivation rec { @@ -20,9 +37,9 @@ stdenv.mkDerivation rec { inherit (param) version; src = fetchFromGitHub { - owner = "coq-ext-lib"; + owner = "coq-community"; repo = "coq-ext-lib"; - rev = "v${param.version}"; + rev = "v${version}"; inherit (param) sha256; }; @@ -40,6 +57,6 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.hasAttr v params; + compatibleCoqVersions = v: builtins.hasAttr v default-versions; }; } From 4569be3b21aa4cdc90122e09b2fecbbf01e25f38 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 25 Nov 2020 07:38:21 +0100 Subject: [PATCH 076/120] =?UTF-8?q?coqPackages.coq-ext-lib:=200.11.2=20?= =?UTF-8?q?=E2=86=92=200.11.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/coq-ext-lib/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 7d15f1129362..e0ca52086206 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -11,17 +11,18 @@ let "0.10.3" = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; "0.11.1" = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; "0.11.2" = "0iyka81g26x5n99xic7kqn8vxqjw8rz7vw9rs27iw04lf137vzv6"; + "0.11.3" = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42"; }; default-versions = { "8.5" = "0.9.4"; "8.6" = "0.9.5"; "8.7" = "0.9.7"; - "8.8" = "0.11.2"; - "8.9" = "0.11.2"; - "8.10" = "0.11.2"; - "8.11" = "0.11.2"; - "8.12" = "0.11.2"; + "8.8" = "0.11.3"; + "8.9" = "0.11.3"; + "8.10" = "0.11.3"; + "8.11" = "0.11.3"; + "8.12" = "0.11.3"; }; param = rec { From 11c35305ca0562e94cce58a64684cdcad9702c45 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 1 Dec 2020 07:49:25 +0100 Subject: [PATCH 077/120] ocamlPackages.ke: use Dune 2 --- pkgs/development/ocaml-modules/ke/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ke/default.nix b/pkgs/development/ocaml-modules/ke/default.nix index e1b68a1d2da4..f14383207ea6 100644 --- a/pkgs/development/ocaml-modules/ke/default.nix +++ b/pkgs/development/ocaml-modules/ke/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { pname = "ke"; version = "0.4"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/ke/releases/download/v${version}/ke-v${version}.tbz"; sha256 = "13c9xy60vmq29mnwpg3h3zgl6gjbjfwbx1s0crfc6xwvark0zxnx"; @@ -14,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ bigarray-compat fmt ]; - checkInputs = lib.optionals doCheck [ alcotest bigstringaf ]; + checkInputs = [ alcotest bigstringaf ]; doCheck = true; minimumOCamlVersion = "4.03"; From 38a91dff4d04a004dc00ceabb833761291e2850e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 1 Dec 2020 07:49:29 +0100 Subject: [PATCH 078/120] ocamlPackages.earlybird: use Dune 2 --- pkgs/development/ocaml-modules/earlybird/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index decbb4117670..b36874d49da6 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -10,6 +10,8 @@ buildDunePackage rec { pname = "earlybird"; version = "0.1.5"; + useDune2 = true; + minimumOCamlVersion = "4.04"; src = fetchurl { From 9e66b4e873e4c7b2b6aaf5b27f15f6ec0c36f007 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 1 Dec 2020 07:49:34 +0100 Subject: [PATCH 079/120] ocamlPackages.angstrom: use Dune 2 --- pkgs/development/ocaml-modules/angstrom-async/default.nix | 2 +- pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix | 2 +- pkgs/development/ocaml-modules/angstrom-unix/default.nix | 2 +- pkgs/development/ocaml-modules/angstrom/default.nix | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index ac900a8dd186..60e774918d5d 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "angstrom-async"; - inherit (angstrom) version src; + inherit (angstrom) version useDune2 src; minimumOCamlVersion = "4.04.1"; diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index d249c4512914..eb4de44d7a6e 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "angstrom-lwt-unix"; - inherit (angstrom) version src; + inherit (angstrom) version useDune2 src; minimumOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 0d4ab400dd3e..134c161d266f 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "angstrom-unix"; - inherit (angstrom) version src; + inherit (angstrom) version useDune2 src; minimumOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index 75eb2255ee78..749a043e739e 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,8 +1,9 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, result, bigstringaf, ppx_let }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let }: buildDunePackage rec { pname = "angstrom"; version = "0.15.0"; + useDune2 = true; minimumOCamlVersion = "4.04"; @@ -14,6 +15,7 @@ buildDunePackage rec { }; checkInputs = [ alcotest ppx_let ]; + buildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ bigstringaf result ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; From 8b64dfce2ee326483278be36a6706168ef781361 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 1 Dec 2020 07:49:38 +0100 Subject: [PATCH 080/120] =?UTF-8?q?ocamlPackages.bigstringaf:=200.6.0=20?= =?UTF-8?q?=E2=86=92=200.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/bigstringaf/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index 9f6810379aef..852459c2bac1 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -2,7 +2,9 @@ buildDunePackage rec { pname = "bigstringaf"; - version = "0.6.0"; + version = "0.7.0"; + + useDune2 = true; minimumOCamlVersion = "4.03"; @@ -10,7 +12,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "04b088vrqzmxsyan9f9nr8721bxip4b930cgvb5zkbbmrw3ylmwc"; + sha256 = "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj"; }; checkInputs = [ alcotest ]; From 50b6c206c3333cc29051b85ad0a2d66aa4979f8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 21:36:03 +0000 Subject: [PATCH 081/120] cinnamon.cinnamon-desktop: 4.6.4 -> 4.8.0 --- pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 71eb54ea2023..00ea002f746b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "4.6.4"; + version = "4.8.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "08z5hgc6dwdp9fczm75axwh8q9665iz4y2lxp92xp62r3k0v9fvd"; + sha256 = "1369iig7w0x45sr9yd4a5xxqrwsfwq90hlnknarhz62h5hpykjwi"; }; outputs = [ "out" "dev" ]; From 087c22d8f507731b0e5c274c3b0f67f8b64f4104 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 21:54:26 +0000 Subject: [PATCH 082/120] clipgrab: 3.9.2 -> 3.9.5 --- pkgs/applications/video/clipgrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index d979a25d2d1b..fa6cf88440f1 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.9.2"; + version = "3.9.5"; src = fetchurl { - sha256 = "1ckcprqck96ns752vk9bzlc3gm6b5f0piff2d3m55zrvdh7wpgy5"; + sha256 = "1p8pqa5s70basdm2zpmahc54shsxrr0fr7chvv425n5a9sqba4dh"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; From 14cd4982c63128b5a4b695e14a0018c06e985997 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 22:15:38 +0000 Subject: [PATCH 083/120] cinnamon.cinnamon-menus: 4.6.1 -> 4.8.1 --- pkgs/desktops/cinnamon/cinnamon-menus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 9edc13687079..0e84302f6c6c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "4.6.1"; + version = "4.8.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1qdaql4mknhzvl2qi1pyw4c820lqb7lg07gblh0wzfk4f7h8hddx"; + sha256 = "1fsiq8q8b65skxbg1bsishygnw2zg8kr0d09rassqjdimd4yfi1y"; }; buildInputs = [ From 54eed8ab5e4aea37c85e2b604a913ed35e0f064c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 22:42:42 +0000 Subject: [PATCH 084/120] cinnamon.cinnamon-session: 4.6.2 -> 4.8.0 --- pkgs/desktops/cinnamon/cinnamon-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 4e9c09f4d735..02082f64ed3c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "4.6.2"; + version = "4.8.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "133vpgs0dqr16pvx5wyxhfcargn9wl14z0q99m2pn93hf6zycmsv"; + sha256 = "0sbfd1d4kjiccaq9s36r2cvdcmvd1x2087nkfgl32gwxakqi3g4n"; }; patches = [ From a992accb31324a7554cea94a890e3434c3e4c817 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 22:49:42 +0000 Subject: [PATCH 085/120] daemon: 0.6.4 -> 0.7 --- pkgs/tools/system/daemon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index 6763b476f303..ba9527b3b04d 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation { - name = "daemon-0.6.4"; + name = "daemon-0.7"; src = fetchurl { - url = "http://libslack.org/daemon/download/daemon-0.6.4.tar.gz"; - sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4"; + url = "http://libslack.org/daemon/download/daemon-0.7.tar.gz"; + sha256 = "0b17zzl7bqnkn7a4pr3l6fxqfmxfld7izphrab5nvhc4wzng4spn"; }; makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ perl ]; From 154e01b2e91cad0755a3e067a627c87ebb600e19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 23:03:12 +0000 Subject: [PATCH 086/120] broot: 1.0.6 -> 1.0.7 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index e5c528596b0d..53b89a072247 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.0.6"; + version = "1.0.7"; src = fetchCrate { inherit pname version; - sha256 = "1yzj1k09yd3q2dff6a6m0xv2v6z681x25g0x5ak41lm5rn3hj8vl"; + sha256 = "0rxk6dsbn960ikmp6f8a98g3dlibzfy9gcbdina37403kxv8bs6v"; }; - cargoSha256 = "1axcnr7bzplchpz4cdy5872fmrnzrs1p665c0vmxzs9bgnml5sl8"; + cargoSha256 = "14fc53xl8f19z8cjrgn6qafiymgirmsin2nzh4i3qprmcc52all8"; nativeBuildInputs = [ makeWrapper From bc1ed39ffaf7926c5a1f05436bd3753d9c486109 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 2 Dec 2020 09:19:59 +1000 Subject: [PATCH 087/120] youtube-dl: 2020.11.29 -> 2020.12.02 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.12.02 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 8fa46a786949..a7b42471494b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.11.29"; + version = "2020.12.02"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "10px5wnsjw4lzdh75810q4sjbhnd7cjxwpa3crapd3yj0f3bwa76"; + sha256 = "0wkslmqiydlzrla4wx67757b18r4l9h42fkfzdcxx6n0ygiv4qbi"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 06f096ade30f6c848dfb1eae805454c42fa2a37b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 23:21:16 +0000 Subject: [PATCH 088/120] feh: 3.5 -> 3.6 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 467e593025e4..0c7f3e8fe107 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq"; + sha256 = "1n6gbyzlc3kx2cq9wfz7azn7mrjmcc9pq436k1n4mrh0lik5sxw7"; }; outputs = [ "out" "man" "doc" ]; From 9e311226e73f1e1a848ac705b54350fffe0e4151 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Dec 2020 23:29:31 +0000 Subject: [PATCH 089/120] exodus: 20.11.21 -> 20.11.23 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 13543114d64a..2e6419fd13d8 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.11.21"; + version = "20.11.23"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1q6sh2jhngvihkxjprkcd1php6r7m6qkxsijx8d3azzlgj9nbf2n"; + sha256 = "0hcvgph2m4nbrarhw2cggc8q5jxwnibiz2mbkypgizphk5svdj9l"; }; sourceRoot = "."; From e9b758a63ee2488c783ffcb49f01437874b4e6cc Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Tue, 1 Dec 2020 20:03:10 -0500 Subject: [PATCH 090/120] Update pkgs/applications/graphics/imgbrd-grabber/default.nix Co-authored-by: Sandro --- pkgs/applications/graphics/imgbrd-grabber/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index abf934cebe8c..22a35b3a4cc3 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; meta = with stdenv.lib; { - description = "Very customizable imageboard/booru downloader with powerful filenaming features."; + description = "Very customizable imageboard/booru downloader with powerful filenaming features"; license = licenses.asl20; homepage = "https://bionus.github.io/imgbrd-grabber/"; maintainers = [ maintainers.evanjs ]; From 9752b4752472f617eeb5c4e768e28565ce4ea418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 2 Dec 2020 02:13:21 +0100 Subject: [PATCH 091/120] daemon: switch to pname, version; cleanups --- pkgs/tools/system/daemon/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index ba9527b3b04d..29f976998d53 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -1,15 +1,18 @@ -{stdenv, fetchurl, perl}: +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "daemon"; + version = "0.7"; -stdenv.mkDerivation { - name = "daemon-0.7"; src = fetchurl { - url = "http://libslack.org/daemon/download/daemon-0.7.tar.gz"; + url = "http://libslack.org/daemon/download/daemon-${version}.tar.gz"; sha256 = "0b17zzl7bqnkn7a4pr3l6fxqfmxfld7izphrab5nvhc4wzng4spn"; }; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ perl ]; - meta = { + meta = with stdenv.lib; { description = "Turns other processes into daemons"; longDescription = '' Daemon turns other process into daemons. There are many tasks that need @@ -18,8 +21,8 @@ stdenv.mkDerivation { writing daemons in languages other than C, C++ or Perl (e.g. /bin/sh, Java). ''; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; }; } From ed368f0ffd6a2b10283e6f5aff802dc9f414e581 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Dec 2020 01:58:48 +0000 Subject: [PATCH 092/120] flyctl: 0.0.150 -> 0.0.151 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 9ac8a2cc2a31..0aa8c65e3cd6 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.150"; + version = "0.0.151"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "1wj3l32f9xpmqq91nzlxy8zgh1zkx4ckhc9r487agmv80bfjnzj2"; + sha256 = "0gd0cgzhikwa11mfpmvk0dp198vhlh09kjgk67xjj4gg9g61nkg9"; }; preBuild = '' From 9a0933df7ea3e79968023d4fe571a34975ee8cb3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Dec 2020 02:13:36 +0000 Subject: [PATCH 093/120] fava: 1.16 -> 1.17 --- pkgs/applications/office/fava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index d6b404f9db78..cee8098f4515 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.16"; + version = "1.17"; src = fetchPypi { inherit pname version; - sha256 = "436b6f9441a638f8028729c2a39c28433f7878c2af6ddb9bfccaeea9ea3086e1"; + sha256 = "efad3a4b5697b9d7ee29eff5dc0c8367fc1df37b1abacc8d0b2071602e94a6cd"; }; checkInputs = [ python3.pkgs.pytest ]; From 060eb8e5aa718534c7f1de68b3542d8b2423476a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Dec 2020 02:46:46 +0000 Subject: [PATCH 094/120] fluent-bit: 1.6.5 -> 1.6.6 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 486bdfdaa89d..2f736a63d977 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "0318fw04fman20hjdjsgix6fg4fp85mrsm3bb629kxn30xi6wsh3"; + sha256 = "0hkl0wb1xsq7z7gbmblq4fj42llw58lxgvm41z7bliq8a2qg3hv9"; }; nativeBuildInputs = [ cmake flex bison ]; From 01dbdd135b12c878dd8c2267eeddc491ee1cea16 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Dec 2020 03:05:11 +0000 Subject: [PATCH 095/120] flyway: 7.2.1 -> 7.3.0 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index f6c7bef1dc8b..1913e3d66f6e 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 = "7.2.1"; + version = "7.3.0"; 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 = "0b9pyy5avgr2wh3amnpwfc21i69mbw9a0xdxwg5wlrw83f5rx17w"; + sha256 = "0d5v0g28myqiac0a5qy0sbpf0mjzzi3agyks9cdzsgg3ka1i18q9"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From e68bef9c0ae872f79852f662265d60ebb13d55ef Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Wed, 2 Dec 2020 00:06:23 -0500 Subject: [PATCH 096/120] maintainers: add ethancedwards8 --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f2e33938e051..a5923e7af3d1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2749,6 +2749,16 @@ email = "adam.copp@gmail.com"; name = "Adam Copp"; }; + ethancedwards8 = { + email = "ethancarteredwards@gmail.com"; + github = "ethancedwards8"; + githubId = 60861925; + name = "Ethan Carter Edwards"; + keys = [{ + longkeyid = "rsa4096/0xF93DDAFA26EF2458"; + fingerprint = "0E69 0F46 3457 D812 3387 C978 F93D DAFA 26EF 2458"; + }]; + }; ethercrow = { email = "ethercrow@gmail.com"; github = "ethercrow"; From 4a636081ec9ae5d3368b8813064fb807325f3a27 Mon Sep 17 00:00:00 2001 From: Ethan Edwards Date: Wed, 2 Dec 2020 00:16:22 -0500 Subject: [PATCH 097/120] tmuxPlugins.dracula: init at unstable-2020-12-2 --- pkgs/misc/tmux-plugins/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index d47ab09e3c56..a99e93f23422 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -127,6 +127,24 @@ in rec { }; }; + dracula = mkDerivation rec { + pluginName = "dracula"; + version = "unstable-2020-12-2"; + src = fetchFromGitHub { + owner = "dracula"; + repo = "tmux"; + rev = "cc310e585acbeaf3304eda662476f7f657010b01"; + sha256 = "003nbv2rz2ihyqf3ryvdwn43ly0gi5z2r0pnqr9s9vw8dmwx0r3x"; + }; + meta = with stdenv.lib; { + homepage = "https://draculatheme.com/tmux"; + description = "A feature packed Dracula theme for tmux!"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ethancedwards8 ]; + }; + }; + fingers = mkDerivation rec { pluginName = "fingers"; rtpFilePath = "tmux-fingers.tmux"; From cf89444f1e31fb28192f8cd5583a14edcc48bed2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Dec 2020 05:50:47 +0000 Subject: [PATCH 098/120] gmsh: 4.7.0 -> 4.7.1 --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 41c9846b23b2..1b6dc2ae0076 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "03ij2hnh393gw59hgrz3qrmgc4qw82bc9nd98sks4jrp5gwk4zz2"; + sha256 = "0shwi41van3k0z6rnpl3sz5nh46xbyyljwfpcp8pwxbc26aw5169"; }; buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL From 4aa4333504abbff87d07503852b3727e050b6be3 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Mon, 30 Nov 2020 10:08:56 +0100 Subject: [PATCH 099/120] ruffle: init at nightly-2020-11-30 --- pkgs/misc/emulators/ruffle/default.nix | 49 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/misc/emulators/ruffle/default.nix diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix new file mode 100644 index 000000000000..f3518a647fa1 --- /dev/null +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -0,0 +1,49 @@ +{ alsaLib +, fetchFromGitHub +, openssl +, pkg-config +, python3 +, rustPlatform +, stdenv +, wayland +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "ruffle"; + version = "nightly-2020-11-30"; + + src = fetchFromGitHub { + owner = "ruffle-rs"; + repo = pname; + rev = version; + sha256 = "0z54swzy47laq3smficd3dyrs2zdi3cj2kb0b4hppjxpkkhiw4x0"; + }; + + nativeBuildInputs = [ + pkg-config + python3 + ]; + + buildInputs = [ + alsaLib + openssl + wayland + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXi + xorg.libxcb + xorg.libXrender + ]; + + cargoSha256 = "05kwfcbzjyyfhiqklhhlv06pinzw9bry4j8l9lk3k04c1q30gzkw"; + + meta = with stdenv.lib; { + description = "An Adobe Flash Player emulator written in the Rust programming language."; + homepage = "https://ruffle.rs/"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ govanify ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fc30afcfbaa..f605f51a0a3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6995,6 +6995,8 @@ in rubocop = callPackage ../development/tools/rubocop { }; + ruffle = callPackage ../misc/emulators/ruffle { }; + runelite = callPackage ../games/runelite { }; runningx = callPackage ../tools/X11/runningx { }; From 466daa42ad7a505fece1f2a37121891867a11f64 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Dec 2020 06:44:21 +0000 Subject: [PATCH 100/120] gitlab-pages: 1.28.0 -> 1.30.0 --- pkgs/servers/http/gitlab-pages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index bef6744d1312..0174f8af43f5 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.28.0"; + version = "1.30.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "15q32blkhmc5w1b2xh45y7cag8f6bw9bgiwin5ykrzj5d305wd16"; + sha256 = "0gn5lwn1lk1ghv6lw0fvax0m829w09mmq8flbmcxvszfyv7x0rix"; }; - vendorSha256 = "1gzkb2j2hl6ln8i5wjk2n9g8agpdzy1pzghb4sy1r8pdfp0i28r3"; + vendorSha256 = "08zma4b58b9132h41m6frbdi502yima9lkpab87fi0q5r6qwhf1z"; subPackages = [ "." ]; doCheck = false; # Broken From a1e8e2f09a1fb4c9077a5b75e35c82f4cb005825 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Dec 2020 06:09:15 +0000 Subject: [PATCH 101/120] python37Packages.goobook: 3.5 -> 3.5.1 --- pkgs/development/python-modules/goobook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index e183e79f5703..eb6aecfecd15 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "goobook"; - version = "3.5"; + version = "3.5.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1rmfyma3gwdf5mrw4l3j66y86fy8hgdbd0z4a5kck0kcm3hy34j9"; + sha256 = "6e69aeaf69112d116302f0c42ca1904f3b6efd17f15cefc12c866206160293be"; }; nativeBuildInputs = [ docutils installShellFiles ]; From 67650f71cdbddbd694cec49772042fdc32c7c15d Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 2 Dec 2020 08:03:38 +0100 Subject: [PATCH 102/120] nixos/tests/docker-tools.nix: Fix format --- nixos/tests/docker-tools.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 8e0e82d64cc7..3d1e39a379c1 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -117,7 +117,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) docker.wait_until_succeeds("curl -f http://localhost:8000/") docker.succeed( - "docker rm --force nginx", "docker rmi '${examples.nginx.imageName}'", + "docker rm --force nginx", + "docker rmi '${examples.nginx.imageName}'", ) with subtest("A pulled image can be used as base image"): From d14c0d0b6b97727247bfa596fdba1c02fdf177e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Dec 2020 05:08:36 +0000 Subject: [PATCH 103/120] gitkraken: 7.4.0 -> 7.4.1 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 8b93bf2176ac..4fc84767cd42 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.4.0"; + version = "7.4.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0ih0jxdm74vr4dgslhnl3llvi31zin0g2xjw6a4pdji2y2kajkzk"; + sha256 = "1c9cyxx5sqvnilf6xp3ildq3lwl6mj8v1vl0wzyjpaiqky99lj9p"; }; dontBuild = true; From ce9e06d376f3325a3243253acd1d594ea23dc153 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Nov 2020 02:56:23 +0000 Subject: [PATCH 104/120] python37Packages.flake8-debugger: 3.2.1 -> 4.0.0 --- .../flake8-debugger/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index 81b903621b52..46c63ec00085 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -1,26 +1,23 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder +{ lib, fetchPypi, buildPythonPackage, pythonOlder, pythonAtLeast, isPy27 , flake8 -, importlib-metadata , pycodestyle -, pytestrunner -, pytest +, six +, pytestCheckHook }: buildPythonPackage rec { pname = "flake8-debugger"; - version = "3.2.1"; + version = "4.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "712d7c1ff69ddf3f0130e94cc88c2519e720760bce45e8c330bfdcb61ab4090d"; + sha256 = "e43dc777f7db1481db473210101ec2df2bd39a45b149d7218a618e954177eda6"; }; - nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ flake8 pycodestyle six ]; - propagatedBuildInputs = [ flake8 pycodestyle ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; # Tests not included in PyPI tarball # FIXME: Remove when https://github.com/JBKahn/flake8-debugger/pull/15 is merged From fcee6d40ab2fb435abe9524be715090e5f76d0c0 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 19 Nov 2020 22:35:06 +0100 Subject: [PATCH 105/120] nbxplorer: 2.1.42 -> 2.1.46 --- .../blockchains/nbxplorer/default.nix | 4 +- .../blockchains/nbxplorer/deps.nix | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 76ca21ef9aaf..45143a797e5b 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.42"; + version = "2.1.46"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "01q6n7095rrha00xs3l7igzfb9rd743z8crxa2dcz4q5srapfzpi"; + sha256 = "1aph7yiwmch7s7x1qkzqv1shs3v6kg8i2s7266la0yp9ksf3w35p"; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index 65afa6b72c48..85d395089de1 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -31,8 +31,8 @@ }) (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.6.1"; - sha256 = "01ffm4nflqdb93vq4xl0j3377x360fgx6c6h12mpkcy85ixbv3rl"; + version = "16.7.1"; + sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -126,8 +126,8 @@ }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.6.1"; - sha256 = "0jjdg468jc6pv2z764f3xc19lcr772nzjm9cjfqq3bqw8vkpzmhv"; + version = "16.7.1"; + sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -156,13 +156,13 @@ }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.6.1"; - sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + version = "16.7.1"; + sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.6.1"; - sha256 = "0anzvb2mda548swb2ll1hv65knb8gwjm01hwbl0pzzr607my3lix"; + version = "16.7.1"; + sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -181,18 +181,23 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.19"; - sha256 = "12a3bf1pi6sq78z6h3clyczvycx7cjry8fby4fyi748wjwljjizz"; + version = "2.0.21"; + sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.11"; - sha256 = "09jrbq9p5k67kdic2038s7q299y2nc8ij6m55m3m8hys7jdrrv05"; + version = "2.0.12"; + sha256 = "1d6lmymc9x3p74c8hc2x3m61ncnkqqgrddw9cw2m0zkvilkncsns"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.54"; - sha256 = "0mx2gr8j8bc4mf1vi1fvqj3672qalxvzvincc61if79p46cik24b"; + version = "5.0.58"; + sha256 = "0qim9xbbj380254iyi1jsh2gnr90ddwd2593jw9a8bjwnlk7qr2c"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.60"; + sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -1061,8 +1066,8 @@ }) (fetchNuGet { name = "xunit.runner.visualstudio"; - version = "2.4.2"; - sha256 = "0fi85h43nyrhfc5jzg07znh01r7cpb7bpjdc6mzb9z1pm14ppfm6"; + version = "2.4.3"; + sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) (fetchNuGet { name = "xunit"; From 4ad4f395d1163f037a2d9f0ff36fc38e38369599 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 19 Nov 2020 22:35:07 +0100 Subject: [PATCH 106/120] btcpayserver: 1.0.5.5 -> 1.0.5.9 --- .../blockchains/btcpayserver/default.nix | 26 ++++++----------- .../blockchains/btcpayserver/deps.nix | 29 ++++++++----------- 2 files changed, 21 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index eec39e691a88..3958a44cdafe 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,19 +15,17 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.0.5.5"; + version = "1.0.5.9"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "11h1nrmb7f44msbhhiz9ddqh5ss2kz6d8ysnvd070x3xj5krgnxz"; + sha256 = "011pp94i49fx587ng16m6ml63vwiysjvpkijihrk6xamz78zddgx"; }; - nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget ]; + nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; - # Due to a bug in btcpayserver, we can't just `dotnet publish` to create a binary. - # Build with `dotnet build` instead and add a custom `dotnet run` script. buildPhase = '' export HOME=$TMP/home export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -37,21 +35,15 @@ stdenv.mkDerivation rec { nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj - dotnet build -c Release BTCPayServer/BTCPayServer.csproj - ''; - - runScript = '' - #!${bash}/bin/bash - DOTNET_CLI_TELEMETRY_OPTOUT=1 exec ${dotnetSdk}/bin/dotnet run --no-launch-profile --no-build \ - -c Release -p @@SHARE@@/BTCPayServer/BTCPayServer.csproj -- "$@" + dotnet publish --no-restore --output $out/share/$pname -c Release BTCPayServer/BTCPayServer.csproj ''; + # btcpayserver requires the publish directory as its working dir + # https://github.com/btcpayserver/btcpayserver/issues/1894 installPhase = '' - cd .. - share=$out/share/$pname - mkdir -p $share - mv -T source $share - install -D -m500 <(echo "$runScript" | sed "s|@@SHARE@@|$share|") $out/bin/$pname + makeWrapper $out/share/$pname/BTCPayServer $out/bin/$pname \ + --set DOTNET_ROOT "${dotnetSdk}" \ + --run "cd $out/share/$pname" ''; dontStrip = true; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index cb0641b8c852..5ee5e2612115 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -21,8 +21,8 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.All"; - version = "1.2.3"; - sha256 = "1vx47rb505904pz30n5jzc9x42pcfln695l31q4dv5p4fbf10g4q"; + version = "1.2.4"; + sha256 = "1f4wgs8ijk1wmppz5lmas7l6m83szz57jyk6ak0dxhccdld9rdaj"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Charge"; @@ -31,8 +31,8 @@ }) (fetchNuGet { name = "BTCPayServer.Lightning.CLightning"; - version = "1.2.0"; - sha256 = "0a47fz20ngcz90h2y01isi2h940jljcmnfy6wyknj029sii7i1zs"; + version = "1.2.1"; + sha256 = "14km69jzmnyqg19w27g6znml4z0xkm8l4j7rj0x36bw67cjmgahv"; }) (fetchNuGet { name = "BTCPayServer.Lightning.Common"; @@ -706,8 +706,8 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.16"; - sha256 = "0fsdb96k5lwyq4d7h7yg91qghima08yk0bsw5cvr4h2jsfphk423"; + version = "2.0.21"; + sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1"; }) (fetchNuGet { name = "NBitcoin"; @@ -726,13 +726,8 @@ }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.45"; - sha256 = "102vwxwkg367yxv26hycnc7hjxlv2zvsgr8g6adw8dmzsxck5fwk"; - }) - (fetchNuGet { - name = "NBitcoin"; - version = "5.0.51"; - sha256 = "0rg014sl7rqscnranwyfk41xfr5ccjqyx7aidfl5mh0znz44db2g"; + version = "5.0.60"; + sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v"; }) (fetchNuGet { name = "NBitpayClient"; @@ -741,8 +736,8 @@ }) (fetchNuGet { name = "NBXplorer.Client"; - version = "3.0.17"; - sha256 = "0xx2xshgpci9l9883zpqnmgchpizygy0hcq2wp2ch6yf3hbrj9qq"; + version = "3.0.19"; + sha256 = "0nahfxdsryf5snjy87770m51v2jcry02lmb10ilsg4h2ig4pjdk4"; }) (fetchNuGet { name = "NETStandard.Library"; @@ -956,8 +951,8 @@ }) (fetchNuGet { name = "Selenium.WebDriver.ChromeDriver"; - version = "83.0.4103.3900"; - sha256 = "17j9b637209nm5cs5sgr3vflphkhaxpm8bcjizhgj65r52gn17as"; + version = "85.0.4183.8700"; + sha256 = "0klyqmwa6yc0ibbmci51mzb2vl6n13qlk06chc9w78i0a43fs382"; }) (fetchNuGet { name = "Selenium.WebDriver"; From 7a114e5976ab6fe3972e263893144e8e8f55fcb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 2 Dec 2020 07:54:50 +0100 Subject: [PATCH 107/120] python3Packages.transformers: 3.5.1 -> 4.0.0 Remove the sentencepiece dependency, since it is optional now. Changes: https://github.com/huggingface/transformers/releases/tag/v4.0.0 --- .../python-modules/transformers/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index d3559d319089..39fd7a11d0df 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , boto3 +, cookiecutter , filelock , regex , requests @@ -9,7 +10,6 @@ , parameterized , protobuf , sacremoses -, sentencepiece , timeout-decorator , tokenizers , tqdm @@ -18,23 +18,23 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.5.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "02z5zz0rq7mbgdmsm2ccfdbca57qy7iqp0vc7jspsmdfif4acwia"; + sha256 = "17djq32pq8d6vqip7i9pda0ldigmzckbbcd278llmpxdriqd4llg"; }; propagatedBuildInputs = [ + cookiecutter filelock numpy protobuf regex requests sacremoses - sentencepiece tokenizers tqdm ]; @@ -47,8 +47,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "tokenizers == 0.9.3" "tokenizers" \ - --replace "sentencepiece == 0.1.91" "sentencepiece" + --replace "tokenizers == 0.9.4" "tokenizers" ''; preCheck = '' From 20c4760d58103244fdd10eaf20d77c1e58aae444 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 21:34:43 +0000 Subject: [PATCH 108/120] ocamlPackages.integers: 0.3.0 -> 0.4.0 --- pkgs/development/ocaml-modules/integers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index a949b339c729..ca14c3ca8739 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "integers"; - version = "0.3.0"; + version = "0.4.0"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; - sha256 = "1yhif5zh4srh63mhimfx3p5ljpb3lixjdd3i9pjnbj2qgpzlqj8p"; + sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; }; meta = { From 6f850ae44596d39c474e21527504e74bdff25a34 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 21:13:34 +0000 Subject: [PATCH 109/120] ocamlPackages.ctypes: 0.16.0 -> 0.17.1 --- pkgs/development/ocaml-modules/ctypes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index e541f0741a6e..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.16.0"; + version = "0.17.1"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "0qh2gfx5682wkk2nm1ybspzz9c2xvlnnf6iv08a89kbwa1hvdqrg"; + sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; }; nativeBuildInputs = [ pkgconfig ]; From d668ebf129f7e319e25e2a6e1e6ea5de83e5de39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Dec 2020 01:48:34 +0000 Subject: [PATCH 110/120] tridactyl-native: 1.20.2 -> 1.20.3 --- pkgs/tools/networking/tridactyl-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index c0a132b481e1..1ebd8d8be6a2 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.20.2"; + version = "1.20.3"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "0yz1vbqa3sppkjmny5ipnspsdi5gnix7wb6hzvdkm9h1rj2kb8ci"; + sha256 = "064cl9m4hdv69q1af0xjcf2rf30n3pvz6ym2l53w90aq3217amps"; }; sourceRoot = "source/native"; From 0c5e9403298adcb68877c6e46e72882eb243313f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 21:43:43 +0000 Subject: [PATCH 111/120] ocamlPackages.stdlib-shims: 0.1.0 -> 0.2.0 --- pkgs/development/ocaml-modules/stdlib-shims/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/stdlib-shims/default.nix b/pkgs/development/ocaml-modules/stdlib-shims/default.nix index d76ec29e63aa..4079cb625d11 100644 --- a/pkgs/development/ocaml-modules/stdlib-shims/default.nix +++ b/pkgs/development/ocaml-modules/stdlib-shims/default.nix @@ -2,10 +2,10 @@ buildDunePackage rec { pname = "stdlib-shims"; - version = "0.1.0"; + version = "0.2.0"; src = fetchurl { url = "https://github.com/ocaml/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1jv6yb47f66239m7hsz7zzw3i48mjpbvfgpszws48apqx63wjwsk"; + sha256 = "0nb5flrczpqla1jy2pcsxm06w4jhc7lgbpik11amwhfzdriz0n9c"; }; minimumOCamlVersion = "4.02"; doCheck = true; From b999879206bfacb5ebe9291a79b436a26870afa8 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Tue, 1 Dec 2020 21:34:37 -0800 Subject: [PATCH 112/120] docker: 19.03.13 -> 19.03.14 --- pkgs/applications/virtualization/docker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 5df0ae39a251..1d55744efb49 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -212,14 +212,14 @@ rec { }; docker_19_03 = makeOverridable dockerGen rec { - version = "19.03.13"; + version = "19.03.14"; rev = "v${version}"; - sha256 = "139qqy8jiz1phnngknpa7c1nk9iqwd3hcc9as8x50p1vnycwzr3f"; + sha256 = "0szr5dgfrypb5kyj5l1rf7rw4iqj0d0cyx6skdqlbgf4dqwa6g9y"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; # Note: Once all packaged Docker versions use containerd <=1.2 or >=1.4 remove the libseccomp and pkgconfig inputs above - containerdRev = "8fba4e9a7d01810a393d5d25a3621dc101981175"; # v1.3.7 - containerdSha256 = "10zy507ajslizicagb64dvbs7wmw0j4x3hdhygbdh4g2nv3mgjb7"; + containerdRev = "ea765aba0d05254012b0b9e595e995c09186427f"; # v1.3.9 + containerdSha256 = "1isi1wgq61b4l0lxy1d8n6dnmcb8s5ihn2yqjb6525y3dj5c5i1j"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; From e76e8cf22e8639250266df96a90f4746c9c34f95 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 2 Dec 2020 09:08:02 +0100 Subject: [PATCH 113/120] openresty: 1.17.8 -> 1.19.3 Also, add a quick comment about what fixPatch does. --- pkgs/servers/http/openresty/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 734dfb041403..964517649900 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -8,15 +8,19 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.17.8"; - version = "${nginxVersion}.2"; + nginxVersion = "1.19.3"; + version = "${nginxVersion}.1"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "1813w33hjm1hcqvl3b3f67qgi5zfjiqg6s01hiy12a5j3jqilcig"; + sha256 = "0p9xn0xgbk6nmjfb25a3d6bwxm8q23igkixqma5fpygla6fcsvzk"; }; - fixPatch = patch: let name = patch.name or (builtins.baseNameOf patch); in + # generic.nix applies fixPatch on top of every patch defined there. This + # allows updating the patch destination, as openresty has nginx source code + # in a different folder. + fixPatch = patch: + let name = patch.name or (builtins.baseNameOf patch); in runCommand "openresty-${name}" { src = patch; } '' substitute $src $out \ --replace "a/" "a/bundle/nginx-${nginxVersion}/" \ @@ -40,9 +44,9 @@ callPackage ../nginx/generic.nix args rec { meta = { description = "A fast web application server built on Nginx"; - homepage = "http://openresty.org"; - license = lib.licenses.bsd2; - platforms = lib.platforms.all; + homepage = "http://openresty.org"; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ]; }; } From 043c667f319ba395af39fd5534e17f7b3eeffb18 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 2 Dec 2020 18:27:57 +1000 Subject: [PATCH 114/120] sqlite-analyzer: remove separate file Moved to a shared package with sqldiff in: e714798f27be8a48a0712baf2b150f0e1c7ceeb9 --- .../development/libraries/sqlite/analyzer.nix | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 pkgs/development/libraries/sqlite/analyzer.nix diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix deleted file mode 100644 index d0100edd345b..000000000000 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, unzip, sqlite, tcl }: - -let - archiveVersion = import ./archive-version.nix stdenv.lib; -in - -stdenv.mkDerivation rec { - pname = "sqlite-analyzer"; - version = "3.33.0"; - - src = assert version == sqlite.version; fetchurl { - url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1f09srlrmcab1sf8j2d89s2kvknlbxk7mbsiwpndw9mall27dgwh"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ tcl ]; - - makeFlags = [ "sqlite3_analyzer" ]; - - installPhase = "install -Dt $out/bin sqlite3_analyzer"; - - meta = with stdenv.lib; { - description = "A tool that shows statistics about SQLite databases"; - downloadPage = "http://sqlite.org/download.html"; - homepage = "https://www.sqlite.org"; - license = licenses.publicDomain; - maintainers = with maintainers; [ pesterhazy ]; - platforms = platforms.unix; - }; -} From d832774343ced6839bbb4e2214de2639ba705bd4 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 24 Nov 2020 00:34:07 -0300 Subject: [PATCH 115/120] flood: init at 4.1.2 --- pkgs/development/node-packages/default.nix | 4 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1073 +++++++++-------- pkgs/top-level/all-packages.nix | 2 + 4 files changed, 605 insertions(+), 475 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 908b48968456..c8694a46bd14 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -59,6 +59,10 @@ let buildInputs = [ pkgs.phantomjs2 ]; }; + flood = super.flood.override { + buildInputs = [ self.node-pre-gyp ]; + }; + expo-cli = super."expo-cli".override (attrs: { # The traveling-fastlane-darwin optional dependency aborts build on Linux. dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") attrs.dependencies; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8604015d88b3..e2a2110fa6fc 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -80,6 +80,7 @@ , {"fast-cli": "1.x"} , "fauna-shell" , "fkill-cli" +, "flood" , "forever" , "fx" , "get-graphql-schema" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1c88382c29b6..d1ead03f5924 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1381,22 +1381,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.5.1" = { + "@bugsnag/browser-7.5.3" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.5.1"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.1.tgz"; - sha512 = "NLWgSj3elYGSkdth666UxQ6r5Y/zAMidnQZRnOW2ZsW+4W/q+hr7zoN4v5IUnZuoSTQ9QxVYY99wA4hqlDyoJg=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.3.tgz"; + sha512 = "iGmKFtHz91hNovWW8rb/qLD9X5TMVEc7OUEfwE5s1M8ElReEmUAVbgTfQjkahG8aHvjGQ+M+zyM0gHfk+tTczg=="; }; }; - "@bugsnag/core-7.3.5" = { + "@bugsnag/core-7.5.3" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.3.5"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.3.5.tgz"; - sha512 = "7zKFLcA6m9aaQ1p1AQx2iRaT3gE/MJqy0vGa/RhlKNdgMdMKYRGECWxJE66firvJT5ZwL7Bu11IkK6sLWHCBaw=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.5.3.tgz"; + sha512 = "HaAPWN+z3ZlEjwF2JeuAx83eKoVd6osgx2Hyn8dlmGsRfUvpi+7rG9DI483PGexEM0O6i/ORvD6Qx92/E9zW7w=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1408,22 +1408,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.5.1" = { + "@bugsnag/js-7.5.3" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.5.1"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.1.tgz"; - sha512 = "acbq392QYjZNtUHa5tTp+MLTBhNZhI4s6EBrEFqN1TdxrVVGEFfnQqrPISfKtOJ+FW1dZEZiQ0oEGJ127htqIQ=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.3.tgz"; + sha512 = "xdwfq+bQPWZFwc02IIFk7rVsxoEsAMOLiZLJpjnRK/HtzwWPUciMTRIIlUzb/uZaAmd05UieVQ/TxuwQYdMgEA=="; }; }; - "@bugsnag/node-7.3.5" = { + "@bugsnag/node-7.5.3" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.3.5"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.3.5.tgz"; - sha512 = "eN06NgphKYikBq/AXpiLO9tNx1H7cz8C78oQnR5fj2POulj+Zm9njr9dM6DEzGIvBDt952SwwcOA73jAiOmztQ=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.5.3.tgz"; + sha512 = "irNGOTcxi7u8lUziLfv7rKzWGg2Yd+ZXZnwD0r6ZDhdlOwA3UnGq6Fud3SOTJNKPcUk/16Sv0mcuKkcLdHTodg=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1705,22 +1705,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.16" = { + "@expo/config-3.3.18" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.16"; + version = "3.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.16.tgz"; - sha512 = "iEjyV8OfaA0fPPsKYkkcod6wCd6sAtWOxAAT+7xriGqJV5aYnpL1hcBxPkPKavYzWMJUEEOwajmqoJy1uVP6ig=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.18.tgz"; + sha512 = "R78HOWnLcxdip3FBrfbxti+85jdoRNpXV0Eihb6dl+sBRNo4+uzBNEQQ1P7ICoTzrehdkhdXkQYflvQFuQXyAA=="; }; }; - "@expo/config-plugins-1.0.3" = { + "@expo/config-plugins-1.0.5" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.3.tgz"; - sha512 = "Tc17MLfNIHl7h+YmE4cEvIK4WZq5fFShdrXJGNoNmubJ6xPeqDTLL7qCVNSzckkU4+XgfV1qt5uU+qezZLvbCw=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.5.tgz"; + sha512 = "ykEHIZu7Xjnq7wgauXw0cSbo9C2SVvDmCRwyAJoReJ88R0xXOt+4GQJ6BYdmGv9Gmdt6DTrWqwMQOJK6GmoMew=="; }; }; "@expo/config-types-40.0.0-beta.1" = { @@ -1741,22 +1741,22 @@ let sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ=="; }; }; - "@expo/dev-server-0.1.41" = { + "@expo/dev-server-0.1.43" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.41"; + version = "0.1.43"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.41.tgz"; - sha512 = "Mgqm79SE01bXiOG5DsJyuP/FAszkGKC22rfvjGb0tCVHbcvuVLjxm2fnnylBj9FRcTW6Rz3hAB1RaC5RayqNcg=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.43.tgz"; + sha512 = "FYLMoI7c1Myw5vCyx7nMEW6Oos40wx28TuHcticKPU+zZiYrzyIa4aJzEv4bWnw1if6417lKXjncYvQEZRyxFw=="; }; }; - "@expo/dev-tools-0.13.62" = { + "@expo/dev-tools-0.13.65" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.62"; + version = "0.13.65"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.62.tgz"; - sha512 = "6DeV6VxdJFPz7xYwNgIvb5GGRweHC9dS/XkkKic7Nm0c8FV+BPEm0Z/JThJ76fliTFiUPB6L7hNNCLbzObW9Zw=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.65.tgz"; + sha512 = "LhfxPzJuKPi3WlK5C5o9ejJOkscU6pCqHKRWI97zN8Xh6XJ6FMNfqgh+hJ94vqWAMmDpEBjY3e7MxZXqQaNaAQ=="; }; }; "@expo/eas-build-job-0.1.2" = { @@ -1786,13 +1786,13 @@ let sha512 = "KFX6grWVzttaDskq/NK8ByqFPgpDZGFnyeZVeecGoKx5kU61zuR7/xQM04OvN6BNXq3jTUst1TyS8fXEfJuscA=="; }; }; - "@expo/metro-config-0.1.41" = { + "@expo/metro-config-0.1.43" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.41"; + version = "0.1.43"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.41.tgz"; - sha512 = "eq2FT7/KCwQSW5R5iMLu2a8amwZ7Oz3tUIKWZtbpj6LCPbRyrF+htnjsO1eIQJ02QDE1HIs2cxFeUHjoWJSh7g=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.43.tgz"; + sha512 = "ZkZXu2dVjZ88tiH51gqM3DUAmey18tM9MlDh91r1iLF6hHT6UeZD0lBDN7IJTQv/SJuAPQHoylXmAx6cuIGU9A=="; }; }; "@expo/ngrok-2.4.3" = { @@ -1993,22 +1993,22 @@ let sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; }; }; - "@expo/webpack-config-0.12.46" = { + "@expo/webpack-config-0.12.48" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.46"; + version = "0.12.48"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.46.tgz"; - sha512 = "lVOmaBAKrw2PO1TsEOkeCFLLxGuWcoHpAeN/SgVKcQCKZuSAYqTG5qf4Rino7TdVjbCOu+Apec4AIyg2oW6Y8w=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.48.tgz"; + sha512 = "uUmr+z9gpMNw6yUGinQkkN/GDPypLvySs/0pwUBF9w7xfaGeRKoEGYhNS8JaIXgmR3621eKi3F2pBlSoSFfiew=="; }; }; - "@expo/xdl-59.0.2" = { + "@expo/xdl-59.0.5" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "59.0.2"; + version = "59.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.2.tgz"; - sha512 = "hTwJkac/+y5arWDZnQCb3lbOsgiz5tyY+ikr1LHcO8emiPpctY98H9v7MKwsxu6GsXfmwrztqgtkVBRviKh56A=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.5.tgz"; + sha512 = "JWQDKG+Eymgwm3xd2OAkTSpb3fgNetQFJHGZt4/2GUfqjQuyFWZMtmtKwJ2ZDaW+V8tNW0hgR5czWI/lsZSZnA=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2146,13 +2146,13 @@ let sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q=="; }; }; - "@graphql-tools/delegate-7.0.5" = { + "@graphql-tools/delegate-7.0.7" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "7.0.5"; + version = "7.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.5.tgz"; - sha512 = "wkB/L9cRxlPB4m9k9WQJZYPbnRxfEu2bkxvI9pVGHMsmoQxMZiM2GkhCBHDTBYJb7cxCS6Wv3LJb1w0iEqw24w=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.7.tgz"; + sha512 = "2sze+CJxu37b4jcQ4fyj6ap9TMnx8+NBtApSs1nWIVENzPE2510aNTsBHgSdTwSeV/tVIFkAtZZAlMEGYGXzQA=="; }; }; "@graphql-tools/graphql-file-loader-6.2.6" = { @@ -2191,22 +2191,22 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.5" = { + "@graphql-tools/merge-6.2.6" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.5"; + version = "6.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.5.tgz"; - sha512 = "T2UEm7L5MeS1ggbGKBkdV9kTqLqSHQM13RrjPzIAYzkFL/mK837sf+oq8h2+R8B+senuHX8akUhMTcU85kcMvw=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.6.tgz"; + sha512 = "G6x0QlIzFHoJ3dyF9a4gxmBtaEYJ+EoAAGqXHsE/drRr58K1jscQdfKZdF1wZWZgxkgakHqgt1+oFMeQg/O6ug=="; }; }; - "@graphql-tools/schema-7.1.0" = { + "@graphql-tools/schema-7.1.2" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "7.1.0"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.0.tgz"; - sha512 = "1TwaRfWOfxtTqk8ckBrLi3283Sl0tQmUleAnelID1mql4YgYyArrKRkHfWZs9DbydngTxj/uV10aLYioJMR6tQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.2.tgz"; + sha512 = "GabNT51ErVHE2riDH4EQdRusUsI+nMElT8LdFHyuP53v8gwtleAj+LePQ9jif4NYUe/JQVqO8V28vPcHrA7gfQ=="; }; }; "@graphql-tools/url-loader-6.4.0" = { @@ -2227,22 +2227,22 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.1.0" = { + "@graphql-tools/utils-7.1.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.1.0"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.1.0.tgz"; - sha512 = "lMTgy08BdqQ31zyyCRrxcKZ6gAKQB9amGKJGg0mb3b4I3iJQKeaw9a7T96yGe1frGak1UK9y7OoYqx8RG7KitA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.1.2.tgz"; + sha512 = "xFuhDyGMhaXTQpq48vjjCLA1VWc3fEo4n+zBcvQnbBSqhVPwAVa0ANcpb0NHmU9c3ypch26kK85TmC/HoK3YRg=="; }; }; - "@graphql-tools/wrap-7.0.1" = { + "@graphql-tools/wrap-7.0.3" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "7.0.1"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.1.tgz"; - sha512 = "0feqjgEJSRLm2V0kEUaV2dw7ukVPjRujYMqNdcqHsIyXmf0VO8PGF5hcva/+5U/9Yfbf3Fck+P5JTJ5MlXPlsQ=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.3.tgz"; + sha512 = "co+ELAwZwMut7qGZow8ATMQlYOU2G3/gsEqz/SUAt7XizXWOOguSFjQKk1/OwHzgCFBbEjvwfoERcv6QC1EUxA=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -3406,13 +3406,13 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.136" = { + "@microsoft/load-themed-styles-1.10.138" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.136"; + version = "1.10.138"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.136.tgz"; - sha512 = "D8wWUiW7HQKFp4Qgy5GsDvEymKew/4uK+4dSWSO/+6LfSI15kqDNS7g4Nf/VxL5FBmjwXqQV1d59ucgWiKUjJg=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.138.tgz"; + sha512 = "TDY8c3CnIbysFIQ8Lj/ZujLkvDB/jrnVOx6FDJICFfo1Jbcyia+nIbUkOJtXtTGK/sx/zfyYJxgFgKQEAtKLHQ=="; }; }; "@mozilla/readability-0.3.0" = { @@ -3460,13 +3460,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-5.3.3" = { + "@netlify/build-5.5.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "5.3.3"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.3.tgz"; - sha512 = "PgAPLFZeHeR45mM2km/UHXfg/3K9NtrGKAaoG7vwU36XYEaVaB/psBp0PzrfJbRiBER+vqnxrDTOyHJc4Z0w1g=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-5.5.2.tgz"; + sha512 = "599fcS/FVJUMjnF5NS0QGwZ6B8uw7ROL50z6VfrHbdgpcHgoSCo3HNHeeIA6bfA4pO/IdnmRFOX4fDJgKPsbLw=="; }; }; "@netlify/cache-utils-1.0.6" = { @@ -3487,13 +3487,13 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.4.0" = { + "@netlify/config-2.4.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.0.tgz"; - sha512 = "MDp7A7AMHVOHpvX+o69t+c8nZjVtkxNcepxsSqE+9wuPVlSHWCqzkHVxKQU0ozuk74z/xHBRUpp/OMCXkiEugg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.4.1.tgz"; + sha512 = "fSRSN3+c5kcyaCEd7XVlPRz820y/CRS8ryuE2fZAT/sgXiGBPGGKHwSKMNlso7s0qtJOmFyjeehU6nEzvfNKrg=="; }; }; "@netlify/functions-utils-1.3.2" = { @@ -3532,6 +3532,15 @@ let sha512 = "ZgabL4Q+DfB5lqq36QYvGIhLifoiVz5oDfqLp1w7hRsJYwUhUPqeJx/0zph17ZaJB4CvHRadFOeyJeDSkzrERg=="; }; }; + "@netlify/plugins-list-2.0.0" = { + name = "_at_netlify_slash_plugins-list"; + packageName = "@netlify/plugins-list"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.0.0.tgz"; + sha512 = "GU0u0fnVqNTU32hVr7ig7bGG3/851a0SNjC9nl+iu4Eadax/hfCVSRoSffU0+d05UtXlLhkcgmuYnLySkTR8DA=="; + }; + }; "@netlify/run-utils-1.0.5" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; @@ -3577,13 +3586,13 @@ let sha512 = "u6Beazs0KWRcEx9q2n417Sj7+WGrDTtDGmmKPTE6WexFt6uY1oiq3AR+ohCtu1lIIsmAfAYd8O5dSOnyAT8dFg=="; }; }; - "@netlify/zip-it-and-ship-it-1.4.2" = { + "@netlify/zip-it-and-ship-it-1.5.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "1.4.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.2.tgz"; - sha512 = "iwwKQrBnLONYm1x7g6GZvHmjeZ03/L2NUYL/2NcpNYtE4sWB+M5OTDdnlVsu8u65dR7wtH4hKjOO2ID6vS7rQQ=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.5.0.tgz"; + sha512 = "hTUVtCdjrWso28Lwi+A9GO+WZhVJcJWvXO0YuYlBcGY67Lv61TQQl7nNvzgGYG7UNnzvsnTafe1pL2v+4u4vmg=="; }; }; "@node-red/editor-api-1.2.6" = { @@ -3892,22 +3901,31 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@octokit/auth-token-2.4.3" = { + "@octokit/auth-token-2.4.4" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.3.tgz"; - sha512 = "fdGoOQ3kQJh+hrilc0Plg50xSfaCKOeYN9t6dpJKXN9BxhhfquL0OzoQXg3spLYymL5rm29uPeI3KEXRaZQ9zg=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.4.tgz"; + sha512 = "LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q=="; }; }; - "@octokit/endpoint-6.0.9" = { + "@octokit/endpoint-6.0.10" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.9"; + version = "6.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.9.tgz"; - sha512 = "3VPLbcCuqji4IFTclNUtGdp9v7g+nspWdiCUbK3+iPMjJCZ6LEhn1ts626bWLOn0GiDb6j+uqGvPpqLnY7pBgw=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.10.tgz"; + sha512 = "9+Xef8nT7OKZglfkOMm7IL6VwxXUQyR7DUSU0LH/F7VNqs8vyd7es5pTfz9E7DwUIx7R3pGscxu1EBhYljyu7Q=="; + }; + }; + "@octokit/openapi-types-1.2.2" = { + name = "_at_octokit_slash_openapi-types"; + packageName = "@octokit/openapi-types"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-1.2.2.tgz"; + sha512 = "vrKDLd/Rq4IE16oT+jJkDBx0r29NFkdkU8GwqVSP4RajsAvP23CMGtFhVK0pedUhAiMvG1bGnFcTC/xCKaKgmw=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -3946,13 +3964,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.10" = { + "@octokit/request-5.4.11" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.10"; + version = "5.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.10.tgz"; - sha512 = "egA49HkqEORVGDZGav1mh+VD+7uLgOxtn5oODj6guJk0HCy+YBSYapFkSLFgeYj3Fr18ZULKGURkjyhkAChylw=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.11.tgz"; + sha512 = "vskebNjuz4oTdPIv+9cQjHvjk8vjrMv2fOmSo6zr7IIaFHeVsJlG/C07MXiSS/+g/qU1GHjkPG1XW3faz57EoQ=="; }; }; "@octokit/request-error-1.2.1" = { @@ -3964,13 +3982,13 @@ let sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; }; }; - "@octokit/request-error-2.0.3" = { + "@octokit/request-error-2.0.4" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.3.tgz"; - sha512 = "GgD5z8Btm301i2zfvJLk/mkhvGCdjQ7wT8xF9ov5noQY8WbKZDH9cOBqXzoeKd1mLr1xH2FwbtGso135zGBgTA=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.4.tgz"; + sha512 = "LjkSiTbsxIErBiRh5wSZvpZqT4t0/c9+4dOe0PII+6jXR+oj/h66s7E4a/MghV7iT8W9ffoQ5Skoxzs96+gBPA=="; }; }; "@octokit/rest-16.43.2" = { @@ -3991,13 +4009,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-5.5.0" = { + "@octokit/types-6.0.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "5.5.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz"; - sha512 = "UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.0.1.tgz"; + sha512 = "H/DnTKC+U09en2GFLH/MfAPNDaYb1isieD4Hx4NLpEt/I1PgtZP/8a+Ehc/j9GHuVF/UvGtOVD8AF9XXvws53w=="; }; }; "@opencensus/core-0.0.8" = { @@ -4585,13 +4603,13 @@ let sha512 = "rmuSC2JFFl4DkPDdGVrmffT9KcbG2AB5jvhxPIrOc1dO9mHRMUUftQY35KZlvWqqSSqVn+AM+J9dhiTo1ZqR8A=="; }; }; - "@rollup/plugin-babel-5.2.1" = { + "@rollup/plugin-babel-5.2.2" = { name = "_at_rollup_slash_plugin-babel"; packageName = "@rollup/plugin-babel"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz"; - sha512 = "Jd7oqFR2dzZJ3NWANDyBjwTtX/lYbZpVcmkHrfQcpvawHs9E4c0nYk5U2mfZ6I/DZcIvy506KZJi54XK/jxH7A=="; + url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.2.tgz"; + sha512 = "MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA=="; }; }; "@rollup/plugin-commonjs-13.0.2" = { @@ -4900,6 +4918,15 @@ let sha512 = "CWr7a3rTVrN5Vs8GYReRAvTourbXHOqB1zglcskj05ICH4GZL5BOAza2ARai+qc3Nz0nY08Bozi1x0014KOqlg=="; }; }; + "@snyk/cli-interface-2.11.0" = { + name = "_at_snyk_slash_cli-interface"; + packageName = "@snyk/cli-interface"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.11.0.tgz"; + sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; + }; + }; "@snyk/cli-interface-2.9.1" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; @@ -4909,15 +4936,6 @@ let sha512 = "2zHRvEt4S0DO+hPRX3hp5ssELouJqgb/JUTmPDMr/32r//qooSTxojwSvAK2A6VYgYOHuo1S3VTpsSP/ywkPXA=="; }; }; - "@snyk/cli-interface-2.9.2" = { - name = "_at_snyk_slash_cli-interface"; - packageName = "@snyk/cli-interface"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz"; - sha512 = "C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng=="; - }; - }; "@snyk/cocoapods-lockfile-parser-3.5.2" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; @@ -5143,13 +5161,13 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; - "@tencent-sdk/capi-1.1.6" = { + "@tencent-sdk/capi-1.1.8" = { name = "_at_tencent-sdk_slash_capi"; packageName = "@tencent-sdk/capi"; - version = "1.1.6"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.6.tgz"; - sha512 = "3Ietq/r8B/CQu94qXr4YrNE79p5emhtMI6szHh/cD9xz1/6OOUwW/agcCO1748v94jjxOFEspAvva6jGVriuGA=="; + url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.8.tgz"; + sha512 = "AmyMQndtxMsM59eDeA0gGiw8T2LzNvDhx/xl+ygFXXrsw+yb/mit73ndHkiHKcRA1EpNHTyD1PN9ATxghzplfg=="; }; }; "@textlint/ast-node-types-4.3.4" = { @@ -5872,13 +5890,13 @@ let sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; }; }; - "@types/jscodeshift-0.7.1" = { + "@types/jscodeshift-0.7.2" = { name = "_at_types_slash_jscodeshift"; packageName = "@types/jscodeshift"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jscodeshift/-/jscodeshift-0.7.1.tgz"; - sha512 = "4jkASx74qGl2OUK8NNFEq10QP0MXriOIqeBeNb1IdevHP8k8VDqS5Uv6nIixAA6ZUjjF6/SwOvecrjXkbcaFzw=="; + url = "https://registry.npmjs.org/@types/jscodeshift/-/jscodeshift-0.7.2.tgz"; + sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; }; }; "@types/json-schema-7.0.6" = { @@ -6088,13 +6106,13 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.47" = { + "@types/node-10.17.48" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.47"; + version = "10.17.48"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.47.tgz"; - sha512 = "YZ1mMAdUPouBZCdeugjV8y1tqqr28OyL8DYbH5ePCfe9zcXtvbh1wDBy7uzlHkXo3Qi07kpzXfvycvrkby/jXw=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.48.tgz"; + sha512 = "Agl6xbYP6FOMDeAsr3QVZ+g7Yzg0uhPHWx0j5g4LFdUBHVtqtU+gH660k/lCEe506jJLOGbEzsnqPDTZGJQLag=="; }; }; "@types/node-12.7.12" = { @@ -6106,13 +6124,13 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.33" = { + "@types/node-13.13.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.33"; + version = "13.13.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.33.tgz"; - sha512 = "1B3GM1yuYsFyEvBb+ljBqWBOylsWDYioZ5wpu8AhXdIhq20neXS7eaSC8GkwHE0yQYGiOIV43lMsgRYTgKZefQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.34.tgz"; + sha512 = "g8D1HF2dMDKYSDl5+79izRwRgNPsSynmWMbj50mj7GZ0b7Lv4p8EmZjbo3h0h+6iLr6YmVz9VnF6XVZ3O6V1Ug=="; }; }; "@types/node-14.11.1" = { @@ -10030,13 +10048,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.799.0" = { + "aws-sdk-2.800.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.799.0"; + version = "2.800.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.799.0.tgz"; - sha512 = "NYAoiNU+bJXhlJsC0rFqrmD5t5ho7/VxldmziP6HLPYHfOCI9Uvk6UVjfPmhLWPm0mHnIxhsHqmsNGyjhHNYmw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.800.0.tgz"; + sha512 = "1vxT8h2iFFaxfn+onMIdL/L+OcIG6G4BUzRt4wuvQzwbKArRy0fUN2d6E7aoM74wl8VlNIMTxBLCqxDnfVeVxQ=="; }; }; "aws-sign2-0.6.0" = { @@ -13099,13 +13117,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001161" = { + "caniuse-lite-1.0.30001164" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001161"; + version = "1.0.30001164"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz"; - sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001164.tgz"; + sha512 = "G+A/tkf4bu0dSp9+duNiXc7bGds35DioCyC6vgK2m/rjA4Krpy5WeZgZyfH2f0wj2kI6yAWWucyap6oOwmY1mg=="; }; }; "canvas-2.6.1" = { @@ -19877,13 +19895,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.610" = { + "electron-to-chromium-1.3.612" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.610"; + version = "1.3.612"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz"; - sha512 = "eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.612.tgz"; + sha512 = "CdrdX1B6mQqxfw+51MPWB5qA6TKWjza9f5voBtUlRfEZEwZiFaxJLrhFI8zHE9SBAuGt4h84rQU6Ho9Bauo1LA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -19923,13 +19941,13 @@ let sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; - "elf-tools-1.1.2" = { - name = "elf-tools"; - packageName = "elf-tools"; - version = "1.1.2"; + "elf-cam-0.1.1" = { + name = "elf-cam"; + packageName = "elf-cam"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/elf-tools/-/elf-tools-1.1.2.tgz"; - sha512 = "x+p+XNxLk8ittsYN7294mCnQ2i48udu3UGdHBv2gw1u1MVigXctcfbp5H9ebqTJnDxkbs6PdOSBOAdYGGDN7uA=="; + url = "https://registry.npmjs.org/elf-cam/-/elf-cam-0.1.1.tgz"; + sha512 = "tKSFTWOp5OwJSp6MKyQDX7umYDkvUuI8rxHXw8BuUQ63d9Trj9xLeo6SHyoTGSoZNNZVitFa+RuHHXuoAzN3Rw=="; }; }; "elfy-1.0.0" = { @@ -21670,13 +21688,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.52" = { + "expo-pwa-0.0.54" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.52"; + version = "0.0.54"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.52.tgz"; - sha512 = "LzpcL/nzFrBJqCCEaDOmWx4BfvmQFhAetUSG8/WcyMcTvqTC/WlboK+mlSj0mN5vw1/H/UCMqj6GoT07QIaUWQ=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.54.tgz"; + sha512 = "UQtnB/CrjkUfQrRyHmUi3jg/1++fkM2KHTy5DBrexTC0XoXzbJCLMrUTgH2VBtjIVQO9KyApInE53BRcz3ei+Q=="; }; }; "express-2.5.11" = { @@ -24074,6 +24092,15 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; + "geoip-country-4.0.44" = { + name = "geoip-country"; + packageName = "geoip-country"; + version = "4.0.44"; + src = fetchurl { + url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.44.tgz"; + sha512 = "nC8TqPY7k6ig956peHrNJdjc5bWcIlURKQJKUwq1HdSlgxa4UvGTbbI+9NqxsUZ5Ozgp6NPa5qSU5GMa502kmg=="; + }; + }; "get-amd-module-type-3.0.0" = { name = "get-amd-module-type"; packageName = "get-amd-module-type"; @@ -24713,13 +24740,13 @@ let sha512 = "zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw=="; }; }; - "global-4.3.2" = { + "global-4.4.0" = { name = "global"; packageName = "global"; - version = "4.3.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/global/-/global-4.3.2.tgz"; - sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; + url = "https://registry.npmjs.org/global/-/global-4.4.0.tgz"; + sha512 = "wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w=="; }; }; "global-agent-2.1.12" = { @@ -26992,6 +27019,15 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; + "iconv-lite-0.5.2" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz"; + sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; + }; + }; "iconv-lite-0.6.2" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -27865,6 +27901,15 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; + "ip-address-6.4.0" = { + name = "ip-address"; + packageName = "ip-address"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-address/-/ip-address-6.4.0.tgz"; + sha512 = "c5uxc2WUTuRBVHT/6r4m7HIr/DfV0bF6DvLH3iZGSK8wp8iMwwZSgIq2do0asFf8q9ECug0SE+6+1ACMe4sorA=="; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -28099,13 +28144,13 @@ let sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; }; }; - "is-bigint-1.0.0" = { + "is-bigint-1.0.1" = { name = "is-bigint"; packageName = "is-bigint"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.0.tgz"; - sha512 = "t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g=="; + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz"; + sha512 = "J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg=="; }; }; "is-binary-path-1.0.1" = { @@ -29809,13 +29854,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.20.0" = { + "jquery.terminal-2.20.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.20.0"; + version = "2.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.0.tgz"; - sha512 = "8Wq9i5mwj8MnkFHEFZebn+l4K4HEsRXSanrQwq/u6lEP39/44b1vJzmYsqJLq57JALrY6Cp9b5fC4hMlWhi1Zw=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.1.tgz"; + sha512 = "XDXH/psm0BquAmQEwomn1g9lYBGS/P6laRgWC/gADi6eJjEBWeyuiP9F5nzoEVhEa2VDnEYbvfm/MBA5DcrvdA=="; }; }; "js-base64-2.6.4" = { @@ -30367,6 +30412,15 @@ let sha512 = "H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="; }; }; + "jsonc-parser-3.0.0" = { + name = "jsonc-parser"; + packageName = "jsonc-parser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz"; + sha512 = "fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="; + }; + }; "jsonfile-1.0.1" = { name = "jsonfile"; packageName = "jsonfile"; @@ -32501,6 +32555,15 @@ let sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; }; }; + "lodash.find-4.6.0" = { + name = "lodash.find"; + packageName = "lodash.find"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz"; + sha1 = "cb0704d47ab71789ffa0de8b97dd926fb88b13b1"; + }; + }; "lodash.findkey-4.6.0" = { name = "lodash.findkey"; packageName = "lodash.findkey"; @@ -32843,6 +32906,15 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; + "lodash.max-4.0.1" = { + name = "lodash.max"; + packageName = "lodash.max"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.max/-/lodash.max-4.0.1.tgz"; + sha1 = "8735566c618b35a9f760520b487ae79658af136a"; + }; + }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -36461,13 +36533,13 @@ let sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; }; }; - "nanoid-3.1.18" = { + "nanoid-3.1.20" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.18"; + version = "3.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz"; - sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz"; + sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; "nanolru-1.0.0" = { @@ -36668,13 +36740,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.8" = { + "nearley-2.19.9" = { name = "nearley"; packageName = "nearley"; - version = "2.19.8"; + version = "2.19.9"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.8.tgz"; - sha512 = "te4JCrxbzLvVqUWfVOASgsbkWaFvJ6JlHTRQzfnU862bnyHGHEGX2s5OYvLAS4NDPmQvRtC2tBdV6THy6xHFyQ=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.9.tgz"; + sha512 = "KpCXvcVWPmZrEs95tIkqWi+CgL48O8CJDVDgY/AQGWXR1O8KQPHt5iQrTLior0k0v3PGKIV2xPi879wR1sawwg=="; }; }; "neat-csv-2.1.0" = { @@ -38327,13 +38399,13 @@ let sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; }; }; - "object-inspect-1.8.0" = { + "object-inspect-1.9.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; - sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"; + sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; }; }; "object-is-1.1.4" = { @@ -42018,13 +42090,13 @@ let sha512 = "rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg=="; }; }; - "postcss-reporter-7.0.1" = { + "postcss-reporter-7.0.2" = { name = "postcss-reporter"; packageName = "postcss-reporter"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.1.tgz"; - sha512 = "R9AK80KIqqMb+lwGRBcRkXS7r96VCTxrZvvrfibyA/dWjqctwx7leHMCC05A9HbW8PnChwOWwrmISwp5HQu5wg=="; + url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz"; + sha512 = "JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw=="; }; }; "postcss-resolve-nested-selector-0.1.1" = { @@ -42351,13 +42423,13 @@ let sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; }; - "prettier-2.2.0" = { + "prettier-2.2.1" = { name = "prettier"; packageName = "prettier"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.2.0.tgz"; - sha512 = "yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz"; + sha512 = "PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q=="; }; }; "prettier-bytes-1.0.4" = { @@ -42621,15 +42693,6 @@ let sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; }; }; - "process-0.5.2" = { - name = "process"; - packageName = "process"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/process/-/process-0.5.2.tgz"; - sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; - }; - }; "process-es6-0.11.6" = { name = "process-es6"; packageName = "process-es6"; @@ -45006,13 +45069,13 @@ let sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; }; }; - "redoc-2.0.0-rc.47" = { + "redoc-2.0.0-rc.48" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.47"; + version = "2.0.0-rc.48"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.47.tgz"; - sha512 = "weoRsJngABqWOuign5wXqVHLE0WRpODNQqwsZqtdKqCQ/paLxJRMBqSklAQdUnx4x5SEYvLxXatUGnw1mp2o4g=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.48.tgz"; + sha512 = "shArJWhNG2gQ0XKxW8WcfG8peNOtxbZ86CqxgrR9P7MnE5ESAo559CH/PSlezePeVLpcC0C9tcimOfSN5MaAvA=="; }; }; "reduce-component-1.0.1" = { @@ -46365,13 +46428,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.33.3" = { + "rollup-2.34.0" = { name = "rollup"; packageName = "rollup"; - version = "2.33.3"; + version = "2.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.33.3.tgz"; - sha512 = "RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.34.0.tgz"; + sha512 = "dW5iLvttZzdVehjEuNJ1bWvuMEJjOWGmnuFS82WeKHTGXDkRHQeq/ExdifkSyJv9dLcR86ysKRmrIDyR6O0X8g=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -48381,13 +48444,13 @@ let sha512 = "FAM56z3bl1iuxeqkCEA/jyZ2hpwkQK8xQxQbhR+QppEK5lole7w1PQyWYgZAJ9oRY/BU32zdRAJwGuZbhk7G2Q=="; }; }; - "snyk-gradle-plugin-3.10.2" = { + "snyk-gradle-plugin-3.10.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.2.tgz"; - sha512 = "gTFKL0BLUN54asUQ4OIoa4lATGn27VZwWDJGQ0VuqSaaoy8I5W16Cbn/KN95oIKa7tgwrmasPLd5uviFWzo/Qw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.3.tgz"; + sha512 = "aFAqQu0vvgndxQtXxNfLzL9wamOwyRceRkSb+BXVp6E+Tpz4awksyUTfV0Yc5WjR0+hYB2rtBYKHXaK+GHficg=="; }; }; "snyk-module-1.9.1" = { @@ -49101,13 +49164,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.6" = { + "spdx-license-ids-3.0.7" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; - sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; }; }; "spdy-1.32.5" = { @@ -51477,13 +51540,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.30.6" = { + "systeminformation-4.30.10" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.30.6"; + version = "4.30.10"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.6.tgz"; - sha512 = "NV7zo9NU7fWSuiCORZmMLe90cFrrTS6jfalrQ0/5B7JGQ2ei15c2gmfICBwWdmviyv/FXAFVReySxOtDDkppqw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.10.tgz"; + sha512 = "BndDV7hjRomUGkHK6MO661KUUWcDRbr5SlepDvREidYnR2QJIyHln0iSysH9GPOT7YJgwtswdyg/up/ZFYxHrQ=="; }; }; "syswide-cas-5.3.0" = { @@ -53899,13 +53962,13 @@ let sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g=="; }; }; - "uglify-js-3.12.0" = { + "uglify-js-3.12.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.0"; + version = "3.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.0.tgz"; - sha512 = "8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz"; + sha512 = "o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ=="; }; }; "uglify-js-3.4.10" = { @@ -54493,13 +54556,13 @@ let sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="; }; }; - "unist-util-is-4.0.3" = { + "unist-util-is-4.0.4" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.3.tgz"; - sha512 = "bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw=="; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.4.tgz"; + sha512 = "3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA=="; }; }; "unist-util-map-1.0.5" = { @@ -56375,13 +56438,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.3.5" = { + "vscode-css-languageservice-4.4.0" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.3.5"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.5.tgz"; - sha512 = "g9Pjxt9T32jhY0nTOo7WRFm0As27IfdaAxcFa8c7Rml1ZqBn3XXbkExjzxY7sBWYm7I1Tp4dK6UHXHoUQHGwig=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.4.0.tgz"; + sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; "vscode-debugadapter-testsupport-1.42.0" = { @@ -56420,13 +56483,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.10.0" = { + "vscode-json-languageservice-3.11.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.10.0.tgz"; - sha512 = "8IvuRSQnjznu+obqy6Dy4S4H68Ke7a3Kb+A0FcdctyAMAWEnrORpCpMOMqEYiPLm/OTYLVWJ7ql3qToDTozu4w=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz"; + sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; "vscode-json-languageservice-3.8.4" = { @@ -58301,13 +58364,13 @@ let sha1 = "f82d2fedee63af76687b70115ce6274dc71310e9"; }; }; - "xhr-2.5.0" = { + "xhr-2.6.0" = { name = "xhr"; packageName = "xhr"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz"; - sha512 = "4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ=="; + url = "https://registry.npmjs.org/xhr/-/xhr-2.6.0.tgz"; + sha512 = "/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA=="; }; }; "xml-1.0.1" = { @@ -58725,13 +58788,13 @@ let sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; }; }; - "y18n-4.0.0" = { + "y18n-4.0.1" = { name = "y18n"; packageName = "y18n"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; + sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; }; }; "y18n-5.0.5" = { @@ -59593,7 +59656,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" sources."ssri-6.0.1" sources."stream-each-1.2.3" @@ -59638,7 +59701,7 @@ in sources."which-1.3.1" sources."wrappy-1.0.2" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -59967,7 +60030,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -60258,7 +60321,7 @@ in sources."browserslist-4.14.7" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.4.3" @@ -60279,7 +60342,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.3.0" @@ -60523,7 +60586,7 @@ in sources."@apollo/federation-0.20.4" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.47" + sources."@types/node-10.17.48" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -60834,7 +60897,7 @@ in sources."@types/http-assert-1.5.1" sources."@types/http-errors-1.8.0" sources."@types/inquirer-6.5.0" - (sources."@types/jscodeshift-0.7.1" // { + (sources."@types/jscodeshift-0.7.2" // { dependencies = [ sources."ast-types-0.12.1" sources."recast-0.17.2" @@ -61088,7 +61151,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -61297,7 +61360,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.610" + sources."electron-to-chromium-1.3.612" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -61817,7 +61880,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-path-0.11.5" sources."object-treeify-1.1.30" @@ -62089,7 +62152,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -62333,7 +62396,7 @@ in sources."xmlbuilder-11.0.1" sources."xss-1.0.8" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-2.1.2" (sources."yaml-front-matter-3.4.1" // { dependencies = [ @@ -63004,7 +63067,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -63163,7 +63226,7 @@ in sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."object-assign-4.1.1" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -63626,7 +63689,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."standard-error-1.1.0" @@ -63676,7 +63739,7 @@ in sources."wordwrap-0.0.2" sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-3.1.1" (sources."yargs-3.10.0" // { dependencies = [ @@ -63715,7 +63778,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.33" + sources."@types/node-13.13.34" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -64040,7 +64103,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" @@ -64465,10 +64528,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.14"; + version = "1.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.14.tgz"; - sha512 = "vFv90gkUJr9xICYCT4NXFd1EQDGWjJfpcnHqTcgd8A8og5yKfL5cqoSxuwcT15nP4nx06sKBCmnkjMB2DPKn9g=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.16.tgz"; + sha512 = "6m/LCFHcnFdbJoFnrkzj8OhBvcFl491eYG0247Gti/u2iQCVj2X8RRxdxcGbDh4tR5OEPZdQPcd6YMDbtphPSg=="; }; buildInputs = globalBuildInputs; meta = { @@ -64483,10 +64546,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.8.0.tgz"; - sha512 = "HgdVA3F61GPN4sPxVNyeVWQd0p8oykchGgpovcX5QAVveAcWpUpxYXquX1y2B+EhBFZYNEOQVsr5zdVPzrko6w=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.9.0.tgz"; + sha512 = "cTIR4IXs6CC06iDwylxzS0Sq4HhiWofTBqgedtbAckkaoJYOZdM+uMKKdkSO2nt93bHtE4MsEoQ91sxHgKqNfg=="; }; buildInputs = globalBuildInputs; meta = { @@ -64615,7 +64678,7 @@ in sources."node-fetch-2.6.1" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -64694,10 +64757,10 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.19"; + version = "1.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.19.tgz"; - sha512 = "449bRHSru5ESxrWjgnizpI2OIXmzXN1/nEoPIkawJIsM4RvWAZJsMmsrgqweBRrQmyHy1sih7eIV3AkeZWbg7g=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.20.tgz"; + sha512 = "3p4AwJnsjtLJM53wLsMtcVUzWPMnnYI6pkwQraHH6Tp7/ZuXwIVhjUvDgMcAvhmIkVePyvJF5xZHN4ghLLP02A=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -64774,7 +64837,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -64871,7 +64934,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -65310,7 +65373,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.2.0" + sources."prettier-2.2.1" sources."prettier-eslint-11.0.0" (sources."prettier-stylelint-0.4.2" // { dependencies = [ @@ -65449,7 +65512,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."specificity-0.3.2" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -65710,10 +65773,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.17.0.tgz"; - sha512 = "fL8O5Is3mvXiWPckw0vrGTldP8oMiNB8pjN/YGiDd/o5M8gQPc0N8a6urSByEHzEoFaV9hf7Lm0ZjK7muS0hjg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.18.0.tgz"; + sha512 = "26wqJFlLsKj2BWaFUfjuu7pIBob36HeUH131IPlxAvluxcd/uhIZZEm22DzBJFhiX6alP+6nHfKsjpI+ntyAtA=="; }; buildInputs = globalBuildInputs; meta = { @@ -65834,7 +65897,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -65872,7 +65935,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -66056,7 +66119,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."specificity-0.4.1" sources."string-width-4.2.0" (sources."string_decoder-1.3.0" // { @@ -66081,7 +66144,7 @@ in sources."unified-9.2.0" sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" - sources."unist-util-is-4.0.3" + sources."unist-util-is-4.0.4" sources."unist-util-stringify-position-2.0.3" sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" @@ -66119,10 +66182,10 @@ in coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.2.2.tgz"; - sha512 = "uxhcuQyjCmXse9ERkvyKpo7mEqC8wKGwREzbyFW92KAb+fB4YRBzmhrs7ws50cxSsYb6NPkfPrGsWqP4i0yEjg=="; + url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.2.3.tgz"; + sha512 = "1FVW4hj7eK8PAUS0fzeme/23iBBP9Q3nfoMVzpBGchJiziL2qOhXaFrU0QgliIhiRSMmLnagTx/lWuI8BuO96g=="; }; buildInputs = globalBuildInputs; meta = { @@ -66367,7 +66430,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."prelude-ls-1.2.1" - sources."prettier-2.2.0" + sources."prettier-2.2.1" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" @@ -66497,7 +66560,7 @@ in sources."js-yaml-3.14.0" sources."jsonc-parser-2.3.1" sources."ms-2.0.0" - sources."prettier-2.2.0" + sources."prettier-2.2.1" (sources."request-light-0.2.5" // { dependencies = [ sources."vscode-nls-4.1.2" @@ -67101,7 +67164,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" sources."statuses-1.5.0" (sources."string-width-2.1.1" // { @@ -67120,7 +67183,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.30.6" + sources."systeminformation-4.30.10" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -67502,7 +67565,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -68097,7 +68160,7 @@ in sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."global-4.3.2" + sources."global-4.4.0" sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.2.4" @@ -68272,7 +68335,7 @@ in sources."prepend-http-1.0.4" sources."prettier-bytes-1.0.4" sources."pretty-hash-1.0.1" - sources."process-0.5.2" + sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-string-1.2.2" sources."prompt-1.0.0" @@ -68497,7 +68560,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xhr-2.5.0" + sources."xhr-2.6.0" sources."xsalsa20-1.1.0" sources."xtend-4.0.2" sources."yallist-2.1.2" @@ -69097,7 +69160,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -69197,7 +69260,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.136" + sources."@microsoft/load-themed-styles-1.10.138" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -70503,7 +70566,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."split2-3.2.2" sources."sprintf-js-1.0.3" @@ -70750,7 +70813,7 @@ in sources."terser-4.8.0" sources."terser-webpack-plugin-1.4.5" sources."to-regex-range-2.1.1" - sources."y18n-4.0.0" + sources."y18n-4.0.1" ]; }) sources."webpack-sources-1.4.3" @@ -71120,10 +71183,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.0.3"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.3.tgz"; - sha512 = "yoPZo7QCrjJY08r0YQtNQ+FzfTI0+PCoDf6Uqk/cLxLfTVc/LwXAn2RNXdjmz6+MnCtowjciYYrcuqaizDPOdg=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.6.tgz"; + sha512 = "dpNpZMddzA3WUQQyT7VVUOg9UlQiRSjlFWOqXIqZyDSSc/XPWwC1DNrtOCMYvVwDm4sfIUnmiSA7LSM5MJWnGw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -71260,12 +71323,12 @@ in }) sources."@expo/babel-preset-cli-0.2.18" sources."@expo/bunyan-4.0.0" - (sources."@expo/config-3.3.16" // { + (sources."@expo/config-3.3.18" // { dependencies = [ sources."semver-7.3.2" ]; }) - (sources."@expo/config-plugins-1.0.3" // { + (sources."@expo/config-plugins-1.0.5" // { dependencies = [ sources."slash-3.0.0" sources."uuid-3.4.0" @@ -71279,7 +71342,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.41" // { + (sources."@expo/dev-server-0.1.43" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -71296,7 +71359,7 @@ in sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.62" + sources."@expo/dev-tools-0.13.65" sources."@expo/eas-build-job-0.1.2" (sources."@expo/image-utils-0.3.9" // { dependencies = [ @@ -71309,7 +71372,7 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.41" + sources."@expo/metro-config-0.1.43" (sources."@expo/ngrok-2.4.3" // { dependencies = [ sources."uuid-3.4.0" @@ -71356,14 +71419,14 @@ in sources."@expo/spawn-async-1.5.0" sources."@expo/traveling-fastlane-darwin-1.15.1" sources."@expo/traveling-fastlane-linux-1.15.1" - (sources."@expo/webpack-config-0.12.46" // { + (sources."@expo/webpack-config-0.12.48" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-59.0.2" // { + (sources."@expo/xdl-59.0.5" // { dependencies = [ sources."chownr-1.1.4" (sources."fs-minipass-1.2.7" // { @@ -71788,7 +71851,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { @@ -72047,7 +72110,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -72124,7 +72187,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.52" // { + (sources."expo-pwa-0.0.54" // { dependencies = [ sources."commander-2.20.0" ]; @@ -72239,7 +72302,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."global-4.3.2" + sources."global-4.4.0" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" @@ -72385,7 +72448,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.0.4" sources."is-arrayish-0.3.2" - sources."is-bigint-1.0.0" + sources."is-bigint-1.0.1" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.0.1" sources."is-buffer-1.1.6" @@ -72670,7 +72733,6 @@ in dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" - sources."process-0.11.10" sources."punycode-1.4.1" ]; }) @@ -72724,7 +72786,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -73002,7 +73064,7 @@ in sources."deepmerge-2.2.1" ]; }) - sources."process-0.5.2" + sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" @@ -73749,7 +73811,7 @@ in sources."uuid-7.0.3" ]; }) - sources."xhr-2.5.0" + sources."xhr-2.6.0" sources."xml-js-1.6.11" sources."xml-parse-from-string-1.0.1" (sources."xml2js-0.4.23" // { @@ -73761,7 +73823,7 @@ in sources."xmldoc-1.1.2" sources."xmldom-0.1.31" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-4.0.0" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" @@ -73931,7 +73993,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -74688,7 +74750,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" @@ -74721,6 +74783,57 @@ in bypassCache = true; reconstructLock = true; }; + flood = nodeEnv.buildNodePackage { + name = "flood"; + packageName = "flood"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flood/-/flood-4.2.0.tgz"; + sha512 = "xdfiYucaiUEmaScEDZr24vq5qkBe7cC51YeFG9gSFZF0ccGtoVG1RMw55vA06VyMxLUlYVqR9uYxyKVmk/xDBg=="; + }; + dependencies = [ + sources."async-2.6.3" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."buffer-crc32-0.2.13" + sources."colors-1.4.0" + sources."concat-map-0.0.1" + sources."fd-slicer-1.1.0" + sources."fs.realpath-1.0.0" + sources."geoip-country-4.0.44" + sources."glob-7.1.6" + sources."iconv-lite-0.5.2" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ip-address-6.4.0" + sources."jsbn-1.1.0" + sources."lazy-1.0.11" + sources."lodash-4.17.20" + sources."lodash.find-4.6.0" + sources."lodash.max-4.0.1" + sources."lodash.merge-4.6.2" + sources."lodash.padstart-4.6.1" + sources."lodash.repeat-4.1.0" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" + sources."rimraf-2.7.1" + sources."safer-buffer-2.1.2" + sources."sprintf-js-1.1.2" + sources."wrappy-1.0.2" + sources."yauzl-2.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A modern Web UI for various torrent clients with multi-user and multi-client support"; + homepage = "https://github.com/jesec/flood#readme"; + license = "GPL-3.0-only"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; @@ -74950,7 +75063,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -75267,7 +75380,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.1" - sources."nearley-2.19.8" + sources."nearley-2.19.9" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -75648,7 +75761,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" @@ -75717,45 +75830,45 @@ in sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.0.0" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) - (sources."@graphql-tools/delegate-7.0.5" // { + (sources."@graphql-tools/delegate-7.0.7" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) sources."@graphql-tools/import-6.2.5" (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.5" // { + (sources."@graphql-tools/merge-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) - (sources."@graphql-tools/schema-7.1.0" // { + (sources."@graphql-tools/schema-7.1.2" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) (sources."@graphql-tools/url-loader-6.4.0" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) sources."@graphql-tools/utils-6.2.4" - (sources."@graphql-tools/wrap-7.0.1" // { + (sources."@graphql-tools/wrap-7.0.3" // { dependencies = [ - sources."@graphql-tools/utils-7.1.0" + sources."@graphql-tools/utils-7.1.2" ]; }) sources."@kwsites/file-exists-1.1.1" @@ -75958,7 +76071,7 @@ in }) sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.0" + sources."is-bigint-1.0.1" sources."is-boolean-object-1.0.1" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" @@ -76071,7 +76184,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.4" sources."oauth-sign-0.9.0" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -76649,7 +76762,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.30.6" + sources."systeminformation-4.30.10" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -77047,7 +77160,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -77429,7 +77542,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -77526,7 +77639,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -78181,7 +78294,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.5.1" - sources."jquery.terminal-2.20.0" + sources."jquery.terminal-2.20.1" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -78817,7 +78930,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" (sources."spiro-2.0.0" // { dependencies = [ sources."tslib-1.14.1" @@ -78882,7 +78995,7 @@ in sources."supports-color-7.2.0" sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" ]; @@ -79106,7 +79219,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.799.0" // { + (sources."aws-sdk-2.800.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -79473,7 +79586,7 @@ in sources."commander-2.20.3" sources."debug-4.3.1" sources."html-minifier-4.0.0" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" ]; }) sources."minimatch-3.0.4" @@ -79488,7 +79601,7 @@ in sources."multiparty-4.2.2" sources."mustache-4.0.1" sources."nan-2.14.2" - sources."nanoid-3.1.18" + sources."nanoid-3.1.20" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" @@ -80174,7 +80287,7 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.18" + sources."nanoid-3.1.20" sources."negotiator-0.6.2" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" @@ -80490,7 +80603,7 @@ in sources."wrappy-1.0.2" sources."ws-7.4.0" sources."xmlhttprequest-ssl-1.5.5" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" sources."yeast-0.1.2" @@ -80965,13 +81078,14 @@ in sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@octokit/auth-token-2.4.3" - (sources."@octokit/endpoint-6.0.9" // { + sources."@octokit/auth-token-2.4.4" + (sources."@octokit/endpoint-6.0.10" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) + sources."@octokit/openapi-types-1.2.2" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ @@ -80984,9 +81098,9 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.10" // { + (sources."@octokit/request-5.4.11" // { dependencies = [ - sources."@octokit/request-error-2.0.3" + sources."@octokit/request-error-2.0.4" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -80997,7 +81111,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.5.0" + sources."@octokit/types-6.0.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" @@ -81582,7 +81696,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" @@ -81748,7 +81862,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-1.0.1" sources."split-string-3.1.0" sources."split2-2.2.0" @@ -81818,7 +81932,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -81876,7 +81990,7 @@ in ]; }) sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-3.1.1" (sources."yargs-14.2.3" // { dependencies = [ @@ -83094,7 +83208,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -83218,7 +83332,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -83733,7 +83847,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -83920,7 +84034,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-3.1.1" (sources."yargs-13.3.2" // { dependencies = [ @@ -84507,7 +84621,7 @@ in sources."@fluentui/react-theme-provider-0.18.0" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.0" - sources."@microsoft/load-themed-styles-1.10.136" + sources."@microsoft/load-themed-styles-1.10.138" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/classnames-2.2.11" @@ -84872,7 +84986,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -85142,23 +85256,23 @@ in sources."@babel/template-7.12.7" sources."@babel/traverse-7.12.9" sources."@babel/types-7.12.7" - sources."@bugsnag/browser-7.5.1" - sources."@bugsnag/core-7.3.5" + sources."@bugsnag/browser-7.5.3" + sources."@bugsnag/core-7.5.3" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.5.1" - sources."@bugsnag/node-7.3.5" + sources."@bugsnag/js-7.5.3" + sources."@bugsnag/node-7.5.3" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-5.3.3" // { + (sources."@netlify/build-5.5.2" // { dependencies = [ sources."chalk-3.0.0" sources."resolve-2.0.0-next.2" ]; }) sources."@netlify/cache-utils-1.0.6" - (sources."@netlify/config-2.4.0" // { + (sources."@netlify/config-2.4.1" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -85175,12 +85289,13 @@ in }) sources."@netlify/open-api-0.18.1" sources."@netlify/plugin-edge-handlers-1.10.0" + sources."@netlify/plugins-list-2.0.0" sources."@netlify/run-utils-1.0.5" sources."@netlify/traffic-mesh-agent-0.27.0" sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.0" sources."@netlify/traffic-mesh-agent-linux-x64-0.27.0" sources."@netlify/traffic-mesh-agent-win32-x64-0.27.0" - (sources."@netlify/zip-it-and-ship-it-1.4.2" // { + (sources."@netlify/zip-it-and-ship-it-1.5.0" // { dependencies = [ sources."resolve-2.0.0-next.2" ]; @@ -85288,13 +85403,14 @@ in ]; }) sources."@oclif/screen-1.0.4" - sources."@octokit/auth-token-2.4.3" - (sources."@octokit/endpoint-6.0.9" // { + sources."@octokit/auth-token-2.4.4" + (sources."@octokit/endpoint-6.0.10" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; }) + sources."@octokit/openapi-types-1.2.2" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -85306,9 +85422,9 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.10" // { + (sources."@octokit/request-5.4.11" // { dependencies = [ - sources."@octokit/request-error-2.0.3" + sources."@octokit/request-error-2.0.4" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -85319,8 +85435,8 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.5.0" - sources."@rollup/plugin-babel-5.2.1" + sources."@octokit/types-6.0.1" + sources."@rollup/plugin-babel-5.2.2" (sources."@rollup/plugin-commonjs-15.1.0" // { dependencies = [ sources."estree-walker-2.0.1" @@ -85420,7 +85536,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.799.0" // { + (sources."aws-sdk-2.800.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -85499,7 +85615,7 @@ in sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -85749,8 +85865,8 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.610" - sources."elf-tools-1.1.2" + sources."electron-to-chromium-1.3.612" + sources."elf-cam-0.1.1" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -86338,7 +86454,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-treeify-1.1.30" sources."object-visit-1.0.1" @@ -86528,7 +86644,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."ripemd160-2.0.2" - sources."rollup-2.33.3" + sources."rollup-2.34.0" sources."rollup-plugin-node-builtins-2.1.2" sources."rollup-plugin-terser-7.0.2" sources."run-async-2.4.1" @@ -86624,7 +86740,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."split2-1.1.1" sources."sprintf-js-1.0.3" @@ -86771,7 +86887,7 @@ in sources."union-value-1.0.1" sources."uniq-1.0.1" sources."unique-string-2.0.0" - sources."unist-util-is-4.0.3" + sources."unist-util-is-4.0.4" sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" @@ -86853,7 +86969,7 @@ in sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" sources."yarn-1.22.10" @@ -87250,7 +87366,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -88053,7 +88169,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -89053,7 +89169,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -89188,7 +89304,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -89200,7 +89316,7 @@ in sources."error-ex-1.3.2" (sources."es-abstract-1.18.0-next.1" // { dependencies = [ - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" ]; }) sources."es-to-primitive-1.2.1" @@ -89764,7 +89880,7 @@ in (sources."util.promisify-1.0.1" // { dependencies = [ sources."es-abstract-1.17.7" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" ]; }) sources."uuid-3.4.0" @@ -90047,7 +90163,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.0" @@ -90063,7 +90179,7 @@ in sources."worker-farm-1.7.0" sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" (sources."yargs-13.3.2" // { dependencies = [ sources."yargs-parser-13.1.2" @@ -90526,7 +90642,7 @@ in sources."number-is-nan-1.0.1" sources."numeral-2.0.6" sources."object-assign-4.1.1" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -90611,7 +90727,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -91304,7 +91420,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.30.6" + sources."systeminformation-4.30.10" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -91339,10 +91455,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.4.tgz"; - sha512 = "Q/1SlzLitcrggjTJN7Ooiu2y5ty+yTaxJYb7xGt6QpNijsIhxkGK58pP8IZYh04C7+8aI9MxNgppOTOyQG7k5g=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.5.tgz"; + sha512 = "EJO8eYZyNpOvW+JhjBnLtxD2xcC6YlrzH8jxjETj8bevLATFa9vnGq614ada6o1XOIMq31JWtj1WyPJNogAzLA=="; }; buildInputs = globalBuildInputs; meta = { @@ -91466,7 +91582,6 @@ in sources."lodash.get-4.4.2" sources."lodash.groupby-4.6.0" sources."lodash.sortby-4.7.0" - sources."log-symbols-4.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" sources."normalize-path-3.0.0" @@ -91476,7 +91591,7 @@ in sources."picomatch-2.2.2" sources."pify-2.3.0" sources."postcss-load-config-3.0.0" - sources."postcss-reporter-7.0.1" + sources."postcss-reporter-7.0.2" sources."pretty-hrtime-1.0.3" sources."read-cache-1.0.0" sources."readdirp-3.5.0" @@ -91895,10 +92010,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.88"; + version = "1.1.90"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.88.tgz"; - sha512 = "1bjnvqNd5xlqTzlwr1W0/WLj+fKItMpQuBr2fvI3OPnWz5iRNcIdj30pR5yCP5ddThSW8xHjQmutf/aked2I8w=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.90.tgz"; + sha512 = "CNrTDpxd4vWcGpjxCPLg2fvKYlEhU8ksi7Fkdb+bFNfOb/1ENvZ8QoDYebtLFceoBlgWU9X+MluuFKudwHKKkw=="; }; buildInputs = globalBuildInputs; meta = { @@ -91950,7 +92065,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-arguments-1.0.4" - sources."is-bigint-1.0.0" + sources."is-bigint-1.0.1" sources."is-boolean-object-1.0.1" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" @@ -91975,7 +92090,7 @@ in sources."mkdirp-0.5.5" sources."mute-stream-0.0.8" sources."ncp-0.4.2" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -92211,10 +92326,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.10.1.tgz"; - sha512 = "RZqE1dFdIB3hBvxpBc+CRTjD10xDdPIUk3xA4moHzQMP5Gp2MeGCiRWyt747+4CV42s7oUQbxSMeeY1IMz0vAQ=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.10.2.tgz"; + sha512 = "AQHx67+fJ+7PZUGf0Vl24XO02isSLHU7fh/OXu6wreFm6B1+xrVhcehV9um2nk63Zq9GFenjnv2GoXEyMSGc7Q=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -92241,7 +92356,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.33" + sources."@types/node-13.13.34" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -92461,7 +92576,7 @@ in ]; }) sources."readdirp-3.5.0" - sources."redoc-2.0.0-rc.47" + sources."redoc-2.0.0-rc.48" sources."reftools-1.1.7" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" @@ -92500,7 +92615,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -92533,7 +92648,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."wrap-ansi-6.2.0" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-parser-18.1.3" ]; }) @@ -92570,10 +92685,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.33.3"; + version = "2.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.33.3.tgz"; - sha512 = "RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.34.0.tgz"; + sha512 = "dW5iLvttZzdVehjEuNJ1bWvuMEJjOWGmnuFS82WeKHTGXDkRHQeq/ExdifkSyJv9dLcR86ysKRmrIDyR6O0X8g=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -92852,7 +92967,7 @@ in sources."resolve-1.19.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.33.3" + sources."rollup-2.34.0" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-5.0.1" @@ -92926,7 +93041,7 @@ in }) sources."wrappy-1.0.2" sources."write-1.0.3" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-2.1.2" (sources."yargs-13.3.2" // { dependencies = [ @@ -93249,10 +93364,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.13.0"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.13.0.tgz"; - sha512 = "MOz0JYlPrWGwuyVUIncyaNRSlwOzVUFj5T/ITRjtO5PYXUWr+BB+yhZ97KoOhuL/hVnQ7ZjsmYgOvzo8hHwv9w=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.14.0.tgz"; + sha512 = "c3PRJPQqRmg2NRIcv3c0iD0XZbrJsEczWdSLXwi8AGdcokIbvjTM6fXOsq7i0nhL/BYyaib1O9WazEgmvpDGDw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -93322,7 +93437,7 @@ in sources."@serverless/utils-china-1.0.11" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tencent-sdk/capi-1.1.6" + sources."@tencent-sdk/capi-1.1.8" sources."@types/cacheable-request-6.0.1" sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.0" @@ -93386,7 +93501,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.799.0" // { + (sources."aws-sdk-2.800.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93900,7 +94015,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.33" + sources."@types/node-13.13.34" sources."long-4.0.0" ]; }) @@ -94744,17 +94859,21 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.431.2"; + version = "1.432.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.431.2.tgz"; - sha512 = "DGm/bxtCSI/ReGK0vMphicQyZtVXiLgLvWkdDbRmsMb4Q7VRylAq9z+5lursLriED7eTjxlkgFMjOdGOuIoxpg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.432.1.tgz"; + sha512 = "fyrxd921tgEkLx8XVUaWXu+0hqImQPQm9+EOWvVXcYUnw19TNUgAQsY02SY3f6AO35E9+JZbra1Okd56CrqYBg=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" - sources."@snyk/cli-interface-2.9.2" - sources."@snyk/cocoapods-lockfile-parser-3.5.2" + sources."@snyk/cli-interface-2.11.0" + (sources."@snyk/cocoapods-lockfile-parser-3.5.2" // { + dependencies = [ + sources."@snyk/dep-graph-1.19.4" + ]; + }) sources."@snyk/composer-lockfile-parser-1.4.1" - sources."@snyk/dep-graph-1.19.4" + sources."@snyk/dep-graph-1.21.0" sources."@snyk/docker-registry-v2-client-1.13.9" sources."@snyk/gemfile-1.2.0" sources."@snyk/java-call-graph-builder-1.16.2" @@ -95139,14 +95258,16 @@ in sources."snyk-go-parser-1.4.1" (sources."snyk-go-plugin-1.16.2" // { dependencies = [ + sources."@snyk/dep-graph-1.19.4" sources."rimraf-3.0.2" sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.10.2" // { + (sources."snyk-gradle-plugin-3.10.3" // { dependencies = [ (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ + sources."@snyk/dep-graph-1.19.4" sources."tslib-1.14.1" ]; }) @@ -95165,6 +95286,11 @@ in (sources."snyk-mvn-plugin-2.23.4" // { dependencies = [ sources."@snyk/cli-interface-2.9.1" + (sources."@snyk/dep-graph-1.19.4" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@snyk/java-call-graph-builder-1.16.5" // { dependencies = [ sources."tmp-0.2.1" @@ -95198,11 +95324,6 @@ in }) (sources."snyk-poetry-lockfile-parser-1.1.1" // { dependencies = [ - (sources."@snyk/dep-graph-1.21.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) sources."tslib-2.0.3" ]; }) @@ -95538,7 +95659,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."speedtest-net-1.6.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -95838,7 +95959,7 @@ in sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arguments-1.0.4" - sources."is-bigint-1.0.0" + sources."is-bigint-1.0.1" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.0.1" sources."is-buffer-1.1.6" @@ -95966,7 +96087,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.8" + sources."nearley-2.19.9" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" @@ -95987,7 +96108,7 @@ in }) ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -96480,7 +96601,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.799.0" // { + (sources."aws-sdk-2.800.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -97042,7 +97163,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -97211,7 +97332,7 @@ in sources."xpath-0.0.5" sources."xpath.js-1.1.0" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-2.1.2" (sources."yargs-6.6.0" // { dependencies = [ @@ -97311,7 +97432,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -97349,7 +97470,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -97531,7 +97652,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."specificity-0.4.1" sources."string-width-4.2.0" (sources."string_decoder-1.3.0" // { @@ -97555,7 +97676,7 @@ in sources."unified-9.2.0" sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" - sources."unist-util-is-4.0.3" + sources."unist-util-is-4.0.4" sources."unist-util-stringify-position-2.0.3" sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" @@ -97637,7 +97758,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."nth-check-1.0.2" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.1" @@ -98239,7 +98360,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -98406,7 +98527,7 @@ in sources."which-module-2.0.0" sources."wrap-ansi-5.1.0" sources."ws-6.2.1" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" ]; @@ -98588,7 +98709,7 @@ in sources."ms-2.1.2" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -98637,7 +98758,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" (sources."string-width-1.0.2" // { @@ -98746,7 +98867,7 @@ in sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."match-index-1.0.3" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."regexp.prototype.flags-1.3.0" @@ -99058,7 +99179,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -99125,7 +99246,7 @@ in sources."unified-message-control-3.0.1" sources."unique-string-2.0.0" sources."unist-util-inspect-5.0.1" - sources."unist-util-is-4.0.3" + sources."unist-util-is-4.0.4" sources."unist-util-modify-children-2.0.0" sources."unist-util-position-3.1.0" sources."unist-util-remove-position-2.0.1" @@ -99325,7 +99446,7 @@ in sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."object-assign-4.1.1" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."object.values-1.1.2" @@ -99378,7 +99499,7 @@ in sources."is-date-object-1.0.2" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."string.prototype.trimend-1.0.3" @@ -99479,7 +99600,7 @@ in sources."is-regex-1.1.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."string.prototype.trimend-1.0.3" @@ -100472,10 +100593,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.0"; + version = "3.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.0.tgz"; - sha512 = "8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.1.tgz"; + sha512 = "o8lHP20KjIiQe5b/67Rh68xEGRrc2SRsCuuoYclXXoC74AfSRGblU1HKzJWH3HxPZ+Ort85fWHpSX7KwBUC9CQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -101156,8 +101277,9 @@ in sources."jsonc-parser-2.3.1" sources."ms-2.0.0" sources."request-light-0.3.0" - (sources."vscode-json-languageservice-3.10.0" // { + (sources."vscode-json-languageservice-3.11.0" // { dependencies = [ + sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" ]; }) @@ -101200,9 +101322,9 @@ in sources."vscode-nls-4.1.2" ]; }) - (sources."vscode-json-languageservice-3.10.0" // { + (sources."vscode-json-languageservice-3.11.0" // { dependencies = [ - sources."jsonc-parser-2.3.1" + sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" sources."vscode-uri-2.1.2" ]; @@ -101698,7 +101820,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -102025,7 +102147,7 @@ in }) sources."wrappy-1.0.2" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yallist-3.1.1" (sources."yargs-13.3.2" // { dependencies = [ @@ -102299,7 +102421,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.12.0" + sources."uglify-js-3.12.1" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -103030,7 +103152,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -103202,7 +103324,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.3.5" // { + (sources."vscode-css-languageservice-4.4.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" @@ -103947,7 +104069,7 @@ in }) sources."mz-2.7.0" sources."nan-2.14.2" - sources."nanoid-3.1.18" + sources."nanoid-3.1.20" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -103984,7 +104106,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -104361,7 +104483,7 @@ in sources."decamelize-1.2.0" sources."strip-ansi-6.0.0" sources."wrap-ansi-6.2.0" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-parser-18.1.3" ]; }) @@ -104391,10 +104513,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.8.0"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.8.0.tgz"; - sha512 = "X2yosPiHip3L0TE+ylruzrOqSgEgsdGyBOGFWKYChcwlKChaw9VodZIUovG1oo7s0ss6e3ZxBMn9tXR+nkPThA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.9.0.tgz"; + sha512 = "YnnqIV/uAS5ZrNpctSv378qV7HmbJ74DL+XfvMxzbX1bV9e7eeT6eEWU4wuUw33CNr/HspBh7R/xQlVjTEyAeA=="; }; dependencies = [ sources."@types/eslint-7.2.5" @@ -104427,11 +104549,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.14.7" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001161" + sources."caniuse-lite-1.0.30001164" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.610" + sources."electron-to-chromium-1.3.612" sources."enhanced-resolve-5.3.2" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -104907,7 +105029,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" + sources."object-inspect-1.9.0" sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -105156,7 +105278,7 @@ in }) sources."wrappy-1.0.2" sources."ws-6.2.1" - sources."y18n-4.0.0" + sources."y18n-4.0.1" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" ]; @@ -105305,7 +105427,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.33" + sources."@types/node-13.13.34" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -105669,8 +105791,9 @@ in sources."ms-2.0.0" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - (sources."vscode-json-languageservice-3.10.0" // { + (sources."vscode-json-languageservice-3.11.0" // { dependencies = [ + sources."jsonc-parser-3.0.0" sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-5.0.0" ]; @@ -106403,7 +106526,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" + sources."spdx-license-ids-3.0.7" sources."split-string-3.1.0" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16d5ad79abde..8758356d06d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1172,6 +1172,8 @@ in fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + flood = nodePackages.flood; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; genpass = callPackage ../tools/security/genpass { From dbdcc1da4c5bc3940ae2b9f469f23064184b2939 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Dec 2020 09:37:31 +0000 Subject: [PATCH 116/120] guile-cairo: 1.11.1 -> 1.11.2 --- pkgs/development/guile-modules/guile-cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 000932cc010a..8864e014c6de 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "guile-cairo"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; - sha256 = "1gc642r9ndsjhhmh9bl5cbd3dwvy4dpxwhr0zpsw43y9nmz37xpl"; + sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2"; }; nativeBuildInputs = [ pkgconfig ]; From 7352db0f5df0b99de480edb810228a00fb090411 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 2 Dec 2020 11:36:40 +0100 Subject: [PATCH 117/120] gitRepo: 2.9 -> 2.10 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index b4e713848261..db18e765b009 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "1ii6vjgs5nd2hhp475mqa48165garc7ac2w9fyspajaanc7zhnik"; + sha256 = "0jd28281wys2iy7pbyyrzkzrkzq9ms7p9pbj6j2fha6bg1bh7rkz"; }; patches = [ ./import-ssl-module.patch ]; From 8eb2551e51a610729ed51613f4fd981243c74848 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 2 Dec 2020 11:43:00 +0100 Subject: [PATCH 118/120] chromiumDev: 88.0.4324.11 -> 88.0.4324.27 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 6281013a6814..c106838b3548 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "88.0.4324.11", - "sha256": "123gqbxrn508wxdj3is0kzccml5zwnf8pfl90xdizvzcm3wy5315", - "sha256bin64": "11bswhxpnw7qi6lagfpgxh4yh56w7l0bc3rqwf975cbq2cnzpjby", + "version": "88.0.4324.27", + "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc", + "sha256bin64": "0ax27j42167yyx90h5k6ra898kn626w5cvgmafm3al9kyfsx36m4", "deps": { "gn": { "version": "2020-11-05", From fc7f72e1446b6eee70a0287cde9dbd84098e6625 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 2 Dec 2020 11:57:23 +0100 Subject: [PATCH 119/120] aml: Mark as broken on Darwin See https://hydra.nixos.org/build/131822625. --- pkgs/development/libraries/aml/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/development/libraries/aml/default.nix index 0b753618ba6a..37d8859ba50d 100644 --- a/pkgs/development/libraries/aml/default.nix +++ b/pkgs/development/libraries/aml/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; + broken = stdenv.isDarwin; }; } From e313c7d219fd93cfda926803425ec430c3dcfe66 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 2 Dec 2020 13:26:39 +0100 Subject: [PATCH 120/120] gollum: 5.1.1 -> 5.1.2 --- pkgs/applications/misc/gollum/Gemfile.lock | 6 +++--- pkgs/applications/misc/gollum/gemset.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 7b1b20a1b78f..eed618a5cbd1 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -8,11 +8,11 @@ GEM gemojione (4.3.3) json github-markup (3.0.5) - gollum (5.1.1) + gollum (5.1.2) gemojione (~> 4.1) gollum-lib (~> 5.0) kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.0.0) + kramdown-parser-gfm (~> 1.1.0) mustache (>= 0.99.5, < 1.0.0) octicons (~> 8.5) rss (~> 0.2.9) @@ -39,7 +39,7 @@ GEM json (2.3.1) kramdown (2.3.0) rexml - kramdown-parser-gfm (1.0.1) + kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) loofah (2.8.0) crass (~> 1.0.2) diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 7d7c0ef3d5f0..75ee9d05ab43 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14i6y3ilv9l7cqvkawl75js26cfj1pd8cphhmq9lic95ajvdf371"; + sha256 = "0pmvxj7pka7pjpw060a9pfxsci1hmx45hk9hbp5m49xkkiiqf1gx"; type = "gem"; }; - version = "5.1.1"; + version = "5.1.2"; }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; @@ -120,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ykna2apphld9llmjnz0210fipp4fkmj2ja18l7iz9xikg0h0ihi"; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; loofah = { dependencies = ["crass" "nokogiri"];